diff --git a/kirigami_lower_kf5_dependency.patch b/kirigami_lower_kf5_dependency.patch index 0ae29fe..befd5ec 100644 --- a/kirigami_lower_kf5_dependency.patch +++ b/kirigami_lower_kf5_dependency.patch @@ -1,13 +1,28 @@ +commit c21a755f8652a0c9fce9f4bb8833a739bf8abf73 +Author: Eike Hein +Date: Wed Sep 6 20:14:47 2017 +0900 + + Lower version (HACK) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5273f6..2dad0ee 100644 +index b5273f6..2002e82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) set(KF5_VERSION "5.38.0") # handled by release scripts -set(KF5_DEP_VERSION "5.38.0") # handled by release scripts +set(KF5_DEP_VERSION "5.37.0") # handled by release scripts project(kirigami2 VERSION ${KF5_VERSION}) +@@ -34,7 +34,7 @@ ELSE(STATIC_LIBRARY) + + ################# set KDE specific information ################# + +-find_package(ECM 5.38.0 NO_MODULE) ++find_package(ECM 5.37.0 NO_MODULE) + set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") + + # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked diff --git a/org.kde.konversation-konvi2x.json b/org.kde.konversation-konvi2x.json index ee985b9..42ea237 100644 --- a/org.kde.konversation-konvi2x.json +++ b/org.kde.konversation-konvi2x.json @@ -1,29 +1,31 @@ { "id": "org.kde.konversation-konvi2x", - "branch": "wip/qtquick", + "rename-desktop-file": "org.kde.konversation.desktop", + "branch": "master", "runtime": "org.kde.Platform", "runtime-version": "5.9", "sdk": "org.kde.Sdk", - "command": "konversation --nui --qtquick", + "command": "konvi2x", "tags": ["nightly"], - "desktop-file-name-prefix": "(Nightly) (Konvi2x) ", + "desktop-file-name-prefix": "(Nightly) ", + "desktop-file-name-suffix": " (Konvi2x)", "finish-args": ["--share=ipc", "--share=network", "--socket=x11", "--socket=wayland", "--env=QT_QPA_PLATFORM=flatpak" ], "separate-locales": false, "modules": [ { "name": "kirigami", "buildsystem": "cmake-ninja", "builddir": true, "sources": [ { "type": "git", "url": "git://anongit.kde.org/kirigami.git", "branch": "master" }, { "type": "patch", "path": "kirigami_lower_kf5_dependency.patch"} ] }, { "name": "konversation-konvi2x", "buildsystem": "cmake-ninja", "config-opts": ["-DCMAKE_BUILD_TYPE=debugfull"], "sources": [ { "type": "git", "url": "git://anongit.kde.org/konversation.git", "branch": "wip/qtquick" } ] } ] }