Index: =================================================================== --- /dev/null +++ /dev/null @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/attica_5.36.0.bb =================================================================== --- recipes-kf5/tier1/attica_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/bluez-qt_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/bluez-qt_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/breeze-icons_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/breeze-icons_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/extra-cmake-modules_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/extra-cmake-modules_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/karchive_5.36.0.bb =================================================================== --- recipes-kf5/tier1/karchive_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kcodecs_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kcodecs_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kconfig.inc =================================================================== --- recipes-kf5/tier1/kconfig.inc +++ recipes-kf5/tier1/kconfig.inc @@ -12,7 +12,6 @@ SRC_URI = " \ git://anongit.kde.org/kconfig;nobranch=1 \ - file://0001-no-gui.patch \ " S = "${WORKDIR}/git" Index: recipes-kf5/tier1/kconfig/0001-no-gui.patch =================================================================== --- recipes-kf5/tier1/kconfig/0001-no-gui.patch +++ /dev/null @@ -1,110 +0,0 @@ -commit aaae37eaa2b05a113d1d5e77c766ebe48fca8c69 -Author: Volker Krause -Date: Sun Jul 30 15:47:29 2017 +0200 - - Allow to build KConfig without Qt5Gui - - Summary: - This is particularly useful for cross-compilation, where we only need the - kconfig_compiler on the host system. - - Reviewers: #frameworks - - Tags: #frameworks - - Differential Revision: https://phabricator.kde.org/D6994 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5e50ba5..1f7df84 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,7 +12,11 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - - set(REQUIRED_QT_VERSION 5.6.0) - --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Xml) -+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml) -+option(KCONFIG_USE_GUI "Build components using Qt5Gui" ON) -+if(KCONFIG_USE_GUI) -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) -+endif() - include(KDEInstallDirs) - include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) - include(KDECMakeSettings) -diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt -index a07636d..fd3816d 100644 ---- a/autotests/CMakeLists.txt -+++ b/autotests/CMakeLists.txt -@@ -52,6 +52,7 @@ ecm_add_tests( - - target_include_directories(test_kconf_update PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../src/kconf_update) - -+if(TARGET Qt5::Gui) - ecm_add_tests( - kconfigguitest.cpp - kconfigloadertest.cpp -@@ -67,4 +68,4 @@ set_tests_properties(kconfigcore-kconfignokdehometest PROPERTIES RUN_SERIAL TRUE - set_tests_properties(kconfiggui-kconfigguitest PROPERTIES RUN_SERIAL TRUE) - - add_subdirectory(kconfig_compiler) -- -+endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 998a1d5..d4ca886 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,7 @@ - add_subdirectory(core) --add_subdirectory(gui) -+if(TARGET Qt5::Gui) -+ add_subdirectory(gui) -+endif() - add_subdirectory(kconfig_compiler) - add_subdirectory(kconf_update) - add_subdirectory(kreadconfig) -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 9b7491c..46fabd5 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -1,6 +1,3 @@ -- --find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -- - set(libkconfigcore_SRCS - kconfig.cpp - kconfigbase.cpp -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 9659326..08786d3 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -1,7 +1,3 @@ -- --find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) --find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -- - set(libkconfiggui_SRCS - kconfiggui.cpp - kconfiggroupgui.cpp -diff --git a/src/kconf_update/CMakeLists.txt b/src/kconf_update/CMakeLists.txt -index b1342a8..db11511 100644 ---- a/src/kconf_update/CMakeLists.txt -+++ b/src/kconf_update/CMakeLists.txt -@@ -1,5 +1,3 @@ --find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -- - remove_definitions(-DQT_NO_CAST_FROM_ASCII) - - ########### next target ############### -diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt -index 004a649..dc0a08d 100644 ---- a/src/kconfig_compiler/CMakeLists.txt -+++ b/src/kconfig_compiler/CMakeLists.txt -@@ -16,8 +16,6 @@ else() - add_executable(KF5::kconfig_compiler ALIAS kconfig_compiler) - endif() - --find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -- - target_link_libraries(kconfig_compiler Qt5::Xml) - - ecm_mark_nongui_executable(kconfig_compiler) Index: recipes-kf5/tier1/kconfig_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/kconfig_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/kcoreaddons_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kcoreaddons_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kdbusaddons_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kdbusaddons_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kdnssd_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kdnssd_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kguiaddons_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kguiaddons_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/ki18n_5.36.0.bb =================================================================== --- recipes-kf5/tier1/ki18n_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kidletime.inc =================================================================== --- recipes-kf5/tier1/kidletime.inc +++ recipes-kf5/tier1/kidletime.inc @@ -12,7 +12,6 @@ SRC_URI = " \ git://anongit.kde.org/kidletime \ - file://0001-no-x11.patch \ " S = "${WORKDIR}/git" Index: recipes-kf5/tier1/kidletime/0001-no-x11.patch =================================================================== --- recipes-kf5/tier1/kidletime/0001-no-x11.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 8dbea8f26466f605961b66e8c3ae2da5f88a50a9 -Author: Volker Krause -Date: Sat Aug 5 18:35:10 2017 +0200 - - Only require Qt5X11Extras when we actually need it - - Reviewers: #frameworks - - Tags: #frameworks - - Differential Revision: https://phabricator.kde.org/D7154 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1111d73..e3c89d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,7 +33,7 @@ set(REQUIRED_QT_VERSION 5.6.0) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) - - if(NOT WIN32 AND NOT APPLE) -- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras DBus) -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) - endif() - - if(APPLE) -@@ -46,6 +46,7 @@ if(NOT APPLE) - endif() - - if(X11_FOUND) -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) - find_package(XCB COMPONENTS XCB SYNC) - find_package(X11_XCB) - set(HAVE_X11 TRUE) Index: recipes-kf5/tier1/kidletime_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kidletime_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kimageformats_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kimageformats_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kirigami.inc =================================================================== --- recipes-kf5/tier1/kirigami.inc +++ recipes-kf5/tier1/kirigami.inc @@ -6,7 +6,7 @@ DEPENDS = "qtquickcontrols2 qtsvg" -SRC_URI = "git://anongit.kde.org/kirigami" +SRC_URI = "git://anongit.kde.org/kirigami;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 Index: recipes-kf5/tier1/kitemmodels_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kitemmodels_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kitemviews_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kitemviews_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kplotting_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kplotting_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/ksyntaxhighlighting.inc =================================================================== --- recipes-kf5/tier1/ksyntaxhighlighting.inc +++ recipes-kf5/tier1/ksyntaxhighlighting.inc @@ -8,8 +8,6 @@ SRC_URI = " \ git://anongit.kde.org/syntax-highlighting;nobranch=1 \ - file://0001-cross-compilation-support.patch \ - file://0002-no-gui.patch \ " S = "${WORKDIR}/git" Index: recipes-kf5/tier1/ksyntaxhighlighting/0001-cross-compilation-support.patch =================================================================== --- recipes-kf5/tier1/ksyntaxhighlighting/0001-cross-compilation-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit de7828ae46f6feb9a219e9b1444e1d7e32bd94ac -Author: Volker Krause -Date: Thu Aug 3 19:47:59 2017 +0200 - - Add cross-compilation support for the highlighting indexer - - Reviewers: #frameworks - - Tags: #frameworks - - Differential Revision: https://phabricator.kde.org/D7102 - -diff --git a/src/indexer/CMakeLists.txt b/src/indexer/CMakeLists.txt -index a2c7ef7..acb1647 100644 ---- a/src/indexer/CMakeLists.txt -+++ b/src/indexer/CMakeLists.txt -@@ -1,7 +1,13 @@ --add_executable(katehighlightingindexer katehighlightingindexer.cpp) -- --if(Qt5XmlPatterns_FOUND) -- target_link_libraries(katehighlightingindexer Qt5::XmlPatterns) -+if(CMAKE_CROSSCOMPILING AND KATEHIGHLIGHTINGINDEXER_EXECUTABLE) -+ # cross build, we need the indexer supplied externally -+ add_executable(katehighlightingindexer IMPORTED GLOBAL) -+ set_target_properties(katehighlightingindexer PROPERTIES IMPORTED_LOCATION ${KATEHIGHLIGHTINGINDEXER_EXECUTABLE}) - else() -- target_link_libraries(katehighlightingindexer Qt5::Core) -+ # host build -+ add_executable(katehighlightingindexer katehighlightingindexer.cpp) -+ if(Qt5XmlPatterns_FOUND) -+ target_link_libraries(katehighlightingindexer Qt5::XmlPatterns) -+ else() -+ target_link_libraries(katehighlightingindexer Qt5::Core) -+ endif() - endif() Index: recipes-kf5/tier1/ksyntaxhighlighting/0002-no-gui.patch =================================================================== --- recipes-kf5/tier1/ksyntaxhighlighting/0002-no-gui.patch +++ /dev/null @@ -1,73 +0,0 @@ -commit 60ea773130332471311f4e5193eed77162cfee2b -Author: Volker Krause -Date: Thu Aug 3 19:53:11 2017 +0200 - - Allow to build KSyntaxHighlighter without Qt5Gui - - Summary: - This actually only builds the indexer, which is useful for - cross-compilation. With Yocto this avoids pulling in a full - graphics stack for the host build. - - Reviewers: #frameworks - - Tags: #frameworks - - Differential Revision: https://phabricator.kde.org/D7103 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0bd2130..b9c90d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,7 +34,11 @@ ecm_setup_version(PROJECT - # Dependencies - # - set(REQUIRED_QT_VERSION "5.6.0") --find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Core Gui Network Test) -+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Core Network Test) -+option(KSYNTAXHIGHLIGHTING_USE_GUI "Build components depending on Qt5Gui" ON) -+if(KSYNTAXHIGHLIGHTING_USE_GUI) -+ find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Gui) -+endif() - find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE QUIET OPTIONAL_COMPONENTS Widgets XmlPatterns) - set_package_properties(Qt5 PROPERTIES URL "http://qt-project.org/") - set_package_properties(Qt5Widgets PROPERTIES PURPOSE "Example application.") -@@ -63,8 +67,10 @@ endif() - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - add_subdirectory(data) - add_subdirectory(src) --add_subdirectory(examples) --add_subdirectory(autotests) -+if(TARGET Qt5::Gui) -+ add_subdirectory(examples) -+ add_subdirectory(autotests) -+endif() - - # - # CMake package config file generation -@@ -93,10 +99,12 @@ install(FILES - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel) - --install(EXPORT KF5SyntaxHighlightingTargets -+if(TARGET KF5SyntaxHighlighting) -+ install(EXPORT KF5SyntaxHighlightingTargets - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - FILE KF5SyntaxHighlightingTargets.cmake - NAMESPACE KF5::) -+endif() - - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ksyntaxhighlighting_version.h" - DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}" -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f9faade..b882025 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,3 +1,5 @@ - add_subdirectory(indexer) --add_subdirectory(lib) --add_subdirectory(cli) -+if(TARGET Qt5::Gui) -+ add_subdirectory(lib) -+ add_subdirectory(cli) -+endif() Index: recipes-kf5/tier1/ksyntaxhighlighting_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/ksyntaxhighlighting_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/kwayland_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/kwayland_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/kwidgetsaddons_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kwidgetsaddons_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/kwindowsystem_5.36.0.bb =================================================================== --- recipes-kf5/tier1/kwindowsystem_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/modemmanager-qt_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/modemmanager-qt_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/networkmanager-qt_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/networkmanager-qt_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/oxygen-icons_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/oxygen-icons_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/prison_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/prison_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/solid_5.36.0.bb =================================================================== --- recipes-kf5/tier1/solid_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier1/sonnet.inc =================================================================== --- recipes-kf5/tier1/sonnet.inc +++ recipes-kf5/tier1/sonnet.inc @@ -7,9 +7,7 @@ DEPENDS = "qtbase sonnet-native" -# patch 0001 can be dropped once we update to 5.37 SRC_URI = "git://anongit.kde.org/sonnet;nobranch=1 \ - file://0001-no-widgets.patch \ file://0002-unexport-helpers.patch \ " S = "${WORKDIR}/git" Index: recipes-kf5/tier1/sonnet/0001-no-widgets.patch =================================================================== --- recipes-kf5/tier1/sonnet/0001-no-widgets.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit ab4e46f45e84b1916b875bd5db49b1a59220f73a -Author: Volker Krause -Date: Sun Jul 30 13:36:25 2017 +0200 - - Allow to build Sonnet without Qt5Widgets - - Summary: - This is useful for cross-compilation, where we only need the QtCore-only - parsetrigrams build tool on the host and avoids having to pull in a full - graphics stack for the host build in Yocto. - - Reviewers: #frameworks, cordlandwehr, aacid - - Reviewed By: aacid - - Subscribers: aacid - - Tags: #frameworks - - Differential Revision: https://phabricator.kde.org/D6990 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 64df939..9c24415 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,11 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) - include(KDECMakeSettings) - - set(REQUIRED_QT_VERSION 5.6.0) --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) -+option(SONNET_USE_WIDGETS "Build components using Qt5Widgets" ON) -+if(SONNET_USE_WIDGETS) -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) -+endif() -+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) - - - include(GenerateExportHeader) -@@ -43,7 +47,9 @@ endif() - add_subdirectory(src) - add_subdirectory(autotests) - add_subdirectory(data) --add_subdirectory(examples) -+if(TARGET Qt5::Widgets) -+ add_subdirectory(examples) -+endif() - - - # create a Config.cmake and a ConfigVersion.cmake file and install them -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index cf40289..e6e4212 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,3 +1,5 @@ - add_subdirectory(core) - add_subdirectory(plugins) --add_subdirectory(ui) -+if(TARGET Qt5::Widgets) -+ add_subdirectory(ui) -+endif() Index: recipes-kf5/tier1/sonnet_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier1/sonnet_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier1/threadweaver_5.36.0.bb =================================================================== --- recipes-kf5/tier1/threadweaver_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier2/kactivities_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/kactivities_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier2/kauth/0001-codegen-only.patch =================================================================== --- recipes-kf5/tier2/kauth/0001-codegen-only.patch +++ recipes-kf5/tier2/kauth/0001-codegen-only.patch @@ -1,20 +1,27 @@ -commit 3ab170ea32c521435bf22674f9ea7dd92fd2e750 +commit 78eff35256ebe1d5edc4acf6f0e389eb4c7256c3 Author: Volker Krause Date: Thu Aug 10 19:22:05 2017 +0200 Allow to only build the kauth-policy-gen code generator + Summary: This is primarily useful for cross-compilation, where e.g. with Yocto neither Qt5Widgets nor PolicyKit are easily available for the host build. + + Reviewers: #frameworks, cordlandwehr + + Tags: #frameworks + + Differential Revision: https://phabricator.kde.org/D7274 diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13a6129..0afd2de 100644 +index f822c89..859b2d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,11 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - set(REQUIRED_QT_VERSION 5.6.0) + set(REQUIRED_QT_VERSION 5.7.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) +option(KAUTH_BUILD_CODEGENERATOR_ONLY "Only build the kauth-policy-gen code generator." OFF) Index: recipes-kf5/tier2/kauth_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/kauth_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier2/kcompletion_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/kcompletion_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier2/kcrash_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/kcrash_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier2/kfilemetadata_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/kfilemetadata_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier2/kjobwidgets_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/kjobwidgets_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier2/knotifications_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/knotifications_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier2/kpackage_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/kpackage_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier2/kpty_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/kpty_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier2/kunitconversion_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier2/kunitconversion_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/baloo_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/baloo_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kactivitiesstats_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kactivitiesstats_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kbookmarks_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kbookmarks_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kcmutils_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kcmutils_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kconfigwidgets_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kconfigwidgets_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kdeclarative_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kdeclarative_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kded_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kded_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kdesu_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kdesu_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kemoticons_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kemoticons_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kglobalaccel_5.36.0.bb =================================================================== --- recipes-kf5/tier3/kglobalaccel_5.36.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${PN}.inc - -SRCREV = "v${PV}" - Index: recipes-kf5/tier3/kiconthemes_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kiconthemes_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kinit_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kinit_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kio_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kio_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/knewstuff_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/knewstuff_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/knotifyconfig_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/knotifyconfig_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kparts.inc =================================================================== --- recipes-kf5/tier3/kparts.inc +++ recipes-kf5/tier3/kparts.inc @@ -28,3 +28,7 @@ FILES_${PN} += " \ ${datadir}/kservicetypes5/*.desktop \ " + +FILES_${PN}-dev += " \ + ${datadir}/kdevappwizard/templates/*.tar.bz2 \ +" Index: recipes-kf5/tier3/kparts_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kparts_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kpeople_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kpeople_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/krunner_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/krunner_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kservice_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kservice_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/ktexteditor.inc =================================================================== --- recipes-kf5/tier3/ktexteditor.inc +++ recipes-kf5/tier3/ktexteditor.inc @@ -40,3 +40,7 @@ ${datadir}/polkit-1/actions/*.policy \ ${datadir}/katepart5/script/README.md \ " + +FILES_${PN}-dev += " \ + ${datadir}/kdevappwizard/templates/*.bz2 \ +" Index: recipes-kf5/tier3/ktexteditor_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/ktexteditor_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/ktextwidgets_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/ktextwidgets_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kwallet_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kwallet_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kxmlgui_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kxmlgui_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/kxmlrpcclient_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/kxmlrpcclient_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}" Index: recipes-kf5/tier3/plasma-framework.inc =================================================================== --- recipes-kf5/tier3/plasma-framework.inc +++ recipes-kf5/tier3/plasma-framework.inc @@ -27,7 +27,6 @@ SRC_URI = " \ git://anongit.kde.org/plasma-framework;nobranch=1 \ - file://0001-colorscope-compile-fix.patch \ " S = "${WORKDIR}/git" Index: recipes-kf5/tier3/plasma-framework/0001-colorscope-compile-fix.patch =================================================================== --- recipes-kf5/tier3/plasma-framework/0001-colorscope-compile-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 28aa8aa3da6fa9a6cbf003307030861d2fff985b -Author: Volker Krause -Date: Thu Aug 3 21:57:44 2017 +0200 - - Fix compilation on Yocto - - Summary: - By default, Qt is built without accessibility there, which is what - would indirectly include the needed QColor with a "normal" Qt build - here. - - Reviewers: #frameworks - - Tags: #frameworks - - Differential Revision: https://phabricator.kde.org/D7117 - -diff --git a/src/declarativeimports/core/colorscope.cpp b/src/declarativeimports/core/colorscope.cpp -index 8a705b8b3..2785fab93 100644 ---- a/src/declarativeimports/core/colorscope.cpp -+++ b/src/declarativeimports/core/colorscope.cpp -@@ -23,6 +23,7 @@ - - #include - #include -+#include - - QHash ColorScope::s_attachedScopes = QHash(); - Index: recipes-kf5/tier3/plasma-framework_5.36.0.bb =================================================================== --- /dev/null +++ recipes-kf5/tier3/plasma-framework_5.36.0.bb @@ -1,2 +0,0 @@ -require ${PN}.inc -SRCREV = "v${PV}"