From a0b8656755f0ad2fab22e871066564660eaab0db Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Fri, 19 May 2017 23:05:52 +0200 Subject: [PATCH] kf5: Fix build with per-recipe sysroot. In mose cases this boils down to not hardcoding build paths in output cmake files. The solution is to use standard OE paths passed to cmake when it's invoked for each package. Other than that most packages need to have a few additional deps which previously simply happened to be present in global sysroot. Signed-off-by: Piotr Tworek --- classes/kde-base.bbclass | 3 ++ ...tive-build-and-install-icemaker-only.patch | 25 ++++++++--- recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb | 2 +- .../kdelibs4support/kdelibs4support.bb | 8 +++- .../kf5/porting-aids-tier3/khtml/khtml.bb | 6 ++- .../porting-aids-tier3/kjsembed/kjsembed.bb | 5 ++- .../kf5/porting-aids-tier3/kross/kross.bb | 9 +++- .../kf5/tier1/breeze-icons/breeze-icons.inc | 2 + recipes-kde/kf5/tier1/kconfig/kconfig.bb | 5 --- recipes-kde/kf5/tier1/kconfig/kconfig.inc | 5 ++- .../kf5/tier1/kcoreaddons/kcoreaddons.bb | 2 +- recipes-kde/kf5/tier1/ki18n/ki18n-native.bb | 1 - recipes-kde/kf5/tier1/sonnet/sonnet.bb | 2 +- .../kactivities-stats/kactivities-stats.bb | 1 + recipes-kde/kf5/tier2/kauth/kauth.bb | 2 +- .../kf5/tier2/kcompletion/kcompletion.bb | 2 +- recipes-kde/kf5/tier2/kcrash/kcrash.bb | 2 +- .../kf5/tier2/kdoctools/kdoctools-native.bb | 3 +- recipes-kde/kf5/tier2/kdoctools/kdoctools.bb | 16 ++++++- .../kf5/tier2/kfilemetadata/kfilemetadata.bb | 3 +- .../kf5/tier2/kjobwidgets/kjobwidgets.bb | 3 +- .../tier2/knotifications/knotifications.bb | 2 + recipes-kde/kf5/tier2/kpackage/kpackage.bb | 4 +- recipes-kde/kf5/tier2/kpty/kpty.bb | 2 +- recipes-kde/kf5/tier3/baloo/baloo.bb | 3 ++ .../kf5/tier3/kactivities/kactivities.bb | 6 ++- .../kf5/tier3/kbookmarks/kbookmarks.bb | 3 +- recipes-kde/kf5/tier3/kcmutils/kcmutils.bb | 5 ++- .../tier3/kconfigwidgets/kconfigwidgets.bb | 4 +- .../kf5/tier3/kdeclarative/kdeclarative.bb | 4 +- recipes-kde/kf5/tier3/kded/kded.bb | 5 ++- .../kdesignerplugin/kdesignerplugin-native.bb | 5 ++- .../tier3/kdesignerplugin/kdesignerplugin.bb | 26 ++++++----- recipes-kde/kf5/tier3/kdesu/kdesu.bb | 4 +- recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb | 6 ++- .../kf5/tier3/kemoticons/kemoticons.bb | 4 +- .../kf5/tier3/kglobalaccel/kglobalaccel.bb | 4 +- .../kf5/tier3/kiconthemes/kiconthemes.bb | 3 +- recipes-kde/kf5/tier3/kinit/kinit.bb | 6 ++- recipes-kde/kf5/tier3/kio/kio.bb | 12 +++-- ...workaround-for-bug-371721-to-also-co.patch | 44 +++++++++++++++++++ recipes-kde/kf5/tier3/knewstuff/knewstuff.bb | 6 ++- .../kf5/tier3/knotifyconfig/knotifyconfig.bb | 5 ++- recipes-kde/kf5/tier3/kparts/kparts.bb | 6 ++- recipes-kde/kf5/tier3/kpeople/kpeople.bb | 11 ++++- recipes-kde/kf5/tier3/krunner/krunner.bb | 16 ++++++- recipes-kde/kf5/tier3/kservice/kservice.bb | 2 +- .../kf5/tier3/ktexteditor/ktexteditor.bb | 17 ++++++- .../kf5/tier3/ktextwidgets/ktextwidgets.bb | 4 +- recipes-kde/kf5/tier3/kwallet/kwallet.bb | 28 +++++++----- recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb | 5 +++ .../kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb | 4 +- .../plasma-framework/plasma-framework.bb | 7 ++- .../frameworkintegration.bb | 6 ++- .../extra-cmake-modules.bb | 2 +- recipes-support/xapian/xapian-core_1.4.0.bb | 6 +-- 56 files changed, 284 insertions(+), 100 deletions(-) create mode 100644 recipes-kde/kf5/tier3/kio/kio/0001-Extend-upstream-workaround-for-bug-371721-to-also-co.patch diff --git a/classes/kde-base.bbclass b/classes/kde-base.bbclass index 6f966a96..5121af4f 100644 --- a/classes/kde-base.bbclass +++ b/classes/kde-base.bbclass @@ -33,6 +33,9 @@ EXTRA_OECMAKE += " \ -DCMAKE_INSTALL_DBUSINTERFACEDIR=share/dbus-1/interfaces \ -DKDE_INSTALL_QTPLUGINDIR=${OE_QMAKE_PATH_PLUGINS} \ -DKDE_INSTALL_QMLDIR=${OE_QMAKE_PATH_QML} \ + -DKDE_PATH_HOST_HEADERS=${STAGING_INCDIR} \ + -DKDE_PATH_EXTERNAL_HOST_LIBEXECS=${STAGING_LIBEXECDIR_NATIVE} \ + -DKDE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} \ " FILES_${PN} += " \ diff --git a/recipes-kde/kf5/porting-aids-tier1/kjs/files/0002-native-build-and-install-icemaker-only.patch b/recipes-kde/kf5/porting-aids-tier1/kjs/files/0002-native-build-and-install-icemaker-only.patch index 1274881e..0371e64d 100644 --- a/recipes-kde/kf5/porting-aids-tier1/kjs/files/0002-native-build-and-install-icemaker-only.patch +++ b/recipes-kde/kf5/porting-aids-tier1/kjs/files/0002-native-build-and-install-icemaker-only.patch @@ -10,17 +10,21 @@ Upstream-Status: Inappropriate [embedded-specific] Signed-off-by: Andreas Müller --- - CMakeLists.txt | 3 --- + CMakeLists.txt | 7 ++----- src/CMakeLists.txt | 1 - src/kjs/CMakeLists.txt | 3 +++ - 3 files changed, 3 insertions(+), 4 deletions(-) + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b9814c..d472ddc 100644 +index 11120f7..b6f277a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -48,9 +48,6 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) - find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED) +@@ -51,12 +51,9 @@ option(KJS_FORCE_DISABLE_PCRE "Force building of KJS without PCRE. Doing this wi + # TODO: Remove these + remove_definitions(-DQT_NO_CAST_FROM_ASCII) + +-find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED) ++#find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED) add_subdirectory(src) -add_subdirectory(autotests) @@ -29,6 +33,15 @@ index 9b9814c..d472ddc 100644 # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5JS") +@@ -77,7 +74,7 @@ install(EXPORT KF5JSTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5JST + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kjs_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) + +-kdoctools_install(po) ++#kdoctools_install(po) + + if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index de1d59f..ad1af7e 100644 --- a/src/CMakeLists.txt @@ -59,5 +72,5 @@ index a51a71d..fc74820 100644 include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME KJS LIB_NAME KF5JS DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KJS) -- -1.9.3 +2.10.2 diff --git a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb index b00b9397..06f03472 100644 --- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb +++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb @@ -1,3 +1,3 @@ require ${BPN}.inc -DEPENDS += "${BPN}-native libpcre" +DEPENDS += "${BPN}-native libpcre kdoctools-native" diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb index 14bde3b4..3a9704bd 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb @@ -1,6 +1,6 @@ require ${BPN}.inc -inherit cmake_lib +inherit cmake_lib gettext DEPENDS += " \ ${BPN}-native \ @@ -11,6 +11,7 @@ DEPENDS += " \ kconfigwidgets \ kcrash \ kdesignerplugin \ + kdesignerplugin-native \ kdbusaddons \ kemoticons \ kglobalaccel \ @@ -30,6 +31,9 @@ DEPENDS += " \ kwindowsystem \ kxmlgui \ kded \ + kded-native \ + kauth-native \ + sonnet-native \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \ " @@ -47,7 +51,7 @@ do_configure_append() { } # native executables -CMAKE_ALIGN_SYSROOT[1] = "KF5KDELibs4Support, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}" +CMAKE_ALIGN_SYSROOT[1] = "KF5KDELibs4Support, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}" CMAKE_ALIGN_SYSROOT[2] = "KDELibs4, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}" FILES_${PN} += " \ diff --git a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb index e5964b98..aba65be3 100644 --- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb +++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb @@ -5,11 +5,14 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5-porting-aids perlnative +inherit kde-kf5-porting-aids perlnative gettext DEPENDS += " \ + kauth-native \ karchive \ kcodecs \ + kconfig-native \ + kcoreaddons-native \ kglobalaccel \ ki18n \ kiconthemes \ @@ -24,6 +27,7 @@ DEPENDS += " \ kwindowsystem \ kxmlgui \ phonon \ + sonnet-native \ jpeg \ giflib \ libpng \ diff --git a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb index 1504dc13..0a7e574a 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5-porting-aids cmake_lib +inherit kde-kf5-porting-aids cmake_lib gettext DEPENDS += " \ ${BPN}-native \ @@ -13,6 +13,7 @@ DEPENDS += " \ kjs \ ki18n \ kdoctools \ + kdoctools-native \ " PV = "${KF5_VERSION}" @@ -20,4 +21,4 @@ SRC_URI[md5sum] = "b7da8abba8b5e9c9e359d40e73ba3c6f" SRC_URI[sha256sum] = "73d57549e1f97672053fad9ee80db3909100e4f9f1b33ba40b7ae20bce88889f" # kjsembed's kjscmd5 is not required for build -> point to native dummy to make cmake happy -CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -s${_IMPORT_PREFIX}/bin/kjscmd5, -S${STAGING_BINDIR_NATIVE}/kjscmd5" +CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -s${_IMPORT_PREFIX}/bin/kjscmd5, -s${KDE_PATH_EXTERNAL_HOST_BINS}/kjscmd5" diff --git a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb index 5409fdb6..4f2d1b8f 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb @@ -4,12 +4,16 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5-porting-aids +inherit kde-kf5-porting-aids gettext -DEPENDS += " \ +DEPENDS += "\ + kauth-native \ + kconfig-native \ kcompletion \ kcoreaddons \ + kcoreaddons-native \ kdoctools \ + kdoctools-native \ ki18n \ kiconthemes \ kio \ @@ -17,6 +21,7 @@ DEPENDS += " \ kservice \ kwidgetsaddons \ kxmlgui \ + sonnet-native \ " PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc b/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc index 6926ab8c..be57adf0 100644 --- a/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc +++ b/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc @@ -10,4 +10,6 @@ inherit kde-kf5 SRC_URI[md5sum] = "9d13ea7dcd31efb400e2f5a64db48179" SRC_URI[sha256sum] = "8acc1560ee349d4858025ac3525abaa5a7edd879e5589173e1337bb3dea3dffe" +DEPENDS += "libxml2-native" + PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig.bb b/recipes-kde/kf5/tier1/kconfig/kconfig.bb index f1ed0e56..1aea3ed9 100644 --- a/recipes-kde/kf5/tier1/kconfig/kconfig.bb +++ b/recipes-kde/kf5/tier1/kconfig/kconfig.bb @@ -1,12 +1,7 @@ require ${BPN}.inc -inherit cmake_lib - DEPENDS += "${BPN}-native" -# native executables -CMAKE_ALIGN_SYSROOT[1] = "KF5Config, -s${_IMPORT_PREFIX}/libexec/kf5, -S${STAGING_LIBEXECDIR_NATIVE}/kf5" - PACKAGES =+ "${PN}-bin" FILES_${PN}-dbg += "${libdir}/kconfig/kf5/.debug" diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig.inc b/recipes-kde/kf5/tier1/kconfig/kconfig.inc index 02858ae0..79a381df 100644 --- a/recipes-kde/kf5/tier1/kconfig/kconfig.inc +++ b/recipes-kde/kf5/tier1/kconfig/kconfig.inc @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5 cmake_lib PV = "${KF5_VERSION}" SRC_URI[md5sum] = "51788f84902358d7840c1d4ed111a80d" @@ -18,3 +18,6 @@ SRC_URI += " \ " EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" + +# native executables +CMAKE_ALIGN_SYSROOT[1] = "KF5Config, -s${_IMPORT_PREFIX}/libexec/kf5, -s${KDE_PATH_EXTERNAL_HOST_LIBEXECS}/kf5" diff --git a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb index 57106fdf..268c4437 100644 --- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb +++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb @@ -5,7 +5,7 @@ inherit cmake_lib DEPENDS += "${BPN}-native" # native executables -CMAKE_ALIGN_SYSROOT[1] = "KF5CoreAddons, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}" +CMAKE_ALIGN_SYSROOT[1] = "KF5CoreAddons, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}" PACKAGES =+ "${PN}-bin" diff --git a/recipes-kde/kf5/tier1/ki18n/ki18n-native.bb b/recipes-kde/kf5/tier1/ki18n/ki18n-native.bb index 1d81316b..1cad3fb3 100644 --- a/recipes-kde/kf5/tier1/ki18n/ki18n-native.bb +++ b/recipes-kde/kf5/tier1/ki18n/ki18n-native.bb @@ -8,4 +8,3 @@ SRC_URI += " \ " EXTRA_OECMAKE += "-DBUILD_WITH_QTSCRIPT=OFF -DBUILD_TESTING=OFF" - diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.bb b/recipes-kde/kf5/tier1/sonnet/sonnet.bb index f0bca3fa..41cac250 100644 --- a/recipes-kde/kf5/tier1/sonnet/sonnet.bb +++ b/recipes-kde/kf5/tier1/sonnet/sonnet.bb @@ -17,7 +17,7 @@ FILES_${PN}-dbg += " \ ${OE_QMAKE_PATH_PLUGINS}/kf5/sonnet/.debug \ " -CMAKE_ALIGN_SYSROOT[1] = "KF5Sonnet, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}" +CMAKE_ALIGN_SYSROOT[1] = "KF5Sonnet, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}" PACKAGECONFIG ??= "hunspell" PACKAGECONFIG[hunspell] = "-DBUILD_HUNSPELL=ON,-DBUILD_HUNSPELL=OFF, hunspell" diff --git a/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb b/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb index 4c1b389c..30c8191d 100644 --- a/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb +++ b/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb @@ -11,6 +11,7 @@ inherit kde-kf5 DEPENDS += " \ boost \ kconfig \ + kconfig-native \ kactivities \ " diff --git a/recipes-kde/kf5/tier2/kauth/kauth.bb b/recipes-kde/kf5/tier2/kauth/kauth.bb index 4bc56163..6ea37dd2 100644 --- a/recipes-kde/kf5/tier2/kauth/kauth.bb +++ b/recipes-kde/kf5/tier2/kauth/kauth.bb @@ -7,7 +7,7 @@ DEPENDS += "${BPN}-native kcoreaddons polkit-qt-1" EXTRA_OECMAKE += "-DKAUTH_BACKEND_NAME=POLKITQT5-1" # executables -CMAKE_ALIGN_SYSROOT[1] = "KF5Auth, -s${_IMPORT_PREFIX}/libexec/kauth/kauth-policy-gen, -S${STAGING_LIBEXECDIR_NATIVE}/kauth/kauth-policy-gen" +CMAKE_ALIGN_SYSROOT[1] = "KF5Auth, -s${_IMPORT_PREFIX}/libexec/kauth/kauth-policy-gen, -s${KDE_PATH_EXTERNAL_HOST_LIBEXECS}/kauth/kauth-policy-gen" FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}" FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug" diff --git a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb index e59f23f0..4fecabcc 100644 --- a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb +++ b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -DEPENDS += "kconfig kwidgetsaddons" +DEPENDS += "kconfig kconfig-native kwidgetsaddons" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "34b9b0cc3d61210683a872976d27b9c9" diff --git a/recipes-kde/kf5/tier2/kcrash/kcrash.bb b/recipes-kde/kf5/tier2/kcrash/kcrash.bb index dc559a35..e1fceeee 100644 --- a/recipes-kde/kf5/tier2/kcrash/kcrash.bb +++ b/recipes-kde/kf5/tier2/kcrash/kcrash.bb @@ -8,7 +8,7 @@ inherit kde-kf5 distro_features_check REQUIRED_DISTRO_FEATURE = "x11" -DEPENDS += "kcoreaddons kwindowsystem virtual/libx11" +DEPENDS += "kcoreaddons kcoreaddons-native kwindowsystem virtual/libx11" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "28a6ddd2560e283694ca6e0b97a432fc" diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb index b95a3cf7..2b329908 100644 --- a/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb +++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb @@ -11,11 +11,12 @@ DEPENDS += " \ docbook-xml-dtd4-native \ docbook-xsl-stylesheets-native \ " +RDEPENDS_${PN} += "gettext-native" SRC_URI += " \ file://0003-don-t-build-documentation.patch \ " # make meinproc5 find kdoctools data -CMAKE_ALIGN_SYSROOT[1] = "KF5DocToolsMacros.cmake, -s--stylesheet, -S--srcdir ${STAGING_DATADIR_NATIVE}/kf5/kdoctools --stylesheet" +CMAKE_ALIGN_SYSROOT[1] = "KF5DocToolsMacros.cmake, -s--stylesheet, -s--srcdir ${OE_QMAKE_PATH_DATA}/kf5/kdoctools --stylesheet" diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb index d5861a98..c5c448dd 100644 --- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb +++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb @@ -17,10 +17,22 @@ do_configure_append() { sed -i 's:${STAGING_DIR_TARGET}::g' ${B}/config-kdoctools.h } +do_install_append() { + # Make sure installed XML/XSL files use relative paths, otherwise they + # will be unusable once installed in per recipe sysroot. + sed -i -e 's@${RECIPE_SYSROOT}${datadir}@../../../../@g' \ + "${D}${datadir}"/kf5/kdoctools/customization/xsl/*.xml + sed -i -e 's@${RECIPE_SYSROOT}${datadir}@../../../@g' \ + "${D}${datadir}"/kf5/kdoctools/customization/*.xsl + sed -i -e 's@${RECIPE_SYSROOT}${datadir}@../../../../@g' \ + "${D}${datadir}"/kf5/kdoctools/customization/dtd/kdedbx45.dtd + +} + # native binaries -CMAKE_ALIGN_SYSROOT[1] = "KF5DocTools, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}" +CMAKE_ALIGN_SYSROOT[1] = "KF5DocTools, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}" # make meinproc5 find kdoctools data -CMAKE_ALIGN_SYSROOT[2] = "KF5DocToolsMacros.cmake, -sCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE}, -SCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE} --srcdir ${STAGING_DATADIR}/kf5/kdoctools" +CMAKE_ALIGN_SYSROOT[2] = "KF5DocToolsMacros.cmake, -sCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE}, -sCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE} --srcdir ${OE_QMAKE_PATH_DATA}/kf5/kdoctools" FILES_${PN}-dev += "${datadir}/kf5/kdoctools/customization" diff --git a/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb index e93468e4..52414d5f 100644 --- a/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb +++ b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LGPL-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " - -inherit kde-kf5 pkgconfig +inherit kde-kf5 pkgconfig gettext PV = "${KF5_VERSION}" SRC_URI[md5sum] = "a7341eb3e20f180066470ba38533447c" diff --git a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb index 98a78f0e..7e454136 100644 --- a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb +++ b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -DEPENDS += "kcoreaddons kwidgetsaddons ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}" +DEPENDS += "kcoreaddons kcoreaddons-native kwidgetsaddons \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "1c65bee5dfc02d7671228dd90c59e19b" diff --git a/recipes-kde/kf5/tier2/knotifications/knotifications.bb b/recipes-kde/kf5/tier2/knotifications/knotifications.bb index 8608155b..59bc4b08 100644 --- a/recipes-kde/kf5/tier2/knotifications/knotifications.bb +++ b/recipes-kde/kf5/tier2/knotifications/knotifications.bb @@ -11,9 +11,11 @@ DEPENDS += " \ kwindowsystem \ kservice \ kconfig \ + kconfig-native \ kiconthemes \ kcodecs \ kcoreaddons \ + kcoreaddons-native \ phonon \ libdbusmenu-qt5 \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras libxtst", "", d)} \ diff --git a/recipes-kde/kf5/tier2/kpackage/kpackage.bb b/recipes-kde/kf5/tier2/kpackage/kpackage.bb index 08d69e6a..1f1dc5f6 100644 --- a/recipes-kde/kf5/tier2/kpackage/kpackage.bb +++ b/recipes-kde/kf5/tier2/kpackage/kpackage.bb @@ -2,8 +2,8 @@ require ${BPN}.inc inherit cmake_lib -DEPENDS += "${BPN}-native karchive ki18n kcoreaddons kconfig kdoctools" +DEPENDS += "${BPN}-native gettext-native kdoctools-native karchive ki18n kcoreaddons kconfig kdoctools" -CMAKE_ALIGN_SYSROOT[1] = "KF5Package, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}" +CMAKE_ALIGN_SYSROOT[1] = "KF5Package, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}" FILES_${PN} += "${datadir}/k*5" diff --git a/recipes-kde/kf5/tier2/kpty/kpty.bb b/recipes-kde/kf5/tier2/kpty/kpty.bb index 396939f7..fcffc1fb 100644 --- a/recipes-kde/kf5/tier2/kpty/kpty.bb +++ b/recipes-kde/kf5/tier2/kpty/kpty.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 gettext -DEPENDS += "kcoreaddons ki18n" +DEPENDS += "kcoreaddons kcoreaddons-native ki18n" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "d921308e25f7a79a88f9bb8fffed8453" diff --git a/recipes-kde/kf5/tier3/baloo/baloo.bb b/recipes-kde/kf5/tier3/baloo/baloo.bb index ca0ab03d..cf168eb3 100644 --- a/recipes-kde/kf5/tier3/baloo/baloo.bb +++ b/recipes-kde/kf5/tier3/baloo/baloo.bb @@ -10,14 +10,17 @@ inherit kde-kf5 cmake_auto_align_paths cmake_lib gtk-icon-cache DEPENDS += " \ ki18n \ kconfig \ + kconfig-native \ kidletime \ kauth \ + kauth-native \ kcrash \ solid \ kio \ kdbusaddons \ kitemmodels \ kfilemetadata \ + kcoreaddons-native \ \ xapian-core \ " diff --git a/recipes-kde/kf5/tier3/kactivities/kactivities.bb b/recipes-kde/kf5/tier3/kactivities/kactivities.bb index 8cd92027..fd56ce8f 100644 --- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb +++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb @@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kxmlgui kio kdbusaddons kdeclarative kcmutils" +DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kxmlgui \ + kio kdbusaddons kdeclarative kcmutils kconfig-native kcoreaddons-native \ + kauth-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "67cc9be7978878d578295a885b9d6737" @@ -19,6 +21,8 @@ do_compile_prepend() { export XDG_DATA_HOME=${STAGING_DATADIR} } +RDEPENDS_${PN} += "kactivitymanagerd" + FILES_${PN} += " \ ${datadir}/k*5 \ ${OE_QMAKE_PATH_QML}/org/kde \ diff --git a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb index 664951d5..3f31b297 100644 --- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb +++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui" +DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui kconfig-native kcoreaddons-native \ + kauth-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "1f745c77a2a7285962801a1260f22720" diff --git a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb index 111d40ee..1d530e33 100644 --- a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb +++ b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb @@ -4,9 +4,10 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5 gettext -DEPENDS += "kitemviews kconfigwidgets kcoreaddons ki18n kiconthemes kservice kxmlgui kdeclarative" +DEPENDS += "kitemviews kconfigwidgets kcoreaddons ki18n kiconthemes kservice kxmlgui \ + kdeclarative kcoreaddons-native kauth-native kconfig-native kpackage-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "c1afcc332098a7c0f104629d1f67e4ad" diff --git a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb index dd45afba..e0addfa1 100644 --- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb +++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -DEPENDS += "kauth kconfig kcodecs kdoctools kguiaddons kwidgetsaddons" +DEPENDS += "kauth kconfig kcodecs kguiaddons kwidgetsaddons kdoctools \ + kcoreaddons-native kauth-native kconfig-native kdoctools-native \ + gettext-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "7647c86266b61075542b4112e5f21a72" diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb index 68081408..b43f0356 100644 --- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb +++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -DEPENDS += "qtdeclarative kconfig ki18n kiconthemes kio kwidgetsaddons kwindowsystem kglobalaccel kguiaddons kpackage libepoxy" +DEPENDS += "qtdeclarative kconfig kconfig-native ki18n kiconthemes kio kwidgetsaddons \ + kwindowsystem kglobalaccel kguiaddons kpackage libepoxy gettext-native \ + kcoreaddons-native kauth-native kpackage-native" SRC_URI += "file://0001-kpackagelauncherqml-Add-include-of-QDebug.patch" diff --git a/recipes-kde/kf5/tier3/kded/kded.bb b/recipes-kde/kf5/tier3/kded/kded.bb index ba3c97ab..71124dea 100644 --- a/recipes-kde/kf5/tier3/kded/kded.bb +++ b/recipes-kde/kf5/tier3/kded/kded.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 cmake_lib -DEPENDS += "${BPN}-native kconfig kcoreaddons kcrash kdbusaddons kdoctools kinit kservice" +DEPENDS += "${BPN}-native kconfig kcoreaddons kcrash kdbusaddons kdoctools kinit kservice \ + kconfig-native kcoreaddons-native kdoctools-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "e2ac1c22569e8f09e7716c92119a6f96" @@ -14,7 +15,7 @@ SRC_URI[sha256sum] = "f8fb127da4cbe1c72f7ddf118e54298d5aa8199e2130e38df30f98c7d6 SRC_URI += "file://0001-hardcode-path-to-kconf_update.patch" # kded's kded5 is not required for build -> point to native dummy to make cmake happy -CMAKE_ALIGN_SYSROOT[1] = "KDED, -s${_IMPORT_PREFIX}/bin/kded5, -S${STAGING_BINDIR_NATIVE}/kded5" +CMAKE_ALIGN_SYSROOT[1] = "KDED, -s${_IMPORT_PREFIX}/bin/kded5, -s${KDE_PATH_EXTERNAL_HOST_BINS}/kded5" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/k*5 ${libdir}/libkdeinit5_kded5.so" FILES_${PN}-dev = "${libdir}/cmake" diff --git a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin-native.bb b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin-native.bb index fb228f4a..53710365 100644 --- a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin-native.bb +++ b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin-native.bb @@ -3,6 +3,9 @@ require ${BPN}.inc inherit native DEPENDS += " \ - qttools-native \ + qttools-native \ + kcoreaddons-native \ + kconfig-native \ + kdoctools-native \ " diff --git a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb index 5d8031d9..b4d4686c 100644 --- a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb +++ b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb @@ -1,6 +1,6 @@ require ${BPN}.inc -inherit cmake_lib +inherit cmake_lib gettext # required DEPENDS += " \ @@ -9,16 +9,18 @@ DEPENDS += " \ # optional -> TBD packageconfig DEPENDS += " \ - kcompletion \ - kconfigwidgets \ - kiconthemes \ - kio \ - kitemviews \ - ktextwidgets \ - kwidgetsaddons \ - kxmlgui \ - sonnet \ - ki18n \ + kcompletion \ + kconfigwidgets \ + kiconthemes \ + kio \ + kitemviews \ + ktextwidgets \ + kwidgetsaddons \ + kxmlgui \ + sonnet \ + ki18n \ + kauth-native \ + sonnet-native \ " SRC_URI += " \ @@ -31,7 +33,7 @@ PACKAGECONFIG[kplotting] = "-DWITH_KPLOTTING=ON,,kplotting" PACKAGECONFIG[kdewebkit] = "-DWITH_KDEWEBKIT=ON,,kdewebkit" # native binaries -CMAKE_ALIGN_SYSROOT[1] = "KF5DesignerPlugin, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}" +CMAKE_ALIGN_SYSROOT[1] = "KF5DesignerPlugin, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}" FILES_${PN} += "${libdir}/plugins/designer" FILES_${PN}-dbg += "${libdir}/plugins/designer/.debug" diff --git a/recipes-kde/kf5/tier3/kdesu/kdesu.bb b/recipes-kde/kf5/tier3/kdesu/kdesu.bb index b18e0e6c..203c8af6 100644 --- a/recipes-kde/kf5/tier3/kdesu/kdesu.bb +++ b/recipes-kde/kf5/tier3/kdesu/kdesu.bb @@ -4,10 +4,12 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5 gettext DEPENDS += " \ + kconfig-native \ kcoreaddons \ + kcoreaddons-native \ kservice \ kpty \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \ diff --git a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb index 55bd3206..d4599184 100644 --- a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb +++ b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb @@ -2,17 +2,21 @@ SUMMARY = "KDE Integration for QtWebKit" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit kde-kf5 +inherit kde-kf5 gettext DEPENDS += " \ qtwebkit \ + kauth-native \ kconfig \ + kconfig-native \ kcoreaddons \ + kcoreaddons-native \ kio \ kjobwidgets \ kparts \ kservice \ kwallet \ + sonnet-native \ " PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb index aebea9c6..99f0d60a 100644 --- a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb +++ b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5 gettext -DEPENDS += "karchive kconfig kservice kcoreaddons" +DEPENDS += "karchive kconfig kconfig-native kservice kcoreaddons kcoreaddons-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "eb2381de7b6905e7968859258c7d4731" diff --git a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb index 4323b6d1..89df626f 100644 --- a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb +++ b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 DEPENDS += " \ - kconfig \ - kcoreaddons \ + kconfig-native \ + kcoreaddons-native \ kcrash \ kdbusaddons \ kservice \ diff --git a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb index 43b58d03..ba525914 100644 --- a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb +++ b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -DEPENDS += "qtsvg ki18n kconfig kconfigwidgets kwidgetsaddons kitemviews" +DEPENDS += "qtsvg ki18n kconfig kconfigwidgets kwidgetsaddons kitemviews gettext-native \ + kcoreaddons-native kauth-native kconfig-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "6fc0cd71f1c331aae78b0c03114958dd" diff --git a/recipes-kde/kf5/tier3/kinit/kinit.bb b/recipes-kde/kf5/tier3/kinit/kinit.bb index 0e6219cf..b32dfad1 100644 --- a/recipes-kde/kf5/tier3/kinit/kinit.bb +++ b/recipes-kde/kf5/tier3/kinit/kinit.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5 gettext DEPENDS += " \ libcap \ @@ -14,7 +14,11 @@ DEPENDS += " \ kwindowsystem \ kcrash \ kconfig \ + kconfig-native \ + kcoreaddons-native \ + kauth-native \ kdoctools \ + kdoctools-native \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \ " diff --git a/recipes-kde/kf5/tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb index 8a845a53..5b190916 100644 --- a/recipes-kde/kf5/tier3/kio/kio.bb +++ b/recipes-kde/kf5/tier3/kio/kio.bb @@ -4,22 +4,24 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 cmake_auto_align_paths +inherit kde-kf5 cmake_auto_align_paths gettext DEPENDS += " \ qttools-native \ karchive \ kcodecs \ - kconfig \ - kcoreaddons \ + kconfig-native \ + kcoreaddons-native \ kdbusaddons \ - kdoctools \ + kdoctools-native \ ki18n \ knotifications \ kservice \ solid \ kxmlgui \ kwallet \ + kauth-native \ + sonnet-native \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \ " @@ -27,6 +29,8 @@ PV = "${KF5_VERSION}" SRC_URI[md5sum] = "49c9c0a0f94cfb301ef92578d888eedd" SRC_URI[sha256sum] = "6acb28de757a0d5eccb1e3e533a1ef22b5f5de92e96c3aba804ebdb44aa343c4" +SRC_URI += "file://0001-Extend-upstream-workaround-for-bug-371721-to-also-co.patch" + PACKAGECONFIG[full] = "-DKIOCORE_ONLY=OFF,-DKIOCORE_ONLY=ON, kbookmarks kcompletion kconfigwidgets kiconthemes kitemviews kjobwidgets kwidgetsaddons kwindowsystem" # Note that kdeclarative fails without KIOWidgets PACKAGECONFIG ??= "full" diff --git a/recipes-kde/kf5/tier3/kio/kio/0001-Extend-upstream-workaround-for-bug-371721-to-also-co.patch b/recipes-kde/kf5/tier3/kio/kio/0001-Extend-upstream-workaround-for-bug-371721-to-also-co.patch new file mode 100644 index 00000000..d757eca1 --- /dev/null +++ b/recipes-kde/kf5/tier3/kio/kio/0001-Extend-upstream-workaround-for-bug-371721-to-also-co.patch @@ -0,0 +1,44 @@ +From a64fd0e22ce5beb8f79e615e24c03b4a05a2fd8a Mon Sep 17 00:00:00 2001 +From: Piotr Tworek +Date: Sat, 20 May 2017 13:58:23 +0200 +Subject: [PATCH] Extend upstream workaround for bug 371721 to also cover OE Qt + 5.8. + +Since Qt 5.8 provided by meta-qt5 contains a few additional patches we +need to make sure that the workaround for bug 371721 is also enabled +there. Otherwise kio will fail to build on 32bit arm and x86 platforms. + +Signed-off-by: Piotr Tworek +--- + autotests/CMakeLists.txt | 2 +- + src/core/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt +index 83b7b73..46eabba 100644 +--- a/autotests/CMakeLists.txt ++++ b/autotests/CMakeLists.txt +@@ -125,6 +125,6 @@ ecm_add_tests( + endif() + + # this should be done by cmake, see bug 371721 +-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND Qt5Core_VERSION VERSION_GREATER 5.8.0) ++if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND Qt5Core_VERSION VERSION_GREATER_EQUAL 5.8.0) + set_property(TARGET jobtest APPEND PROPERTY AUTOMOC_MOC_OPTIONS --include ${CMAKE_BINARY_DIR}/src/core/moc_predefs.h) + endif() +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index f324ba0..1220c6e 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -161,7 +161,7 @@ set_target_properties(KF5KIOCore PROPERTIES VERSION ${KIO_VERSION_STRING} + ) + + # this should be done by cmake, see bug 371721 +-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND Qt5Core_VERSION VERSION_GREATER 5.8.0) ++if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND Qt5Core_VERSION VERSION_GREATER_EQUAL 5.8.0) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h + COMMAND "${CMAKE_CXX_COMPILER}" "-dM" "-E" "-c" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp" > ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h +-- +2.13.0 + diff --git a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb index 9ccfa40f..e03fda0b 100644 --- a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb +++ b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb @@ -2,13 +2,16 @@ SUMMARY = "Support for downloading application assets from the network" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit kde-kf5 +inherit kde-kf5 gettext DEPENDS += " \ karchive \ + kauth-native \ kcompletion \ kconfig \ + kconfig-native \ kcoreaddons \ + kcoreaddons-native \ ki18n \ kiconthemes \ kio \ @@ -17,6 +20,7 @@ DEPENDS += " \ kwidgetsaddons \ kxmlgui \ attica \ + sonnet-native \ " PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb index 34814e07..22630c35 100644 --- a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb +++ b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb @@ -2,12 +2,15 @@ SUMMARY = "Configuration system for KNotify" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit kde-kf5 +inherit kde-kf5 gettext DEPENDS += " \ phonon \ + kauth-native \ + kcoreaddons-native \ kcompletion \ kconfig \ + kconfig-native \ ki18n \ kio \ kservice \ diff --git a/recipes-kde/kf5/tier3/kparts/kparts.bb b/recipes-kde/kf5/tier3/kparts/kparts.bb index 513f576e..f3cbf740 100644 --- a/recipes-kde/kf5/tier3/kparts/kparts.bb +++ b/recipes-kde/kf5/tier3/kparts/kparts.bb @@ -4,11 +4,13 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5 gettext DEPENDS += " \ kconfig \ + kconfig-native \ kcoreaddons \ + kcoreaddons-native \ ki18n \ kiconthemes \ kio \ @@ -18,6 +20,8 @@ DEPENDS += " \ ktextwidgets \ kwidgetsaddons \ kxmlgui \ + kauth-native \ + sonnet-native \ " PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier3/kpeople/kpeople.bb b/recipes-kde/kf5/tier3/kpeople/kpeople.bb index b882f1b6..c50ce3dc 100644 --- a/recipes-kde/kf5/tier3/kpeople/kpeople.bb +++ b/recipes-kde/kf5/tier3/kpeople/kpeople.bb @@ -2,9 +2,16 @@ SUMMARY = "Provides access to all contacts" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -inherit kde-kf5 +inherit kde-kf5 gettext -DEPENDS += "kcoreaddons kconfig kservice kwidgetsaddons ki18n kitemviews " +DEPENDS += "kcoreaddons \ + kcoreaddons-native \ + kconfig \ + kconfig-native \ + kservice \ + kwidgetsaddons \ + ki18n \ + kitemviews" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "b03e735f9113b177a9a840c8910c8e02" diff --git a/recipes-kde/kf5/tier3/krunner/krunner.bb b/recipes-kde/kf5/tier3/krunner/krunner.bb index 360d05b5..9c9877d4 100644 --- a/recipes-kde/kf5/tier3/krunner/krunner.bb +++ b/recipes-kde/kf5/tier3/krunner/krunner.bb @@ -2,9 +2,21 @@ SUMMARY = "Framework for providing different actions given a string query" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://src/abstractrunner.h;endline=18;md5=a6a49d7635ef149bcddf8c46f0eae999" -inherit kde-kf5 +inherit kde-kf5 gettext -DEPENDS += "qtdeclarative kconfig kcoreaddons ki18n kio kservice plasma-framework solid threadweaver" +DEPENDS += "qtdeclarative \ + kauth-native \ + kconfig \ + kconfig-native \ + kcoreaddons \ + kcoreaddons-native \ + kpackage-native \ + ki18n \ + kio \ + kservice \ + plasma-framework \ + solid \ + threadweaver" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "7c6f7f251f56b74619cf7cb2cfea857d" diff --git a/recipes-kde/kf5/tier3/kservice/kservice.bb b/recipes-kde/kf5/tier3/kservice/kservice.bb index 8c553cd9..18bdab68 100644 --- a/recipes-kde/kf5/tier3/kservice/kservice.bb +++ b/recipes-kde/kf5/tier3/kservice/kservice.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 gettext -DEPENDS += "kconfig kcoreaddons kcrash kdbusaddons ki18n kdoctools" +DEPENDS += "kconfig kconfig-native kcoreaddons-native kcrash kdbusaddons ki18n kdoctools-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "ab7745b32c5cac8e928c9dc0ad0dde41" diff --git a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb index 862c2793..0f1c5a4d 100644 --- a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb +++ b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb @@ -4,9 +4,22 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5 gettext -DEPENDS += "qtxmlpatterns syntax-highlighting karchive kconfig kguiaddons ki18n kio kparts sonnet libgit2" +DEPENDS += "qtxmlpatterns \ + syntax-highlighting \ + karchive \ + kconfig \ + kconfig-native \ + kcoreaddons-native \ + kauth-native \ + kguiaddons \ + ki18n \ + kio \ + kparts \ + sonnet \ + sonnet-native \ + libgit2" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "da4b300b11c309f72484235313a27351" diff --git a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb index 03910de0..89c21e6d 100644 --- a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb +++ b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -DEPENDS += "kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwidgetsaddons kwindowsystem sonnet" +DEPENDS += "kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwidgetsaddons \ + kwindowsystem sonnet kconfig-native kcoreaddons-native kauth-native \ + gettext-native sonnet-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "7cf308f1e3738ebed99c2ad08245ed6e" diff --git a/recipes-kde/kf5/tier3/kwallet/kwallet.bb b/recipes-kde/kf5/tier3/kwallet/kwallet.bb index 30031b63..57795b46 100644 --- a/recipes-kde/kf5/tier3/kwallet/kwallet.bb +++ b/recipes-kde/kf5/tier3/kwallet/kwallet.bb @@ -7,17 +7,23 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 DEPENDS += " \ - libgcrypt \ - gpgme-native gpgme \ - kconfig \ - kcoreaddons \ - kdbusaddons \ - kiconthemes \ - ki18n \ - knotifications \ - kservice \ - kwidgetsaddons \ - kwindowsystem \ + libgcrypt \ + gpgme \ + gpgme-native \ + kconfig \ + kconfig-native \ + kcoreaddons \ + kcoreaddons-native \ + kdbusaddons \ + kiconthemes \ + ki18n \ + knotifications \ + kservice \ + kwidgetsaddons \ + kwindowsystem \ + gettext-native \ + kdoctools-native \ + kauth-native \ " # TBD: add KF5Gpgmepp with PACKAGECONFIG?? diff --git a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb index b2d4929a..ce519121 100644 --- a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb +++ b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb @@ -10,6 +10,7 @@ inherit kde-kf5 DEPENDS += " \ kitemviews \ kconfig \ + kconfig-native \ kglobalaccel \ kconfigwidgets \ ki18n \ @@ -18,6 +19,10 @@ DEPENDS += " \ kwidgetsaddons \ kwindowsystem \ attica \ + kcoreaddons-native \ + kauth-native \ + sonnet-native \ + gettext-native \ " PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb b/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb index 84a6a512..37f9fe27 100644 --- a/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb +++ b/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = " \ file://COPYING.BSD;md5=5c262c13b60ebefe3060aed37d334ab6 \ " -inherit kde-kf5 +inherit kde-kf5 gettext -DEPENDS += "ki18n kio" +DEPENDS += "ki18n kio kcoreaddons-native kconfig-native kauth-native" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "354e45b75119676fb673bce110f040cd" diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb index a422d7a0..6e62c025 100644 --- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb +++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5 gettext DEPENDS += " \ qtdeclarative \ @@ -14,11 +14,14 @@ DEPENDS += " \ kactivities \ karchive \ kconfig \ + kconfig-native \ kconfigwidgets \ kcoreaddons \ + kcoreaddons-native \ kdbusaddons \ kdeclarative \ kdoctools \ + kdoctools-native \ kglobalaccel \ kguiaddons \ ki18n \ @@ -27,7 +30,9 @@ DEPENDS += " \ kxmlgui \ knotifications \ kpackage \ + kpackage-native \ kwayland \ + kauth-native \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \ " diff --git a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb index a47c1a8b..94730b99 100644 --- a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb +++ b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb @@ -2,10 +2,13 @@ SUMMARY = "Workspace and cross-framework integration plugins" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit kde-kf5 +inherit kde-kf5 gettext DEPENDS += " \ + kauth-native \ kconfig \ + kconfig-native \ + kcoreaddons-native \ kconfigwidgets \ ki18n \ kiconthemes \ @@ -14,6 +17,7 @@ DEPENDS += " \ kwidgetsaddons \ knewstuff \ kpackage \ + kpackage-native \ " RRECCOMENDS_${PN} += "oxygen-fonts" diff --git a/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb b/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb index 124344db..62933b35 100644 --- a/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb +++ b/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477 inherit kde-kf5 -DEPENDS = "qttools" +DEPENDS = "qttools-native" SRC_URI[md5sum] = "fdbf1beac421ef98c41a3a1a3703fbb4" SRC_URI[sha256sum] = "05da02a2db64d20a7a92be6dc642df39da39f957dea8fba9bcb99fb3f3f66de4" diff --git a/recipes-support/xapian/xapian-core_1.4.0.bb b/recipes-support/xapian/xapian-core_1.4.0.bb index 70c08898..34d0caab 100644 --- a/recipes-support/xapian/xapian-core_1.4.0.bb +++ b/recipes-support/xapian/xapian-core_1.4.0.bb @@ -7,12 +7,8 @@ SRC_URI = "http://oligarchy.co.uk/xapian/${PV}/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "5308261e78337604bd8f845dd6b4aafc" SRC_URI[sha256sum] = "10584f57112aa5e9c0e8a89e251aecbf7c582097638bfee79c1fe39a8b6a6477" -inherit autotools cmake_lib +inherit autotools DEPENDS = "util-linux zlib" -# cross libs / headers -CMAKE_ALIGN_SYSROOT[1] = "xapian, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" -CMAKE_ALIGN_SYSROOT[2] = "xapian, -S${includedir}, -S${STAGING_INCDIR}" - FILES_${PN}-dev += "${libdir}/cmake"