From 5c95f585bf392efa9d8961b2b674a5fbad9e3798 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Sat, 16 Feb 2019 11:43:08 +0100 Subject: [PATCH] Port native tools to use KF5_HOST_TOOLING The previous hack of just copying the native tools into the target sysroot has several limitations: - it no longer works with relative RPATHs being used - it fails in the case of kpackage where we need the same tools for host and target --- classes/cmake_kf5.bbclass | 8 +- classes/kauth.bbclass | 9 ++ classes/kconfig.bbclass | 8 ++ classes/kcoreaddons.bbclass | 13 +++ classes/kdoctools.bbclass | 4 +- recipes-kf5/obsolete/kdelibs4support.inc | 11 ++- recipes-kf5/tier1/kconfig.inc | 8 -- recipes-kf5/tier1/kcoreaddons.inc | 6 -- recipes-kf5/tier2/kactivities.inc | 11 ++- recipes-kf5/tier2/kauth.inc | 14 +-- .../kauth/0001-find_file_namespacing.diff | 25 +++++ recipes-kf5/tier2/kcompletion.inc | 7 +- recipes-kf5/tier2/kcrash.inc | 6 +- recipes-kf5/tier2/kdoctools.inc | 3 + .../kdoctools/0001-kf5-host-tooling-port.diff | 96 +++++++++++++++++++ recipes-kf5/tier2/kjobwidgets.inc | 1 + recipes-kf5/tier2/knotifications.inc | 11 ++- recipes-kf5/tier2/kpty.inc | 5 +- recipes-kf5/tier3/baloo.inc | 3 + recipes-kf5/tier3/kactivitiesstats.inc | 3 + recipes-kf5/tier3/kbookmarks.inc | 14 ++- recipes-kf5/tier3/kcmutils.inc | 3 + recipes-kf5/tier3/kconfigwidgets.inc | 3 + recipes-kf5/tier3/kdeclarative.inc | 2 + recipes-kf5/tier3/kded.inc | 6 +- recipes-kf5/tier3/kdesu.inc | 2 + recipes-kf5/tier3/kemoticons.inc | 2 + recipes-kf5/tier3/kglobalaccel.inc | 2 + recipes-kf5/tier3/kiconthemes.inc | 3 + recipes-kf5/tier3/kinit.inc | 6 +- recipes-kf5/tier3/kio.inc | 5 +- recipes-kf5/tier3/knewstuff.inc | 3 + recipes-kf5/tier3/knotifyconfig.inc | 3 + recipes-kf5/tier3/kparts.inc | 3 + recipes-kf5/tier3/kpeople.inc | 2 + recipes-kf5/tier3/krunner.inc | 3 + recipes-kf5/tier3/kservice.inc | 2 + recipes-kf5/tier3/ktexteditor.inc | 3 + recipes-kf5/tier3/ktextwidgets.inc | 3 + recipes-kf5/tier3/kwallet.inc | 3 + recipes-kf5/tier3/kxmlgui.inc | 3 + recipes-kf5/tier3/kxmlrpcclient.inc | 9 +- recipes-kf5/tier3/plasma-framework.inc | 6 +- recipes-kf5/tier3/purpose.inc | 3 + recipes-kf5/tier3/qqc2-desktop-style.inc | 3 + recipes-kf5/tier4/frameworkintegration.inc | 7 +- 46 files changed, 309 insertions(+), 47 deletions(-) create mode 100644 classes/kauth.bbclass create mode 100644 classes/kconfig.bbclass create mode 100644 classes/kcoreaddons.bbclass create mode 100644 recipes-kf5/tier2/kauth/0001-find_file_namespacing.diff create mode 100644 recipes-kf5/tier2/kdoctools/0001-kf5-host-tooling-port.diff diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass index ccc7e30..e8acc85 100644 --- a/classes/cmake_kf5.bbclass +++ b/classes/cmake_kf5.bbclass @@ -1,10 +1,16 @@ inherit cmake_qt5 -EXTRA_OECMAKE += " \ +EXTRA_OECMAKE_class-native += " \ -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \ -DBUILD_TESTING=OFF \ " +EXTRA_OECMAKE_class-target += " \ + -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \ + -DBUILD_TESTING=OFF \ + -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake \ +" + DEPENDS += "extra-cmake-modules qttools-native" # don't bother with translations for host tools diff --git a/classes/kauth.bbclass b/classes/kauth.bbclass new file mode 100644 index 0000000..d30e9f1 --- /dev/null +++ b/classes/kauth.bbclass @@ -0,0 +1,9 @@ +# Class for recipes using KAuth host tools + +DEPENDS += " \ + kauth \ + kauth-native \ + polkit-qt-1 \ +" + +EXTRA_OECMAKE += " -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake" diff --git a/classes/kconfig.bbclass b/classes/kconfig.bbclass new file mode 100644 index 0000000..3c394a4 --- /dev/null +++ b/classes/kconfig.bbclass @@ -0,0 +1,8 @@ +# Class for recipes using kconfig host tools + +DEPENDS += " \ + kconfig \ + kconfig-native \ +" + +EXTRA_OECMAKE += " -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake" diff --git a/classes/kcoreaddons.bbclass b/classes/kcoreaddons.bbclass new file mode 100644 index 0000000..8727152 --- /dev/null +++ b/classes/kcoreaddons.bbclass @@ -0,0 +1,13 @@ +# Class for recipes using kcoreaddons host tools + +do_compile_prepend() { + # desktoptojson needs to find installed service type files + export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS +} + +DEPENDS += " \ + kcoreaddons \ + kcoreaddons-native \ +" + +EXTRA_OECMAKE += " -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake" diff --git a/classes/kdoctools.bbclass b/classes/kdoctools.bbclass index cae8024..c83d250 100644 --- a/classes/kdoctools.bbclass +++ b/classes/kdoctools.bbclass @@ -3,8 +3,6 @@ do_compile_prepend() { # meinproc5 needs to find installed service type files export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS - # meinproc5 needs to find its libraries - export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH } DEPENDS += " \ @@ -13,3 +11,5 @@ DEPENDS += " \ libxslt-native \ karchive-native \ " + +EXTRA_OECMAKE += " -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake" diff --git a/recipes-kf5/obsolete/kdelibs4support.inc b/recipes-kf5/obsolete/kdelibs4support.inc index 7994c27..af42d91 100644 --- a/recipes-kf5/obsolete/kdelibs4support.inc +++ b/recipes-kf5/obsolete/kdelibs4support.inc @@ -14,12 +14,13 @@ DEPENDS = " \ kded \ kdesignerplugin \ kdesignerplugin-native \ - kdoctools \ - kdoctools-native \ kemoticons \ kglobalaccel \ kiconthemes \ kio \ + kcoreaddons-native \ + kconfig-native \ + kauth-native \ knotifications \ kparts \ kunitconversion \ @@ -32,12 +33,12 @@ SRC_URI = " \ " S = "${WORKDIR}/git" -EXTRA_OECMAKE += " -DHAVE_GOOD_GETADDRINFO=ON" +EXTRA_OECMAKE_class-target += " -DHAVE_GOOD_GETADDRINFO=ON" inherit cmake_kf5 -inherit gettext -inherit python3native +inherit ki18n inherit perlnative +inherit kdoctools do_compile_prepend() { # desktoptojson needs to find installed service type files diff --git a/recipes-kf5/tier1/kconfig.inc b/recipes-kf5/tier1/kconfig.inc index 2b7c8dd..281d754 100644 --- a/recipes-kf5/tier1/kconfig.inc +++ b/recipes-kf5/tier1/kconfig.inc @@ -18,14 +18,6 @@ S = "${WORKDIR}/git" inherit cmake_kf5 EXTRA_OECMAKE_class-native += " -DKCONFIG_USE_GUI=OFF" -# we need the config compiler for the host, but kconf_update for the target -# the latter also needs to be in the sysroot to silence the cmake config files checking its existence -sysroot_stage_all_append_class-target () { - mkdir -p ${SYSROOT_DESTDIR}${libexecdir}/kf5 - cp ${D}${libexecdir}/kf5/kconf_update ${SYSROOT_DESTDIR}${libexecdir}/kf5 - cp ${STAGING_LIBEXECDIR_NATIVE}/kf5/kconfig_compiler_kf5 ${SYSROOT_DESTDIR}/${libexecdir}/kf5 -} - FILES_${PN}-dev += " \ ${libexecdir}/kf5/kconfig_compiler_kf5 \ " diff --git a/recipes-kf5/tier1/kcoreaddons.inc b/recipes-kf5/tier1/kcoreaddons.inc index 9b72680..cb7b078 100644 --- a/recipes-kf5/tier1/kcoreaddons.inc +++ b/recipes-kf5/tier1/kcoreaddons.inc @@ -12,12 +12,6 @@ S = "${WORKDIR}/git" inherit cmake_kf5 -# put the native version of dekstoptojson into the sysroot, we want to execute that during the build -sysroot_stage_all_append_class-target() { - mkdir -p ${SYSROOT_DESTDIR}/${bindir} - cp ${STAGING_BINDIR_NATIVE}/desktoptojson ${SYSROOT_DESTDIR}/${bindir}/ -} - FILES_${PN} += " \ ${datadir}/mime/packages/kde5.xml \ ${datadir}/kf5/licenses/* \ diff --git a/recipes-kf5/tier2/kactivities.inc b/recipes-kf5/tier2/kactivities.inc index 46ea744..ac0f7fd 100644 --- a/recipes-kf5/tier2/kactivities.inc +++ b/recipes-kf5/tier2/kactivities.inc @@ -4,7 +4,16 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" PR = "r0" -DEPENDS = "qtbase qtdeclarative kcoreaddons kconfig kwindowsystem boost" +DEPENDS = " \ + qtbase \ + qtdeclarative \ + kcoreaddons \ + kcoreaddons-native \ + kconfig \ + kconfig-native \ + kwindowsystem \ + boost \ +" SRC_URI = "git://anongit.kde.org/kactivities;nobranch=1" S = "${WORKDIR}/git" diff --git a/recipes-kf5/tier2/kauth.inc b/recipes-kf5/tier2/kauth.inc index ca23091..eb046cc 100644 --- a/recipes-kf5/tier2/kauth.inc +++ b/recipes-kf5/tier2/kauth.inc @@ -10,21 +10,21 @@ DEPENDS_class-target = "qtbase kcoreaddons kauth-native polkit-qt-1" SRC_URI = " \ git://anongit.kde.org/kauth;nobranch=1 \ + file://0001-find_file_namespacing.diff \ " S = "${WORKDIR}/git" inherit cmake_kf5 -EXTRA_OECMAKE_class-native += " \ - -DKAUTH_BUILD_CODEGENERATOR_ONLY=ON \ +EXTRA_OECMAKE_class-target += " \ -DKAUTH_BACKEND_NAME=POLKITQT5-1 \ - -DKAUTH_POLICY_FILES_INSTALL_DIR=${datadir}/polkit-1/actions \ " -sysroot_stage_all_append_class-target () { - mkdir -p ${SYSROOT_DESTDIR}${libexecdir}/kauth - cp ${STAGING_LIBEXECDIR_NATIVE}/kauth/kauth-policy-gen ${SYSROOT_DESTDIR}/${libexecdir}/kauth -} +EXTRA_OECMAKE_class-native += " \ + -DKAUTH_BACKEND_NAME=POLKITQT5-1 \ + -DKAUTH_BUILD_CODEGENERATOR_ONLY=ON \ + -DKAUTH_POLICY_FILES_INSTALL_DIR=${datadir}/polkit-1/actions \ +" FILES_${PN} += " \ ${libdir}/plugins/kauth/helper/kauth_helper_plugin.so \ diff --git a/recipes-kf5/tier2/kauth/0001-find_file_namespacing.diff b/recipes-kf5/tier2/kauth/0001-find_file_namespacing.diff new file mode 100644 index 0000000..0cba18d --- /dev/null +++ b/recipes-kf5/tier2/kauth/0001-find_file_namespacing.diff @@ -0,0 +1,25 @@ +commit 24de0c1d512a323264b56f4e0a664208a6627754 +Author: Volker Krause +Date: Fri Feb 15 19:21:01 2019 +0100 + + Namespace find_file result + + KCoreAddons uses the same name, which causes this to use the cached result + for the KCoreAddons find_file call, making this fail when KCoreAddons is + present. + +diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in +index 0895e60..0bb15ff 100644 +--- a/KF5AuthConfig.cmake.in ++++ b/KF5AuthConfig.cmake.in +@@ -17,8 +17,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5AuthMacros.cmake") + + if(NOT "${KAUTH_BACKEND_NAME}" STREQUAL "FAKE") + if(CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING) +- find_file(TARGETSFILE KF5Auth/KF5AuthToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH) +- include("${TARGETSFILE}") ++ find_file(KAUTH_TARGETSFILE KF5Auth/KF5AuthToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH) ++ include("${KAUTH_TARGETSFILE}") + else() + include("${CMAKE_CURRENT_LIST_DIR}/KF5AuthToolsTargets.cmake") + endif() diff --git a/recipes-kf5/tier2/kcompletion.inc b/recipes-kf5/tier2/kcompletion.inc index d44ee12..6f5abdf 100644 --- a/recipes-kf5/tier2/kcompletion.inc +++ b/recipes-kf5/tier2/kcompletion.inc @@ -5,7 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " PR = "r0" -DEPENDS = "qtbase kwidgetsaddons kconfig" +DEPENDS = " \ + qtbase \ + kwidgetsaddons \ + kconfig \ + kconfig-native \ +" SRC_URI = "git://anongit.kde.org/kcompletion;nobranch=1" S = "${WORKDIR}/git" diff --git a/recipes-kf5/tier2/kcrash.inc b/recipes-kf5/tier2/kcrash.inc index 303bee0..f787865 100644 --- a/recipes-kf5/tier2/kcrash.inc +++ b/recipes-kf5/tier2/kcrash.inc @@ -5,7 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " PR = "r0" -DEPENDS = "kcoreaddons kwindowsystem" +DEPENDS = " \ + kcoreaddons \ + kcoreaddons-native \ + kwindowsystem \ +" SRC_URI = " \ git://anongit.kde.org/kcrash;nobranch=1 \ diff --git a/recipes-kf5/tier2/kdoctools.inc b/recipes-kf5/tier2/kdoctools.inc index f113954..5e8afc1 100644 --- a/recipes-kf5/tier2/kdoctools.inc +++ b/recipes-kf5/tier2/kdoctools.inc @@ -19,6 +19,7 @@ DEPENDS = " \ SRC_URI = " \ git://anongit.kde.org/kdoctools;nobranch=1 \ + file://0001-kf5-host-tooling-port.diff \ " S = "${WORKDIR}/git" @@ -27,6 +28,8 @@ inherit gettext inherit python3native inherit perlnative +EXTRA_OECMAKE_class-native += " -DINSTALL_INTERNAL_TOOLS=ON" + EXTRA_OECMAKE_class-target += " \ -DMEINPROC5_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/meinproc5 \ -DDOCBOOKL10NHELPER_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/docbookl10nhelper \ diff --git a/recipes-kf5/tier2/kdoctools/0001-kf5-host-tooling-port.diff b/recipes-kf5/tier2/kdoctools/0001-kf5-host-tooling-port.diff new file mode 100644 index 0000000..cc0d4bb --- /dev/null +++ b/recipes-kf5/tier2/kdoctools/0001-kf5-host-tooling-port.diff @@ -0,0 +1,96 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f1ee767..96d6343 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -107,6 +107,7 @@ if (BUILD_TESTING) + endif() + + install(EXPORT KF5DocToolsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DocToolsTargets.cmake NAMESPACE KF5:: ) ++install(EXPORT KF5DocToolsToolsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DocToolsToolsTargets.cmake NAMESPACE KF5:: ) + + if (BUILD_QCH) + ecm_install_qch_export( +@@ -128,6 +129,7 @@ configure_package_config_file( + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/KF5DocToolsMacros.cmake ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsMacros.cmake COPYONLY) + # we need a separate copy with local pathes for install autotests + export(EXPORT KF5DocToolsTargets FILE ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsTargets.cmake NAMESPACE KF5::) ++export(EXPORT KF5DocToolsToolsTargets FILE ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsToolsTargets.cmake NAMESPACE KF5::) + + install(FILES + "${CMAKE_BINARY_DIR}/cmake/KF5DocToolsConfig.cmake" +diff --git a/KF5DocToolsConfig.cmake.in b/KF5DocToolsConfig.cmake.in +index 361d21a..8a41163 100644 +--- a/KF5DocToolsConfig.cmake.in ++++ b/KF5DocToolsConfig.cmake.in +@@ -7,19 +7,27 @@ endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsTargets.cmake") + +-if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE) +- set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION_NONE ${MEINPROC5_EXECUTABLE}) +- set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION ${MEINPROC5_EXECUTABLE}) +-endif() +- +-if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE) +- set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION_NONE ${DOCBOOKL10NHELPER_EXECUTABLE}) +- set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION ${DOCBOOKL10NHELPER_EXECUTABLE}) +-endif() +- +-if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE) +- set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION_NONE ${CHECKXML5_EXECUTABLE}) +- set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION ${CHECKXML5_EXECUTABLE}) ++ if (CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING) ++ find_file(KDOCTOOLS_TARGETSFILE KF5DocTools/KF5DocToolsToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH) ++ include("${KDOCTOOLS_TARGETSFILE}") ++else() ++ include("${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsToolsTargets.cmake") ++ ++ # TODO KF6: deprecated, remove the below ++ if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE) ++ set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION_NONE ${MEINPROC5_EXECUTABLE}) ++ set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION ${MEINPROC5_EXECUTABLE}) ++ endif() ++ ++ if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE) ++ set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION_NONE ${DOCBOOKL10NHELPER_EXECUTABLE}) ++ set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION ${DOCBOOKL10NHELPER_EXECUTABLE}) ++ endif() ++ ++ if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE) ++ set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION_NONE ${CHECKXML5_EXECUTABLE}) ++ set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION ${CHECKXML5_EXECUTABLE}) ++ endif() + endif() + + include(${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsMacros.cmake) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 24f75a4..cebddfc 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -108,7 +108,7 @@ add_executable(meinproc5 meinproc.cpp meinproc_common.cpp xslt.cpp ${meinproc_ad + ecm_mark_nongui_executable(meinproc5) + target_link_libraries(meinproc5 Qt5::Core ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} ${meinproc_additional_LIBS}) + target_compile_definitions(meinproc5 PRIVATE -DKDOCTOOLS_EXPORT=) +-install(TARGETS meinproc5 EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS meinproc5 EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) + + if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE) + add_executable(KF5::meinproc5 IMPORTED GLOBAL) +@@ -206,7 +206,7 @@ add_executable( docbookl10nhelper ${docbookl10nhelper_SRCS} ) + ecm_mark_nongui_executable( docbookl10nhelper ) + target_link_libraries( docbookl10nhelper Qt5::Core ) + if(INSTALL_INTERNAL_TOOLS) +- install(TARGETS docbookl10nhelper EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++ install(TARGETS docbookl10nhelper EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) + endif() + + if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE) +@@ -232,7 +232,7 @@ set( checkXML5_SRCS checkXML5.cpp ${kdoctoolslog_core_SRCS}) + add_executable( checkXML5 ${checkXML5_SRCS} ) + ecm_mark_nongui_executable( checkXML5 ) + target_link_libraries( checkXML5 Qt5::Core ) +-install(TARGETS checkXML5 EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS checkXML5 EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) + + if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE) + add_executable(KF5::checkXML5 IMPORTED GLOBAL) diff --git a/recipes-kf5/tier2/kjobwidgets.inc b/recipes-kf5/tier2/kjobwidgets.inc index f8f29c6..52daff9 100644 --- a/recipes-kf5/tier2/kjobwidgets.inc +++ b/recipes-kf5/tier2/kjobwidgets.inc @@ -8,6 +8,7 @@ PR = "r0" DEPENDS = " \ qtbase \ kcoreaddons \ + kcoreaddons-native \ kwidgetsaddons \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)} \ " diff --git a/recipes-kf5/tier2/knotifications.inc b/recipes-kf5/tier2/knotifications.inc index 2139e59..7f4b167 100644 --- a/recipes-kf5/tier2/knotifications.inc +++ b/recipes-kf5/tier2/knotifications.inc @@ -5,7 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " PR = "r0" -DEPENDS = "qtbase kwindowsystem kconfig kcodecs kcoreaddons phonon" +DEPENDS = " \ + qtbase \ + kwindowsystem \ + kconfig \ + kconfig-native \ + kcodecs \ + kcoreaddons \ + kcoreaddons-native \ + phonon \ +" SRC_URI = "git://anongit.kde.org/knotifications;nobranch=1" S = "${WORKDIR}/git" diff --git a/recipes-kf5/tier2/kpty.inc b/recipes-kf5/tier2/kpty.inc index a614e59..34a02ab 100644 --- a/recipes-kf5/tier2/kpty.inc +++ b/recipes-kf5/tier2/kpty.inc @@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " PR = "r0" -DEPENDS = "kcoreaddons" +DEPENDS = " \ + kcoreaddons \ + kcoreaddons-native \ +" SRC_URI = "git://anongit.kde.org/kpty;nobranch=1" S = "${WORKDIR}/git" diff --git a/recipes-kf5/tier3/baloo.inc b/recipes-kf5/tier3/baloo.inc index 0af783d..4b492ad 100644 --- a/recipes-kf5/tier3/baloo.inc +++ b/recipes-kf5/tier3/baloo.inc @@ -8,13 +8,16 @@ DEPENDS = " \ qtbase \ qtdeclarative \ kcoreaddons \ + kcoreaddons-native \ kconfig \ + kconfig-native \ kdbusaddons \ kidletime \ solid \ kfilemetadata \ kcrash \ kio \ + kauth-native \ lmdb \ " diff --git a/recipes-kf5/tier3/kactivitiesstats.inc b/recipes-kf5/tier3/kactivitiesstats.inc index 488e1b9..c21b04d 100644 --- a/recipes-kf5/tier3/kactivitiesstats.inc +++ b/recipes-kf5/tier3/kactivitiesstats.inc @@ -8,6 +8,9 @@ DEPENDS = " \ qtbase \ kconfig \ kactivities \ + kcoreaddons-native \ + kconfig-native \ + kauth-native \ boost \ " diff --git a/recipes-kf5/tier3/kbookmarks.inc b/recipes-kf5/tier3/kbookmarks.inc index b097ec9..f808bb0 100644 --- a/recipes-kf5/tier3/kbookmarks.inc +++ b/recipes-kf5/tier3/kbookmarks.inc @@ -4,7 +4,19 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" PR = "r0" -DEPENDS = "qtbase kconfig kcoreaddons kcodecs kconfigwidgets kiconthemes kwidgetsaddons kxmlgui" +DEPENDS = " \ + qtbase \ + kconfig \ + kconfig-native \ + kcoreaddons \ + kcoreaddons-native \ + kcodecs \ + kconfigwidgets \ + kauth-native \ + kiconthemes \ + kwidgetsaddons \ + kxmlgui \ +" SRC_URI = "git://anongit.kde.org/kbookmarks;nobranch=1" S = "${WORKDIR}/git" diff --git a/recipes-kf5/tier3/kcmutils.inc b/recipes-kf5/tier3/kcmutils.inc index 8f921ba..5b9264e 100644 --- a/recipes-kf5/tier3/kcmutils.inc +++ b/recipes-kf5/tier3/kcmutils.inc @@ -8,7 +8,10 @@ DEPENDS = " \ qtbase \ kitemviews \ kconfigwidgets \ + kconfig-native \ + kauth-native \ kcoreaddons \ + kcoreaddons-native \ kiconthemes \ kservice \ kxmlgui \ diff --git a/recipes-kf5/tier3/kconfigwidgets.inc b/recipes-kf5/tier3/kconfigwidgets.inc index 9588757..f05d283 100644 --- a/recipes-kf5/tier3/kconfigwidgets.inc +++ b/recipes-kf5/tier3/kconfigwidgets.inc @@ -6,9 +6,12 @@ PR = "r0" DEPENDS = "qtbase \ kauth \ + kauth-native \ kcoreaddons \ + kcoreaddons-native \ kcodecs \ kconfig \ + kconfig-native \ kguiaddons \ kwidgetsaddons \ " diff --git a/recipes-kf5/tier3/kdeclarative.inc b/recipes-kf5/tier3/kdeclarative.inc index ca89c3f..381d3de 100644 --- a/recipes-kf5/tier3/kdeclarative.inc +++ b/recipes-kf5/tier3/kdeclarative.inc @@ -8,8 +8,10 @@ DEPENDS = " \ qtbase \ qtdeclarative \ kconfig \ + kconfig-native \ kiconthemes \ kio \ + kauth-native \ kwidgetsaddons \ kwindowsystem \ kglobalaccel \ diff --git a/recipes-kf5/tier3/kded.inc b/recipes-kf5/tier3/kded.inc index a0303a1..2693159 100644 --- a/recipes-kf5/tier3/kded.inc +++ b/recipes-kf5/tier3/kded.inc @@ -7,14 +7,15 @@ PR = "r0" DEPENDS = " \ qtbase \ kconfig \ + kconfig-native \ kcoreaddons \ + kcoreaddons-native \ kcrash \ kdbusaddons \ kio \ + kauth-native \ kinit \ kservice \ - libxslt-native \ - karchive-native \ " SRC_URI = " \ @@ -23,6 +24,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" inherit cmake_kf5 +inherit kdoctools FILES_SOLIBSDEV = "" FILES_${PN} += " \ diff --git a/recipes-kf5/tier3/kdesu.inc b/recipes-kf5/tier3/kdesu.inc index aad00a0..f003ec5 100644 --- a/recipes-kf5/tier3/kdesu.inc +++ b/recipes-kf5/tier3/kdesu.inc @@ -7,7 +7,9 @@ PR = "r0" DEPENDS = " \ qtbase \ kcoreaddons \ + kcoreaddons-native \ kservice \ + kconfig-native \ kpty \ " diff --git a/recipes-kf5/tier3/kemoticons.inc b/recipes-kf5/tier3/kemoticons.inc index 8cf41b4..001f7d1 100644 --- a/recipes-kf5/tier3/kemoticons.inc +++ b/recipes-kf5/tier3/kemoticons.inc @@ -8,7 +8,9 @@ DEPENDS = " \ qtbase \ karchive \ kcoreaddons \ + kcoreaddons-native \ kconfig \ + kconfig-native \ kservice \ " diff --git a/recipes-kf5/tier3/kglobalaccel.inc b/recipes-kf5/tier3/kglobalaccel.inc index cffd9dc..8c38f27 100644 --- a/recipes-kf5/tier3/kglobalaccel.inc +++ b/recipes-kf5/tier3/kglobalaccel.inc @@ -8,7 +8,9 @@ PR = "r0" DEPENDS = " \ qtbase \ kcoreaddons \ + kcoreaddons-native \ kconfig \ + kconfig-native \ kcrash \ kdbusaddons \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)} \ diff --git a/recipes-kf5/tier3/kiconthemes.inc b/recipes-kf5/tier3/kiconthemes.inc index a7a3f1d..089396f 100644 --- a/recipes-kf5/tier3/kiconthemes.inc +++ b/recipes-kf5/tier3/kiconthemes.inc @@ -8,7 +8,10 @@ DEPENDS = "qtbase \ qtsvg \ karchive \ kcoreaddons \ + kcoreaddons-native \ kconfigwidgets \ + kconfig-native \ + kauth-native \ kwidgetsaddons \ kitemviews \ " diff --git a/recipes-kf5/tier3/kinit.inc b/recipes-kf5/tier3/kinit.inc index 4f8184b..db0be8b 100644 --- a/recipes-kf5/tier3/kinit.inc +++ b/recipes-kf5/tier3/kinit.inc @@ -8,11 +8,12 @@ DEPENDS = " \ qtbase \ kservice \ kio \ + kcoreaddons-native \ + kauth-native \ kwindowsystem \ kcrash \ kconfig \ - libxslt-native \ - karchive-native \ + kconfig-native \ " SRC_URI = " \ @@ -22,6 +23,7 @@ S = "${WORKDIR}/git" inherit cmake_kf5 inherit ki18n +inherit kdoctools FILES_SOLIBSDEV = "" FILES_${PN} += " \ diff --git a/recipes-kf5/tier3/kio.inc b/recipes-kf5/tier3/kio.inc index f2b3a43..e7e4d35 100644 --- a/recipes-kf5/tier3/kio.inc +++ b/recipes-kf5/tier3/kio.inc @@ -7,8 +7,6 @@ PR = "r0" DEPENDS = " \ qtbase \ karchive \ - kconfig \ - kcoreaddons \ kdbusaddons \ kservice \ solid \ @@ -26,8 +24,11 @@ SRC_URI = "git://anongit.kde.org/kio;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 +inherit kcoreaddons +inherit kconfig inherit ki18n inherit kdoctools +inherit kauth FILES_${PN} += " \ ${libdir}/plugins/kcm_*.so \ diff --git a/recipes-kf5/tier3/knewstuff.inc b/recipes-kf5/tier3/knewstuff.inc index 51a611a..5b8a1db 100644 --- a/recipes-kf5/tier3/knewstuff.inc +++ b/recipes-kf5/tier3/knewstuff.inc @@ -10,9 +10,12 @@ DEPENDS = " \ karchive \ kcompletion \ kconfig \ + kconfig-native \ kcoreaddons \ + kcoreaddons-native \ kiconthemes \ kio \ + kauth-native \ kitemviews \ kservice \ ktextwidgets \ diff --git a/recipes-kf5/tier3/knotifyconfig.inc b/recipes-kf5/tier3/knotifyconfig.inc index 0874cea..ec4d1cf 100644 --- a/recipes-kf5/tier3/knotifyconfig.inc +++ b/recipes-kf5/tier3/knotifyconfig.inc @@ -9,7 +9,10 @@ DEPENDS = " \ phonon \ kcompletion \ kconfig \ + kconfig-native \ kio \ + kcoreaddons-native \ + kauth-native \ " SRC_URI = "git://anongit.kde.org/knotifyconfig;nobranch=1" diff --git a/recipes-kf5/tier3/kparts.inc b/recipes-kf5/tier3/kparts.inc index aa84ca7..34c57fb 100644 --- a/recipes-kf5/tier3/kparts.inc +++ b/recipes-kf5/tier3/kparts.inc @@ -7,9 +7,12 @@ PR = "r0" DEPENDS = " \ qtbase \ kconfig \ + kconfig-native \ kcoreaddons \ + kcoreaddons-native \ kiconthemes \ kio \ + kauth-native \ kjobwidgets \ kservice \ ktextwidgets \ diff --git a/recipes-kf5/tier3/kpeople.inc b/recipes-kf5/tier3/kpeople.inc index 07b5151..c25dd71 100644 --- a/recipes-kf5/tier3/kpeople.inc +++ b/recipes-kf5/tier3/kpeople.inc @@ -8,8 +8,10 @@ DEPENDS = " \ qtbase \ qtdeclarative \ kcoreaddons \ + kcoreaddons-native \ kwidgetsaddons \ kservice \ + kconfig-native \ kitemviews \ " diff --git a/recipes-kf5/tier3/krunner.inc b/recipes-kf5/tier3/krunner.inc index a08f47f..0b3f91f 100644 --- a/recipes-kf5/tier3/krunner.inc +++ b/recipes-kf5/tier3/krunner.inc @@ -8,8 +8,11 @@ DEPENDS = " \ qtbase \ qtdeclarative \ kconfig \ + kconfig-native \ kcoreaddons \ + kcoreaddons-native \ kio \ + kauth-native \ kservice \ plasma-framework \ solid \ diff --git a/recipes-kf5/tier3/kservice.inc b/recipes-kf5/tier3/kservice.inc index 65c0ae1..66280b1 100644 --- a/recipes-kf5/tier3/kservice.inc +++ b/recipes-kf5/tier3/kservice.inc @@ -6,7 +6,9 @@ PR = "r0" DEPENDS = "qtbase \ kconfig \ + kconfig-native \ kcoreaddons \ + kcoreaddons-native \ kcrash \ kdbusaddons \ bison-native \ diff --git a/recipes-kf5/tier3/ktexteditor.inc b/recipes-kf5/tier3/ktexteditor.inc index 661ae22..f99539f 100644 --- a/recipes-kf5/tier3/ktexteditor.inc +++ b/recipes-kf5/tier3/ktexteditor.inc @@ -8,8 +8,11 @@ DEPENDS = " \ qtbase \ karchive \ kconfig \ + kconfig-native \ kguiaddons \ kio \ + kcoreaddons-native \ + kauth-native \ kparts \ sonnet \ kiconthemes \ diff --git a/recipes-kf5/tier3/ktextwidgets.inc b/recipes-kf5/tier3/ktextwidgets.inc index 3598507..7e91a8d 100644 --- a/recipes-kf5/tier3/ktextwidgets.inc +++ b/recipes-kf5/tier3/ktextwidgets.inc @@ -7,7 +7,10 @@ PR = "r0" DEPENDS = "qtbase \ kcompletion \ kconfig \ + kconfig-native \ kconfigwidgets \ + kcoreaddons-native \ + kauth-native \ kiconthemes \ kservice \ kwidgetsaddons \ diff --git a/recipes-kf5/tier3/kwallet.inc b/recipes-kf5/tier3/kwallet.inc index 1abac90..6438337 100644 --- a/recipes-kf5/tier3/kwallet.inc +++ b/recipes-kf5/tier3/kwallet.inc @@ -7,8 +7,11 @@ PR = "r0" DEPENDS = " \ qtbase \ kconfig \ + kconfig-native \ kconfigwidgets \ + kauth-native \ kcoreaddons \ + kcoreaddons-native \ kdbusaddons \ kiconthemes \ knotifications \ diff --git a/recipes-kf5/tier3/kxmlgui.inc b/recipes-kf5/tier3/kxmlgui.inc index 6a26be0..dff971e 100644 --- a/recipes-kf5/tier3/kxmlgui.inc +++ b/recipes-kf5/tier3/kxmlgui.inc @@ -8,7 +8,10 @@ DEPENDS = "qtbase \ kcoreaddons \ kitemviews \ kconfig \ + kconfig-native \ kconfigwidgets \ + kconfig-native \ + kauth-native \ kiconthemes \ ktextwidgets \ kwidgetsaddons \ diff --git a/recipes-kf5/tier3/kxmlrpcclient.inc b/recipes-kf5/tier3/kxmlrpcclient.inc index c9dbe44..eae77f1 100644 --- a/recipes-kf5/tier3/kxmlrpcclient.inc +++ b/recipes-kf5/tier3/kxmlrpcclient.inc @@ -4,7 +4,14 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" PR = "r0" -DEPENDS = "qtbase ki18n kio" +DEPENDS = " \ + qtbase \ + ki18n \ + kio \ + kcoreaddons-native \ + kconfig-native \ + kauth-native \ +" SRC_URI = "git://anongit.kde.org/kxmlrpcclient;nobranch=1" S = "${WORKDIR}/git" diff --git a/recipes-kf5/tier3/plasma-framework.inc b/recipes-kf5/tier3/plasma-framework.inc index 35ee4ae..b380aff 100644 --- a/recipes-kf5/tier3/plasma-framework.inc +++ b/recipes-kf5/tier3/plasma-framework.inc @@ -9,6 +9,7 @@ DEPENDS = " \ kactivities \ karchive \ kconfig \ + kconfig-native \ kconfigwidgets \ kdbusaddons \ kdeclarative \ @@ -16,6 +17,8 @@ DEPENDS = " \ kguiaddons \ kiconthemes \ kio \ + kcoreaddons-native \ + kauth-native \ kservice \ kwindowsystem \ kxmlgui \ @@ -23,8 +26,6 @@ DEPENDS = " \ kpackage \ kwayland \ kirigami \ - libxslt-native \ - karchive-native \ " SRC_URI = " \ @@ -34,6 +35,7 @@ S = "${WORKDIR}/git" inherit cmake_kf5 inherit ki18n +inherit kdoctools FILES_${PN} += " \ ${libdir}/plugins/*.so \ diff --git a/recipes-kf5/tier3/purpose.inc b/recipes-kf5/tier3/purpose.inc index 50a8074..81813f9 100644 --- a/recipes-kf5/tier3/purpose.inc +++ b/recipes-kf5/tier3/purpose.inc @@ -8,9 +8,12 @@ DEPENDS = " \ qtbase \ qtdeclarative \ kcoreaddons \ + kcoreaddons-native \ ki18n \ kconfig \ + kconfig-native \ kio \ + kauth-native \ " SRC_URI = "git://anongit.kde.org/${BPN};nobranch=1" diff --git a/recipes-kf5/tier3/qqc2-desktop-style.inc b/recipes-kf5/tier3/qqc2-desktop-style.inc index 78eb67e..04ac9c6 100644 --- a/recipes-kf5/tier3/qqc2-desktop-style.inc +++ b/recipes-kf5/tier3/qqc2-desktop-style.inc @@ -10,6 +10,9 @@ DEPENDS = " \ kirigami \ kiconthemes \ kconfigwidgets \ + kcoreaddons-native \ + kconfig-native \ + kauth-native \ " SRC_URI = " \ diff --git a/recipes-kf5/tier4/frameworkintegration.inc b/recipes-kf5/tier4/frameworkintegration.inc index c7e6ec6..4f8b7ce 100644 --- a/recipes-kf5/tier4/frameworkintegration.inc +++ b/recipes-kf5/tier4/frameworkintegration.inc @@ -7,13 +7,15 @@ PR = "r0" DEPENDS = " \ qtbase \ kconfig \ + kconfig-native \ kconfigwidgets \ + kcoreaddons-native \ + kauth-native \ kiconthemes \ knotifications \ kwidgetsaddons \ kpackage \ knewstuff \ - ki18n \ " SRC_URI = " \ @@ -22,8 +24,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" inherit cmake_kf5 -inherit gettext -inherit python3native +inherit ki18n FILES_${PN} += " \ ${libdir}/plugins/kf5/FrameworkIntegrationPlugin.so \