From e4cc050604bc260eda26dcf48c95a730bdc0760f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 6 Oct 2017 16:24:47 +0200 Subject: [PATCH] kde-kf5: update 5.36.0 -> 5.38.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * kirigami is now part of KF5 * seems KDE people took care for cross gits: many native recipes can be build now by setting some configuration so many monster-patches could be removed Signed-off-by: Andreas Müller --- classes/kde-kf5-porting-aids.bbclass | 2 +- classes/kde-kf5.bbclass | 4 +- .../kf5/porting-aids-tier1/kjs/kjs.inc | 4 +- ...003-only-build-kf5-config-for-native.patch | 2 +- .../kdelibs4support/kdelibs4support.inc | 4 +- .../kf5/porting-aids-tier3/khtml/khtml.bb | 4 +- .../porting-aids-tier3/kjsembed/kjsembed.bb | 4 +- .../kf5/porting-aids-tier3/kross/kross.bb | 4 +- recipes-kde/kf5/tier1/attica/attica.bb | 4 +- recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb | 4 +- .../kf5/tier1/breeze-icons/breeze-icons.inc | 4 +- recipes-kde/kf5/tier1/karchive/karchive.inc | 4 +- recipes-kde/kf5/tier1/kcodecs/kcodecs.bb | 4 +- ...4-keep-gui-stuff-out-of-native-build.patch | 42 ---------- .../kf5/tier1/kconfig/kconfig-native.bb | 2 +- recipes-kde/kf5/tier1/kconfig/kconfig.inc | 4 +- .../kf5/tier1/kcoreaddons/kcoreaddons.inc | 4 +- .../kf5/tier1/kdbusaddons/kdbusaddons.bb | 4 +- recipes-kde/kf5/tier1/kdnssd/kdnssd.bb | 4 +- .../kf5/tier1/kguiaddons/kguiaddons.bb | 4 +- recipes-kde/kf5/tier1/ki18n/ki18n.inc | 4 +- ...r-Qt5X11Extras-in-x-less-environment.patch | 37 --------- recipes-kde/kf5/tier1/kidletime/kidletime.bb | 6 +- .../tier2 => kf5/tier1}/kirigami/kirigami2.bb | 12 ++- .../kf5/tier1/kitemmodels/kitemmodels.bb | 4 +- .../kf5/tier1/kitemviews/kitemviews.bb | 4 +- recipes-kde/kf5/tier1/kplotting/kplotting.bb | 4 +- recipes-kde/kf5/tier1/kwayland/kwayland.bb | 4 +- .../tier1/kwidgetsaddons/kwidgetsaddons.bb | 4 +- .../kf5/tier1/kwindowsystem/kwindowsystem.bb | 4 +- .../tier1/modemmanager-qt/modemmanager-qt.bb | 4 +- .../networkmanager-qt/networkmanager-qt.bb | 4 +- recipes-kde/kf5/tier1/prison/prison.bb | 4 +- recipes-kde/kf5/tier1/solid/solid.bb | 4 +- ...e-our-cross-build-find-parsetrigrams.patch | 42 ++++++++++ ...l-parsetrigrams-only-we-need-the-nat.patch | 60 -------------- recipes-kde/kf5/tier1/sonnet/sonnet-native.bb | 4 +- recipes-kde/kf5/tier1/sonnet/sonnet.bb | 5 ++ recipes-kde/kf5/tier1/sonnet/sonnet.inc | 5 +- ...-install-katehighlightingindexer-onl.patch | 78 ------------------- ...-install-katehighlightingindexer-onl.patch | 28 +++++++ .../syntax-highlighting-native.bb | 4 +- .../syntax-highlighting.inc | 4 +- .../kf5/tier1/threadweaver/threadweaver.bb | 4 +- .../kactivities-stats/kactivities-stats.bb | 4 +- ...cy-gen-only-with-for-polkit-qt-1-bac.patch | 2 +- recipes-kde/kf5/tier2/kauth/kauth.inc | 4 +- .../kf5/tier2/kcompletion/kcompletion.bb | 4 +- recipes-kde/kf5/tier2/kcrash/kcrash.bb | 4 +- ...h => 0001-don-t-build-documentation.patch} | 0 ...r-cross-build-find-docbookl10nhelper.patch | 41 ++++++++++ ...oc5-it-works-fine-in-our-environment.patch | 42 ---------- ...cutable-so-that-it-can-be-found-for.patch} | 0 ...-Add-cmdline-param-to-help-find-xsl.patch} | 0 .../kf5/tier2/kdoctools/kdoctools-native.bb | 2 +- recipes-kde/kf5/tier2/kdoctools/kdoctools.bb | 13 +++- recipes-kde/kf5/tier2/kdoctools/kdoctools.inc | 8 +- .../kf5/tier2/kfilemetadata/kfilemetadata.bb | 4 +- .../kf5/tier2/kimageformats/kimageformats.bb | 4 +- .../kf5/tier2/kjobwidgets/kjobwidgets.bb | 4 +- .../tier2/knotifications/knotifications.bb | 4 +- recipes-kde/kf5/tier2/kpackage/kpackage.inc | 4 +- recipes-kde/kf5/tier2/kpty/kpty.bb | 4 +- .../tier2/kunitconversion/kunitconversion.bb | 4 +- recipes-kde/kf5/tier3/baloo/baloo.bb | 4 +- .../kf5/tier3/kactivities/kactivities.bb | 4 +- .../kf5/tier3/kbookmarks/kbookmarks.bb | 4 +- recipes-kde/kf5/tier3/kcmutils/kcmutils.bb | 4 +- .../tier3/kconfigwidgets/kconfigwidgets.bb | 4 +- .../kf5/tier3/kdeclarative/kdeclarative.bb | 4 +- recipes-kde/kf5/tier3/kded/kded.bb | 4 +- .../tier3/kdesignerplugin/kdesignerplugin.inc | 4 +- recipes-kde/kf5/tier3/kdesu/kdesu.bb | 4 +- recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb | 4 +- .../kf5/tier3/kemoticons/kemoticons.bb | 4 +- .../kf5/tier3/kglobalaccel/kglobalaccel.bb | 4 +- .../kf5/tier3/kiconthemes/kiconthemes.bb | 5 +- recipes-kde/kf5/tier3/kinit/kinit.bb | 4 +- recipes-kde/kf5/tier3/kio/kio.bb | 4 +- recipes-kde/kf5/tier3/knewstuff/knewstuff.bb | 4 +- .../kf5/tier3/knotifyconfig/knotifyconfig.bb | 4 +- recipes-kde/kf5/tier3/kparts/kparts.bb | 4 +- recipes-kde/kf5/tier3/kpeople/kpeople.bb | 4 +- recipes-kde/kf5/tier3/krunner/krunner.bb | 5 +- recipes-kde/kf5/tier3/kservice/kservice.bb | 4 +- .../kf5/tier3/ktexteditor/ktexteditor.bb | 4 +- .../kf5/tier3/ktextwidgets/ktextwidgets.bb | 4 +- ...D_ROOT_PATH-in-find-to-org.kde.KWall.patch | 35 --------- recipes-kde/kf5/tier3/kwallet/kwallet.bb | 6 +- recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb | 4 +- .../kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb | 4 +- .../plasma-framework/plasma-framework.bb | 4 +- .../frameworkintegration.bb | 4 +- .../extra-cmake-modules.bb | 4 +- recipes-kde/packagegroups/kf5-world.bb | 1 + recipes-kde/packagegroups/plasma-world.bb | 1 - 96 files changed, 285 insertions(+), 469 deletions(-) delete mode 100644 recipes-kde/kf5/tier1/kconfig/files/0004-keep-gui-stuff-out-of-native-build.patch delete mode 100644 recipes-kde/kf5/tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch rename recipes-kde/{plasma/tier2 => kf5/tier1}/kirigami/kirigami2.bb (62%) create mode 100644 recipes-kde/kf5/tier1/sonnet/files/0001-Make-our-cross-build-find-parsetrigrams.patch delete mode 100644 recipes-kde/kf5/tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch delete mode 100644 recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-build-and-install-katehighlightingindexer-onl.patch create mode 100644 recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-install-katehighlightingindexer-onl.patch rename recipes-kde/kf5/tier2/kdoctools/files/{0003-don-t-build-documentation.patch => 0001-don-t-build-documentation.patch} (100%) create mode 100644 recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch delete mode 100644 recipes-kde/kf5/tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch rename recipes-kde/kf5/tier2/kdoctools/files/{0004-set-meinproc5-executable-so-that-it-can-be-found-for.patch => 0003-set-meinproc5-executable-so-that-it-can-be-found-for.patch} (100%) rename recipes-kde/kf5/tier2/kdoctools/files/{0001-Add-cmdline-param-to-help-find-xsl.patch => 0004-Add-cmdline-param-to-help-find-xsl.patch} (100%) delete mode 100644 recipes-kde/kf5/tier3/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch diff --git a/classes/kde-kf5-porting-aids.bbclass b/classes/kde-kf5-porting-aids.bbclass index 76e7b2f9..f02fe724 100644 --- a/classes/kde-kf5-porting-aids.bbclass +++ b/classes/kde-kf5-porting-aids.bbclass @@ -1,3 +1,3 @@ inherit kde-kf5 -SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.36/portingAids/${BPN}-${PV}.tar.xz" +SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.38/portingAids/${BPN}-${PV}.tar.xz" diff --git a/classes/kde-kf5.bbclass b/classes/kde-kf5.bbclass index fe04e953..6ee55797 100644 --- a/classes/kde-kf5.bbclass +++ b/classes/kde-kf5.bbclass @@ -1,5 +1,5 @@ inherit kde-base -KF5_VERSION = "5.36.0" +KF5_VERSION = "5.38.0" -SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.36/${BPN}-${PV}.tar.xz" +SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.38/${BPN}-${PV}.tar.xz" diff --git a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc index 95370e5f..f3cc54ce 100644 --- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc +++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-kf5-porting-aids perlnative PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "3ba71d88c9617cb18a3e989647cc1aa6" -SRC_URI[sha256sum] = "c6929aa120384c1de8024d8a5a5462ad1604295171761840f36342a9e4e9ff1a" +SRC_URI[md5sum] = "5964be7c03b09c526e7f5a893f570130" +SRC_URI[sha256sum] = "c173775230d93ef9da043e2664c71d0bd84c6dc4b05b881730dbcf32012a3c36" SRC_URI += "file://0001-create_hash_table-avoid-polution-of-files-with-build.patch" DEPENDS += " \ diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch index 14b03fe8..a878372b 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch @@ -24,7 +24,7 @@ index 8dd22f3..5b659ab 100644 @@ -20,30 +20,11 @@ include(GenerateExportHeader) include(CMakeFindFrameworks) - set(REQUIRED_QT_VERSION 5.6.0) + set(REQUIRED_QT_VERSION 5.7.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network DBus Test) diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc index 216c6e13..3cf00257 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5-porting-aids perlnative PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "eba066853792973f773c784155638bac" -SRC_URI[sha256sum] = "d8de45922f805a752b147b568a4df196b02024efc3ec7b930c2997e6817d3e10" +SRC_URI[md5sum] = "b587f8ab7743b5af426015d18d28e3ac" +SRC_URI[sha256sum] = "f72aac163070bd116a112b7918a71d9dc79f945b19e5f449e55704e1e37f741b" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" diff --git a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb index 1812acce..c68d2793 100644 --- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb +++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb @@ -37,8 +37,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "e5daf053ec2de8d3969e23cc428fb24f" -SRC_URI[sha256sum] = "fad99c7f46f4ad932300d0ad9dafeb9b18fc32de05efa937e9df0f7b138c5395" +SRC_URI[md5sum] = "219bda94e78e969e9feaacbd0e0f0105" +SRC_URI[sha256sum] = "fe35153e0d89ca984fe6609ce2365a94eb21849e9d69e201a195af36d40e4639" do_compile_append() { # gperf-native sets absolut debug comments/links in header diff --git a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb index 66c5a81b..5918cb64 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb @@ -17,8 +17,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "79e3d7c3b4674d1979b4d508d6909bc1" -SRC_URI[sha256sum] = "49bf01a91f227d7daa1b41f1e792054a814de4f1783c4a44a316123fbb938580" +SRC_URI[md5sum] = "047b61f45a48cece8f7e565ae31a0a51" +SRC_URI[sha256sum] = "0afdf41564f2f00e98c13cb160e9405ac40c11836dc0f354b50f01418a3d6059" # 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${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 fa7fa60e..cce4d46f 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb @@ -25,8 +25,8 @@ DEPENDS += "\ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "b1e77577441fb9c923f73254eadb6b26" -SRC_URI[sha256sum] = "586a0d68ab924dd48d7f41f04ac412b6356e33dd9fb962043480347ee7ff127a" +SRC_URI[md5sum] = "6253ac0e23c7ad1891abdf44b2a3a773" +SRC_URI[sha256sum] = "670dc18d258e8f821fcd64ba30c587ac3afaecbc54d968edb0fe624682788cb5" FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ diff --git a/recipes-kde/kf5/tier1/attica/attica.bb b/recipes-kde/kf5/tier1/attica/attica.bb index 9f503df3..dd1e2eda 100644 --- a/recipes-kde/kf5/tier1/attica/attica.bb +++ b/recipes-kde/kf5/tier1/attica/attica.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -SRC_URI[md5sum] = "5b9d45e8a882043e4d4391fb139dac74" -SRC_URI[sha256sum] = "8dd2998f5c9b5f727ec406385f065907f1c6b094ac47d3c1eaae2b858c9f258a" +SRC_URI[md5sum] = "366118f43bd8ed2dcd484ae00725999c" +SRC_URI[sha256sum] = "26f124e686d4a1ff005798958d63ddccd0bc23a763ea0578c4d2337a1a6b558b" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb b/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb index 3826f1ab..a2641323 100644 --- a/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb +++ b/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb @@ -7,8 +7,8 @@ inherit kde-kf5 DEPENDS += "qtdeclarative" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "1d7746c1954d862014ee52220da12c37" -SRC_URI[sha256sum] = "1c01f1de86bad18b901e30a1375d816870e0cb80bf67b9d356d4114a852b6fe4" +SRC_URI[md5sum] = "be9177e6aeb8e1d803446be4298fcd1f" +SRC_URI[sha256sum] = "9b532f16b8a226f48dc8e09f00ae1896aef14f4ab211db3fdbab6a729faf5641" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" diff --git a/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc b/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc index bbf5c38a..04809898 100644 --- a/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc +++ b/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -SRC_URI[md5sum] = "7610acf496bb0dc43089e1f71388f450" -SRC_URI[sha256sum] = "c39d5bb13f1a3e81ac5cc10f44f842228c7441a98c3c370aa55ca93ffc9566a5" +SRC_URI[md5sum] = "6f313cbfe1ca5b009ca715cb311f40a8" +SRC_URI[sha256sum] = "89291dd396bd0f42e9b90eb92f46895fa461ebc2b420a58c663e0c4898894e25" DEPENDS += "libxml2-native" diff --git a/recipes-kde/kf5/tier1/karchive/karchive.inc b/recipes-kde/kf5/tier1/karchive/karchive.inc index 7bb5fe35..b3992e35 100644 --- a/recipes-kde/kf5/tier1/karchive/karchive.inc +++ b/recipes-kde/kf5/tier1/karchive/karchive.inc @@ -10,5 +10,5 @@ inherit kde-kf5 DEPENDS += "bzip2 xz zlib" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "509d9adf69ed388ab0c618a0ae6e37ee" -SRC_URI[sha256sum] = "001c62493990bbaa9ed7d14265c6ae47b827713859b00533161526c08ce62351" +SRC_URI[md5sum] = "99ba8008d22e71af13376240f94ec742" +SRC_URI[sha256sum] = "9354d45219342b888ac0eccbc3ce3a054858fcce9d4c93817352d2b447ebb658" diff --git a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb index fac52f5f..030fc260 100644 --- a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb +++ b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb @@ -10,8 +10,8 @@ inherit kde-kf5 DEPENDS += "gperf-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "71e596b9d9a23fe23db586394e029ad9" -SRC_URI[sha256sum] = "6cff3e88f9cd623509caad8cc4e20993189fdc5071f9b5c05fbcf58850dabe6c" +SRC_URI[md5sum] = "0c61dbac726ba5ae04d0eec654823e9c" +SRC_URI[sha256sum] = "31a22d37da33d86d492b4bf5e439566d8f6a0783f74382931cee4c59a482dd32" do_compile_append() { # gperf-native sets absolut debug comments/links in header diff --git a/recipes-kde/kf5/tier1/kconfig/files/0004-keep-gui-stuff-out-of-native-build.patch b/recipes-kde/kf5/tier1/kconfig/files/0004-keep-gui-stuff-out-of-native-build.patch deleted file mode 100644 index 53c7f01f..00000000 --- a/recipes-kde/kf5/tier1/kconfig/files/0004-keep-gui-stuff-out-of-native-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5dbf63f820aac695f093f42722e5b312bb3b7834 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sat, 14 Nov 2015 21:45:16 +0100 -Subject: [PATCH 2/2] keep gui stuff out of native build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 2 +- - src/CMakeLists.txt | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d8f4d1..34edb5b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - - set(REQUIRED_QT_VERSION 5.3.0) - --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Xml) -+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml) - include(KDEInstallDirs) - include(KDEFrameworkCompilerSettings) - include(KDECMakeSettings) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 916d51f..d320f36 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,4 @@ - add_subdirectory(core) --add_subdirectory(gui) - add_subdirectory(kconfig_compiler) - add_subdirectory(kconf_update) - add_subdirectory(kreadconfig) --- -2.1.0 - diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig-native.bb b/recipes-kde/kf5/tier1/kconfig/kconfig-native.bb index 18fad751..95a36bb2 100644 --- a/recipes-kde/kf5/tier1/kconfig/kconfig-native.bb +++ b/recipes-kde/kf5/tier1/kconfig/kconfig-native.bb @@ -2,4 +2,4 @@ require ${BPN}.inc inherit native -SRC_URI += "file://0004-keep-gui-stuff-out-of-native-build.patch" +EXTRA_OECMAKE += "-DKCONFIG_USE_GUI=OFF" diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig.inc b/recipes-kde/kf5/tier1/kconfig/kconfig.inc index 46f254e9..1b3ad3fb 100644 --- a/recipes-kde/kf5/tier1/kconfig/kconfig.inc +++ b/recipes-kde/kf5/tier1/kconfig/kconfig.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 cmake_lib PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "79352591234d65d2b4c4ceef6a159f81" -SRC_URI[sha256sum] = "b31e3a8595fa8dc14aa0b1828633c712205097a6e3d14650ae813d4d7833d654" +SRC_URI[md5sum] = "374d5ef43ee86c747e1cc4b331b58962" +SRC_URI[sha256sum] = "79744af26c90b78f01e065049daea0a6470f0d8b8e71334652179bac1b12243a" # REVISIT remove ugly hack for wayland-only environments SRC_URI += " \ diff --git a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc index 7c0c5713..2889b8ea 100644 --- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc +++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc @@ -7,5 +7,5 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 mime PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "bd9aeb46ccee0bea7c5db551ce57880c" -SRC_URI[sha256sum] = "9d4b26bf22d1326c37f33aa4727942325cad2b23e5b3f1e32ec9ee558e9b5594" +SRC_URI[md5sum] = "ae03b9615517226713768034c211fb0d" +SRC_URI[sha256sum] = "9be3dd86402e173da025c0d326fd9a38ffeecb34828a287f8b8c530a5db275d4" diff --git a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb index 5b948398..1211800c 100644 --- a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb +++ b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb @@ -11,5 +11,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "acf1dfd56ed838a324ec8bd17524cbae" -SRC_URI[sha256sum] = "8433cfb3ccb67b1364ad5594a278ec5a920b8e10fb43b7b615acaa7fdb5f4e04" +SRC_URI[md5sum] = "256185290caea450b8e29c8b50bdd776" +SRC_URI[sha256sum] = "1c1f8955570cd7e0480ec619084c5ea56cbffaca5307d9053d52092f10d589d7" diff --git a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb index adb318bf..7fe119ae 100644 --- a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb +++ b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb @@ -10,5 +10,5 @@ inherit kde-kf5 DEPENDS += "avahi" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "a7a306c634c133dc0b48fdd9e5db5322" -SRC_URI[sha256sum] = "57504b89b327e0c4439c1be8037e13aba588155d5201adb3e81a1b52f8e28e1e" +SRC_URI[md5sum] = "f3fd062c121db1cf1984a72c4011ffaa" +SRC_URI[sha256sum] = "1d70cc194e45fe12e09005948fb794a3deb1e2d58d0269bef3a30a9cfbf32f80" diff --git a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb index 37b68554..5eaed19a 100644 --- a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb +++ b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb @@ -12,5 +12,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "c65ca0ab165e6c01fc2e7a0993526053" -SRC_URI[sha256sum] = "8c782147fdfab9876d66ec1e5d598043621bd6a6795e74e263333df7938a91f6" +SRC_URI[md5sum] = "d32dabd2b443c53ad210e737106a227d" +SRC_URI[sha256sum] = "01a6350be86f86fb11625393fdc2cb1fe70b7289d06140afa7b0186339047aca" diff --git a/recipes-kde/kf5/tier1/ki18n/ki18n.inc b/recipes-kde/kf5/tier1/ki18n/ki18n.inc index 6b551399..8fc89cca 100644 --- a/recipes-kde/kf5/tier1/ki18n/ki18n.inc +++ b/recipes-kde/kf5/tier1/ki18n/ki18n.inc @@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "cf50f5b6f1d927148bfd1d456a9426ca" -SRC_URI[sha256sum] = "c0c9877a7c4f4d0630e934a903cc27fd127d0be63531c50ea77d63e10119558b" +SRC_URI[md5sum] = "8681766fc193c7d9cd0a728adfc14f18" +SRC_URI[sha256sum] = "240ccf22a65cf85da900c88afceac8bedc40b71a4d19bad526c03aa285cc2a7d" diff --git a/recipes-kde/kf5/tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch b/recipes-kde/kf5/tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch deleted file mode 100644 index bb0c211f..00000000 --- a/recipes-kde/kf5/tier1/kidletime/files/0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4f41c2cffc007a927bda10db3737c98dbefa187f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 3 Dec 2014 14:52:14 +0100 -Subject: [PATCH] Do not search for Qt5X11Extras in x-less environments -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d89bb9f..cfdb8e0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,7 +29,7 @@ set(REQUIRED_QT_VERSION 5.2.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) -@@ -42,6 +42,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) - if (X11_XSync_FOUND AND XCB_XCB_FOUND AND X11_XCB_FOUND AND XCB_SYNC_FOUND) --- -1.8.3.1 - diff --git a/recipes-kde/kf5/tier1/kidletime/kidletime.bb b/recipes-kde/kf5/tier1/kidletime/kidletime.bb index 1506015f..4638b83a 100644 --- a/recipes-kde/kf5/tier1/kidletime/kidletime.bb +++ b/recipes-kde/kf5/tier1/kidletime/kidletime.bb @@ -10,10 +10,8 @@ inherit kde-kf5 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras libxscrnsaver", "", d)}" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "b5f18934e03eb0260d68f2db61654043" -SRC_URI[sha256sum] = "34315b6174e69fa371c3f4236c4de9e14eab46e2464c48c1be252a27b4fa1ab6" - -SRC_URI += "file://0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch" +SRC_URI[md5sum] = "bbb6b47b54bc48375e18e239e5ceb3ff" +SRC_URI[sha256sum] = "5bd30a316ea72a44ed4e4f7f11533e5aa74fc817f360f471b2658ac560e221c5" FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}" FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug" diff --git a/recipes-kde/plasma/tier2/kirigami/kirigami2.bb b/recipes-kde/kf5/tier1/kirigami/kirigami2.bb similarity index 62% rename from recipes-kde/plasma/tier2/kirigami/kirigami2.bb rename to recipes-kde/kf5/tier1/kirigami/kirigami2.bb index 582d446a..6dd1702e 100644 --- a/recipes-kde/plasma/tier2/kirigami/kirigami2.bb +++ b/recipes-kde/kf5/tier1/kirigami/kirigami2.bb @@ -2,21 +2,19 @@ SUMMARY = "QtQuick plugins to build user interfaces based on the KDE UX guidelin LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://LICENSE.LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2" -# not yet in plasma -inherit kde-base +inherit kde-kf5 # Is that true: We are depending on plasma-framework and are a tier2?? DEPENDS += " \ - plasma-framework \ kpackage-native \ qtquickcontrols2 \ + qtsvg \ " -PV = "2.1.1" +PV = "${KF5_VERSION}" -SRC_URI = "${KDE_MIRROR}/stable/kirigami/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "f25e9dc6df1466f69b72ef8d70b034a6" -SRC_URI[sha256sum] = "ea3796058f302dabf21b7c58a05e543da5d7407414a9001d26d4318962a872ad" +SRC_URI[md5sum] = "1bf738daca4cfdb41eebf2a3c6cf62b2" +SRC_URI[sha256sum] = "6c84eca0fdb7cd852aae36c45f40195dd16e17608aec2ce8fbf555198b0c64a2" FILES_${PN} += " \ ${OE_QMAKE_PATH_QML} \ diff --git a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb index 996492d2..166edc02 100644 --- a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb +++ b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb @@ -9,5 +9,5 @@ inherit kde-kf5 DEPENDS += "qtdeclarative" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "48e3bbe0411277c8b020331045b82133" -SRC_URI[sha256sum] = "2a05bc2f807b725de0515dbc12f031b00026e97d0901a8d05f475ad9b2926b23" +SRC_URI[md5sum] = "e42f53f01ca5621565993457a6454a7b" +SRC_URI[sha256sum] = "4cfa7661b6d3c1e242b92c9200383400398af1db341dbbd2de573429898d4068" diff --git a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb index 74a5be68..2551fb3f 100644 --- a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb +++ b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb @@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "04c06d90b5c6d0ba4fcf2de363a9e450" -SRC_URI[sha256sum] = "74ead758a65746d9404bfa4cfbebb95fdada196246b38b07b68c7094cdf22a06" +SRC_URI[md5sum] = "da718834b9981611f04817599dca8a55" +SRC_URI[sha256sum] = "46df0b2a0fe436cac2e1984d9038ac894ac86d9650db5328fa7069a13f46b151" diff --git a/recipes-kde/kf5/tier1/kplotting/kplotting.bb b/recipes-kde/kf5/tier1/kplotting/kplotting.bb index 8e4e171e..bbd98edb 100644 --- a/recipes-kde/kf5/tier1/kplotting/kplotting.bb +++ b/recipes-kde/kf5/tier1/kplotting/kplotting.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "4cc9f225aa5b85e099a3b6c899148c7d" -SRC_URI[sha256sum] = "a7e7b00f0202ac97b0ec36e7acd240a8f9c8cacdec45a71a1314e37a7a9a4b3d" +SRC_URI[md5sum] = "a671c32a91894cae435af5dfe4002f04" +SRC_URI[sha256sum] = "e2d8ef624735a56f3998c88af6f06209221af5f27ef05096d65ebb124dc56ec3" diff --git a/recipes-kde/kf5/tier1/kwayland/kwayland.bb b/recipes-kde/kf5/tier1/kwayland/kwayland.bb index 9dff0420..134ff6c0 100644 --- a/recipes-kde/kf5/tier1/kwayland/kwayland.bb +++ b/recipes-kde/kf5/tier1/kwayland/kwayland.bb @@ -9,5 +9,5 @@ inherit kde-kf5 cmake_auto_align_paths DEPENDS += "wayland wayland-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "3634281366afa7e86d1c570ea04ab467" -SRC_URI[sha256sum] = "a2c473c7f5cefc87b5b63813fa1373c43c1c8374423fb85fe1c187b553453341" +SRC_URI[md5sum] = "238581b848d84a3d4c94e38271880eac" +SRC_URI[sha256sum] = "404aaf11e144a42b2422a5a47aaf04fb629c4a468689bd8f543c0de6b745a53d" diff --git a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb index 77762e67..1a2f41ea 100644 --- a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb +++ b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb @@ -10,5 +10,5 @@ inherit kde-kf5 DEPENDS += "qttools" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "5b055d6eba258d03064cb7bbf247523c" -SRC_URI[sha256sum] = "bc9a62d24f6bdd0e8830481f915744cf640660c99ecb54cbeea73de5b218a20b" +SRC_URI[md5sum] = "4c6a5f0a06c4abeb962d26d05eb060a8" +SRC_URI[sha256sum] = "45ee4f81cd91e61e82306f757a06849644fde73e09650e0498797cdc3a4604fa" diff --git a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb index 12e69550..acab423e 100644 --- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb +++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb @@ -9,8 +9,8 @@ inherit kde-kf5 cmake_auto_align_paths cmake_lib DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)}" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "20af029d14d4e897c26223f4352fd2c9" -SRC_URI[sha256sum] = "8a1991e36ed74daa2085ea936d26adf59edd11d7d5c08a9b721a670a21821172" +SRC_URI[md5sum] = "a5e477320cdf30be8c484e26bffbcf97" +SRC_URI[sha256sum] = "2c16eb635714ff122b9348c0cc880be60d08c817c98026029f78434d918db90b" CMAKE_ALIGN_SYSROOT[1] = "KF5WindowSystem, -S${includedir}, -s${_IMPORT_PREFIX}/include" diff --git a/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb b/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb index 4c25c020..77b64001 100644 --- a/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb +++ b/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb @@ -7,8 +7,8 @@ inherit kde-kf5 pkgconfig cmake_auto_align_paths cmake_lib DEPENDS += "modemmanager" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "ce604b8ea3616cd3c06e58b8fbf95b83" -SRC_URI[sha256sum] = "0e806c01add2c02492e8fcdfff718cedcf3e1cf25e661f6d930e3adec9192f51" +SRC_URI[md5sum] = "1d7ab0338a93d00a558b4469c5614a11" +SRC_URI[sha256sum] = "3c214a46b257fd8798ccbf38f9b099c5172dcf108958320ce39eae9e29aa0aa2" CMAKE_ALIGN_SYSROOT[1] = "KF5ModemManagerQt, -S${includedir}, -s${_IMPORT_PREFIX}/include" diff --git a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb index 733ac208..6f7eba47 100644 --- a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb +++ b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb @@ -7,8 +7,8 @@ inherit kde-kf5 pkgconfig cmake_auto_align_paths cmake_lib DEPENDS += "networkmanager" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "18b476e6a7ea204b3e614e77756e1286" -SRC_URI[sha256sum] = "5d2845ea6b25e1c73f6ce2b9236a3ceccf3271c4d18f67fa917cee13154e31d6" +SRC_URI[md5sum] = "db04eae390784758edaa342f2051bbc0" +SRC_URI[sha256sum] = "c8adcd1bb9f50c4a1455bfc99684632a1812779e50607e1375b5de3bb345a281" CMAKE_ALIGN_SYSROOT[1] = "KF5NetworkManagerQt, -S${includedir}, -s${_IMPORT_PREFIX}/include" CMAKE_ALIGN_SYSROOT[2] = "KF5NetworkManagerQt, -S;${libdir}, -s;${_IMPORT_PREFIX}/lib" diff --git a/recipes-kde/kf5/tier1/prison/prison.bb b/recipes-kde/kf5/tier1/prison/prison.bb index 4a300314..32edf7ac 100644 --- a/recipes-kde/kf5/tier1/prison/prison.bb +++ b/recipes-kde/kf5/tier1/prison/prison.bb @@ -11,7 +11,7 @@ DEPENDS += " \ libdmtx \ " -SRC_URI[md5sum] = "7b3ce37421da15aa824ba67df5029b7d" -SRC_URI[sha256sum] = "e3832e77904fbec6a18453f55ab03e93d3ced76ba78c7ada6919a8b76b7da238" +SRC_URI[md5sum] = "f09a43aab6f6c37c285be9a1e1a5bacf" +SRC_URI[sha256sum] = "95bc65c9164b8ed8cace08be7dfdf12cc9a398a42e2b4c66852faaa1cd1f325f" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/solid/solid.bb b/recipes-kde/kf5/tier1/solid/solid.bb index 9cf05bbf..42d6a22b 100644 --- a/recipes-kde/kf5/tier1/solid/solid.bb +++ b/recipes-kde/kf5/tier1/solid/solid.bb @@ -9,8 +9,8 @@ inherit kde-kf5 DEPENDS += "qtdeclarative" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "361c1e98bb8c7d60c7bc743d639e7888" -SRC_URI[sha256sum] = "b10d3d5e1b1f30dd9e283575ab66a4279f0114207b6a69ab1a657403ef03efac" +SRC_URI[md5sum] = "e8de6f8d07cee4e2061e2142e8ff61b3" +SRC_URI[sha256sum] = "1052830aaed16391563dc35fe0e01bba2813acf2e0c70fa2223d54d2732b6cac" FILES_${PN} += "${OE_QMAKE_PATH_QML}" FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/${BPN}/.debug" diff --git a/recipes-kde/kf5/tier1/sonnet/files/0001-Make-our-cross-build-find-parsetrigrams.patch b/recipes-kde/kf5/tier1/sonnet/files/0001-Make-our-cross-build-find-parsetrigrams.patch new file mode 100644 index 00000000..a34970dd --- /dev/null +++ b/recipes-kde/kf5/tier1/sonnet/files/0001-Make-our-cross-build-find-parsetrigrams.patch @@ -0,0 +1,42 @@ +From 5c5b3a0daa47009ede84061a904dbb43eceb61ed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 6 Oct 2017 12:36:36 +0200 +Subject: [PATCH] Make our cross build find parsetrigrams +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + data/CMakeLists.txt | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index 100b05f..17a5c98 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -15,18 +15,12 @@ INSTALL(TARGETS parsetrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFA + INSTALL(TARGETS gentrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) + + cmake_policy(SET CMP0026 OLD) # FIXME: make this work with CMP0026 set to NEW +-if(CMAKE_CROSSCOMPILING AND PARSETRIGRAMS_EXECUTABLE) +- add_executable(KF5::parsetrigrams IMPORTED GLOBAL) +- set_target_properties(KF5::parsetrigrams PROPERTIES IMPORTED_LOCATION ${PARSETRIGRAMS_EXECUTABLE}) +-else() +- add_executable(KF5::parsetrigrams ALIAS parsetrigrams) +-endif() + + macro(create_trigrams_map _target_name _in_DIR _out_FILE) + get_target_property(PARSETRIGRAMS_EXECUTABLE parsetrigrams LOCATION) + add_custom_target(trigrams_${_target_name} ALL) + add_custom_command(TARGET trigrams_${_target_name} +- COMMAND $ "${_in_DIR}" > "${_out_FILE}" ++ COMMAND parsetrigrams "${_in_DIR}" > "${_out_FILE}" + ) + + add_dependencies(trigrams_${_target_name} parsetrigrams) +-- +2.9.4 + diff --git a/recipes-kde/kf5/tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch b/recipes-kde/kf5/tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch deleted file mode 100644 index defbec80..00000000 --- a/recipes-kde/kf5/tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3a6f33573dc8a15d7b283f546352ae9423257a55 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 22 Feb 2017 17:16:03 +0100 -Subject: [PATCH] build and install parsetrigrams and gentrigrams only - we need the native ones - for cross compilation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [cross-specific] - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 6 +++--- - src/CMakeLists.txt | 3 +-- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9dec6f6..4db53dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) - include(KDECMakeSettings) - - set(REQUIRED_QT_VERSION 5.6.0) --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) -+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) - - - include(GenerateExportHeader) -@@ -37,11 +37,10 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - endif() - - add_subdirectory(src) --add_subdirectory(autotests) - add_subdirectory(data) --add_subdirectory(examples) - - -+if(False) - # create a Config.cmake and a ConfigVersion.cmake file and install them - set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Sonnet") - -@@ -61,3 +60,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sonnet_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) - - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -+endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index cf40289..8b421fc 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,3 +1,2 @@ - add_subdirectory(core) --add_subdirectory(plugins) --add_subdirectory(ui) -+ --- -2.7.4 - diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet-native.bb b/recipes-kde/kf5/tier1/sonnet/sonnet-native.bb index 7a59da92..5e749b45 100644 --- a/recipes-kde/kf5/tier1/sonnet/sonnet-native.bb +++ b/recipes-kde/kf5/tier1/sonnet/sonnet-native.bb @@ -2,6 +2,4 @@ require ${BPN}.inc inherit native -SRC_URI += " \ - file://0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch \ -" +EXTRA_OECMAKE += "-DSONNET_USE_WIDGETS=OFF" diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.bb b/recipes-kde/kf5/tier1/sonnet/sonnet.bb index 41cac250..4ae70669 100644 --- a/recipes-kde/kf5/tier1/sonnet/sonnet.bb +++ b/recipes-kde/kf5/tier1/sonnet/sonnet.bb @@ -2,6 +2,11 @@ require ${BPN}.inc inherit cmake_lib +SRC_URI += " \ + file://0001-Make-our-cross-build-find-parsetrigrams.patch \ + file://0002-make-build-of-hunspell-optional.patch \ +" + DEPENDS += "${BPN}-native" do_configure_append() { diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.inc b/recipes-kde/kf5/tier1/sonnet/sonnet.inc index d02a3180..d9758168 100644 --- a/recipes-kde/kf5/tier1/sonnet/sonnet.inc +++ b/recipes-kde/kf5/tier1/sonnet/sonnet.inc @@ -5,6 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "06e49a720e9d8f7e79142638a978580a" -SRC_URI[sha256sum] = "accf0724615abf684258fa087e4166e803385ec4190f92c792fd16e8189366ed" -SRC_URI += "file://0002-make-build-of-hunspell-optional.patch" +SRC_URI[md5sum] = "6ac11f0762e2100b4b32555bc65f6514" +SRC_URI[sha256sum] = "aa73bb8a599f7b2ed14c043726ffe2d6399f1fd9a3daa51f12685aae11baa58c" diff --git a/recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-build-and-install-katehighlightingindexer-onl.patch b/recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-build-and-install-katehighlightingindexer-onl.patch deleted file mode 100644 index cc906e43..00000000 --- a/recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-build-and-install-katehighlightingindexer-onl.patch +++ /dev/null @@ -1,78 +0,0 @@ -From a92cfa17c92b589aea69221aa28658b7c948be68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 13 Dec 2016 23:24:59 +0100 -Subject: [PATCH] native: build and install katehighlightingindexer only -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded-specific] - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 8 ++++++-- - src/CMakeLists.txt | 2 -- - src/indexer/CMakeLists.txt | 2 ++ - 3 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45be66c..799c3ef 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,8 +33,8 @@ ecm_setup_version(${KF5_VERSION} - # 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 QUIET OPTIONAL_COMPONENTS Widgets XmlPatterns) -+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Core Network Test) -+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE QUIET OPTIONAL_COMPONENTS XmlPatterns) - set_package_properties(Qt5 PROPERTIES URL "http://qt-project.org/") - set_package_properties(Qt5Widgets PROPERTIES PURPOSE "Example application.") - set_package_properties(Qt5XmlPatterns PROPERTIES PURPOSE "Compile-time validation of syntax definition files.") -@@ -42,6 +42,7 @@ set_package_properties(Qt5XmlPatterns PROPERTIES PURPOSE "Compile-time validatio - find_package(Perl REQUIRED) - set_package_properties(Perl PROPERTIES PURPOSE "Auto-generate PHP syntax definition files.") - -+if(False) - # - # Translations - # -@@ -54,7 +55,9 @@ endif() - # - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - add_subdirectory(data) -+endif() - add_subdirectory(src) -+if(False) - add_subdirectory(examples) - add_subdirectory(autotests) - -@@ -84,5 +87,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ksyntaxhighlighting_version.h" - DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}" - COMPONENT Devel) - install(FILES org_kde_ksyntaxhighlighting.categories DESTINATION ${KDE_INSTALL_CONFDIR}) -+endif() - - feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f9faade..8cdf605 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,3 +1 @@ - add_subdirectory(indexer) --add_subdirectory(lib) --add_subdirectory(cli) -diff --git a/src/indexer/CMakeLists.txt b/src/indexer/CMakeLists.txt -index a2c7ef7..7eed2a1 100644 ---- a/src/indexer/CMakeLists.txt -+++ b/src/indexer/CMakeLists.txt -@@ -5,3 +5,5 @@ if(Qt5XmlPatterns_FOUND) - else() - target_link_libraries(katehighlightingindexer Qt5::Core) - endif() -+ -+install(TARGETS katehighlightingindexer DESTINATION "${CMAKE_INSTALL_BINDIR}") --- -2.5.5 - diff --git a/recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-install-katehighlightingindexer-onl.patch b/recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-install-katehighlightingindexer-onl.patch new file mode 100644 index 00000000..e6fe4f03 --- /dev/null +++ b/recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-install-katehighlightingindexer-onl.patch @@ -0,0 +1,28 @@ +From a92cfa17c92b589aea69221aa28658b7c948be68 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 13 Dec 2016 23:24:59 +0100 +Subject: [PATCH] native: install katehighlightingindexer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded-specific] + +Signed-off-by: Andreas Müller +--- + src/indexer/CMakeLists.txt | 2 ++ + 3 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/indexer/CMakeLists.txt b/src/indexer/CMakeLists.txt +index a2c7ef7..7eed2a1 100644 +--- a/src/indexer/CMakeLists.txt ++++ b/src/indexer/CMakeLists.txt +@@ -5,3 +5,5 @@ if(Qt5XmlPatterns_FOUND) + else() + target_link_libraries(katehighlightingindexer Qt5::Core) + endif() ++ ++install(TARGETS katehighlightingindexer DESTINATION "${CMAKE_INSTALL_BINDIR}") +-- +2.5.5 + diff --git a/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting-native.bb b/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting-native.bb index 230a156c..629d26bc 100644 --- a/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting-native.bb +++ b/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting-native.bb @@ -3,5 +3,7 @@ require ${BPN}.inc inherit native SRC_URI += " \ - file://0001-native-build-and-install-katehighlightingindexer-onl.patch \ + file://0001-native-install-katehighlightingindexer-onl.patch \ " + +EXTRA_OECMAKE += "-DKSYNTAXHIGHLIGHTING_USE_GUI=OFF" diff --git a/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc b/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc index cebf0c94..1e5fc905 100644 --- a/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc +++ b/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 perlnative -SRC_URI[md5sum] = "9a1baefeab4678561ee7cd6c8df8661b" -SRC_URI[sha256sum] = "925a8845cd3a1d1720753aaba80f364d59612d45a71de089531d5e8dfa94fdc5" +SRC_URI[md5sum] = "5cb3fa13c05ed0ba59348eb2ba52e727" +SRC_URI[sha256sum] = "d4b887e2b4c0bb0d0c723325b11897d1ab38a644e3276d57eae8393928783680" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb index 73d10a49..117e6727 100644 --- a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb +++ b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "54e569f32cc43a95c0f1ab413c0acac2" -SRC_URI[sha256sum] = "a15e52811fbc710a618e060c3f7f7cb4623805c83e8a5b24d9f326b55a3be9a7" +SRC_URI[md5sum] = "be774a78a3b7827f107118ffb67cf772" +SRC_URI[sha256sum] = "db6dca72315a376fa8852f0059113a5880a002e311e5f4591138303b69a209b5" diff --git a/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb b/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb index a02ec78c..049cabc9 100644 --- a/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb +++ b/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb @@ -16,5 +16,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "d6652f6a8601434104a0719a70bc24f2" -SRC_URI[sha256sum] = "10fdc3ead08aac011b3c6535743c6d172f60a8e31134050e9c840862d4dbf7c1" +SRC_URI[md5sum] = "529ba85f3ff2c78e9b0cbc619ab9a564" +SRC_URI[sha256sum] = "a23955ce584ea0a1be8fe17b0b9cad819279b7518d3a9cf175a40e4bc08fa768" diff --git a/recipes-kde/kf5/tier2/kauth/files/0002-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch b/recipes-kde/kf5/tier2/kauth/files/0002-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch index 3a9f5895..009c86e9 100644 --- a/recipes-kde/kf5/tier2/kauth/files/0002-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch +++ b/recipes-kde/kf5/tier2/kauth/files/0002-build-kauth-policy-gen-only-with-for-polkit-qt-1-bac.patch @@ -24,7 +24,7 @@ index 88242e6..7d4140b 100644 @@ -12,7 +12,7 @@ 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) include(KDEInstallDirs) diff --git a/recipes-kde/kf5/tier2/kauth/kauth.inc b/recipes-kde/kf5/tier2/kauth/kauth.inc index 85bd8bd7..fa4a4d1e 100644 --- a/recipes-kde/kf5/tier2/kauth/kauth.inc +++ b/recipes-kde/kf5/tier2/kauth/kauth.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "2b86a68ac78057345a9727f0adf43d24" -SRC_URI[sha256sum] = "d3f94113d14f85894f59f234efebfec8c42b4b8a8452460b7f4f2ccc03657d28" +SRC_URI[md5sum] = "09df0ec91747f1f216cd5a703b165ce3" +SRC_URI[sha256sum] = "279af9593b3bf8b2730730877ff865944839e08d21855ea25864934fe372de8a" SRC_URI += " \ file://0001-Make-autotests-optional.patch \ diff --git a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb index 72930e3c..dc1642e4 100644 --- a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb +++ b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb @@ -9,5 +9,5 @@ inherit kde-kf5 DEPENDS += "kconfig kconfig-native kwidgetsaddons" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "c7c4f35dc45abd3603ab654020f2c1d1" -SRC_URI[sha256sum] = "377103eb36855e0bb971fc22c974f85792ee71a73e6705725047ccfe337320f2" +SRC_URI[md5sum] = "06037de8697f4ca4c2666cedf74bc3e4" +SRC_URI[sha256sum] = "5c943799729e7ed8d101eb2e11a09a2616d6c13c33d3575b2e61667e0c2f2539" diff --git a/recipes-kde/kf5/tier2/kcrash/kcrash.bb b/recipes-kde/kf5/tier2/kcrash/kcrash.bb index f0ac1201..ad876ec0 100644 --- a/recipes-kde/kf5/tier2/kcrash/kcrash.bb +++ b/recipes-kde/kf5/tier2/kcrash/kcrash.bb @@ -11,5 +11,5 @@ REQUIRED_DISTRO_FEATURE = "x11" DEPENDS += "kcoreaddons kcoreaddons-native kwindowsystem virtual/libx11" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "bdbe144c7c086e60206f097bfc3703d8" -SRC_URI[sha256sum] = "2d8edd9813b8543cef68cd6cf09c85195999d06f9b06ed0803707a1c925eda38" +SRC_URI[md5sum] = "115fe1c9332aae4550ab8efb5b983d74" +SRC_URI[sha256sum] = "215c90bf6501cb90db01f2a04155bcd8a8e66fcfb4a94649e72204c5a1df10a9" diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0003-don-t-build-documentation.patch b/recipes-kde/kf5/tier2/kdoctools/files/0001-don-t-build-documentation.patch similarity index 100% rename from recipes-kde/kf5/tier2/kdoctools/files/0003-don-t-build-documentation.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0001-don-t-build-documentation.patch diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch b/recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch new file mode 100644 index 00000000..61b38f21 --- /dev/null +++ b/recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch @@ -0,0 +1,41 @@ +From 6e7cb3131acc1a066e942686d72c1d0d70ca7c4c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 6 Oct 2017 13:08:01 +0200 +Subject: [PATCH] Make our cross build find docbookl10nhelper +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + src/CMakeLists.txt | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a615ca8..300772a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -184,18 +184,6 @@ if(INSTALL_INTERNAL_TOOLS) + install(TARGETS docbookl10nhelper EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) + endif() + +-if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE) +- add_executable(KF5::docbookl10nhelper IMPORTED GLOBAL) +- set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION ${DOCBOOKL10NHELPER_EXECUTABLE}) +-else() +- add_executable(KF5::docbookl10nhelper ALIAS docbookl10nhelper) +-endif() +- +-add_custom_command( TARGET docbookl10nhelper POST_BUILD +- COMMAND $ +- "${DOCBOOKXSL_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/customization/xsl" +- "${CMAKE_CURRENT_BINARY_DIR}/customization/xsl" +-) + + # all-l10n.xml is generated by docbookl10nhelper + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/all-l10n.xml +-- +2.9.4 + diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch b/recipes-kde/kf5/tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch deleted file mode 100644 index bae9a4b2..00000000 --- a/recipes-kde/kf5/tier2/kdoctools/files/0002-build-meinproc5-it-works-fine-in-our-environment.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d9a64eaffdca73e50b767f58c87f4299db85cd83 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 28 Nov 2014 10:28:02 +0100 -Subject: [PATCH 2/4] build meinproc5 - it works fine in our environment -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - src/CMakeLists.txt | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 341ecf4..a440a1b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -47,11 +47,6 @@ install(TARGETS KF5XsltKde EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAU - - ########### next target ############### - --# The cross compiling parts are commented out on purpose. Alex --if (CMAKE_CROSSCOMPILING) --# set(IMPORT_MEINPROC5_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc5Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") --# include(${IMPORT_MEINPROC5_EXECUTABLE}) --else () - set_source_files_properties(xslt.cpp PROPERTIES COMPILE_FLAGS -DSIMPLE_XSLT ) - - option(MEINPROC_NO_KARCHIVE "Compile meinproc without KArchive dependency" OFF) -@@ -71,7 +66,6 @@ else () - - # # export this binary for cross-compilation - # export(TARGETS meinproc5 FILE ${CMAKE_BINARY_DIR}/ImportMeinProc4Executable.cmake) --endif () - - ########### customize includes for xslt ############### - # WARNING: this has severe limitations on the windows platform since the .xsl --- -1.8.3.1 - diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0004-set-meinproc5-executable-so-that-it-can-be-found-for.patch b/recipes-kde/kf5/tier2/kdoctools/files/0003-set-meinproc5-executable-so-that-it-can-be-found-for.patch similarity index 100% rename from recipes-kde/kf5/tier2/kdoctools/files/0004-set-meinproc5-executable-so-that-it-can-be-found-for.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0003-set-meinproc5-executable-so-that-it-can-be-found-for.patch diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch b/recipes-kde/kf5/tier2/kdoctools/files/0004-Add-cmdline-param-to-help-find-xsl.patch similarity index 100% rename from recipes-kde/kf5/tier2/kdoctools/files/0001-Add-cmdline-param-to-help-find-xsl.patch rename to recipes-kde/kf5/tier2/kdoctools/files/0004-Add-cmdline-param-to-help-find-xsl.patch diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb index 5f468917..b0133834 100644 --- a/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb +++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb @@ -14,5 +14,5 @@ DEPENDS += " \ RDEPENDS_${PN} += "gettext-native" SRC_URI += " \ - file://0003-don-t-build-documentation.patch \ + file://0001-don-t-build-documentation.patch \ " diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb index 3a2ca919..c080f545 100644 --- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb +++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb @@ -5,18 +5,23 @@ DEPENDS += "${BPN}-native gettext-native karchive ki18n libxslt libxml2" inherit cmake_lib SRC_URI += " \ - file://0004-set-meinproc5-executable-so-that-it-can-be-found-for.patch \ + file://0002-Make-our-cross-build-find-docbookl10nhelper.patch \ + file://0003-set-meinproc5-executable-so-that-it-can-be-found-for.patch \ + file://0004-Add-cmdline-param-to-help-find-xsl.patch \ " do_configure_append() { - # use native docbookl10nhelper - sed -i 's:\./docbookl10nhelper:${STAGING_BINDIR_NATIVE}/docbookl10nhelper:' ${B}/src/CMakeFiles/docbookl10nhelper.dir/build.make - # remove build host paths sed -i 's:${STAGING_DIR_NATIVE}::g' ${B}/config-kdoctools.h sed -i 's:${STAGING_DIR_TARGET}::g' ${B}/config-kdoctools.h } +CMAKE_ADD_ALIGN_FILES = "config-kdoctools.h" +do_install_prepend() { + # HACK: copy all-l10n.xml from native-sysroot to our builddir + cp -f ${STAGING_DIR_NATIVE}${datadir}/kf5/kdoctools/customization/xsl/all-l10n.xml ${B}/src/customization/xsl/ +} + do_install_append() { # Make sure installed XML/XSL files use relative paths, otherwise they # will be unusable once installed in per recipe sysroot. diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc index f2ebdc79..631cffb9 100644 --- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc +++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc @@ -11,12 +11,8 @@ inherit kde-kf5 perlnative DEPENDS += "docbook-xml-dtd4 docbook-xsl-stylesheets liburi-perl-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "9dc994e1b9e1cf4eac1b3089e993c03d" -SRC_URI[sha256sum] = "327b90bd7b9fae2455ef848f44709ec8dbead1f1a86ef169083e9000d2edfb69" - -SRC_URI += " \ - file://0001-Add-cmdline-param-to-help-find-xsl.patch \ -" +SRC_URI[md5sum] = "8ff1848a3cb7c6a5616304e869ed1ecd" +SRC_URI[sha256sum] = "c95f7e604bd16c3ef97b3fc0320a5656ef1ea3b3c75b7d4d22348391423c7b39" # allarch packages do only install into machine sysroot # for xml4 diff --git a/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb index 8957c3f2..7358b177 100644 --- a/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb +++ b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 pkgconfig gettext PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "ba71dfba018fa1714963a4db07c99aee" -SRC_URI[sha256sum] = "750c1f408bad265ee10bfcd60eab88988d8bb6b3b38fd59ebad1899c683b269d" +SRC_URI[md5sum] = "e433e448d14de39120bc8922a9203a56" +SRC_URI[sha256sum] = "95ce8b047895d4b1efd34e841035147e282f03996e1d33d79f09a6d469ca25a0" # TODO: optionals PACKAGECONFIG (poppler-qt5 / exiv2 / ffmpeg / epub) DEPENDS += " \ diff --git a/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb b/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb index 4b34e94f..5a9b6e3f 100644 --- a/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb +++ b/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb @@ -12,8 +12,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "72c6b728489dbfc68c822280d1b3c107" -SRC_URI[sha256sum] = "09dd24c46bfa1d5a7422849de2940fd6aa66bf63c4b915cf7f6d7c51533320c8" +SRC_URI[md5sum] = "4e12539d54a211806d7e4f9efb5c09bb" +SRC_URI[sha256sum] = "97ca8eaa52f296e7fddde25abfe6c7707070b075e92e487da9edb3c719d4e860" FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ diff --git a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb index 466fa0a0..ec578de2 100644 --- a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb +++ b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb @@ -10,7 +10,7 @@ DEPENDS += "kcoreaddons kcoreaddons-native kwidgetsaddons \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "5c53678ceb2c2c6f868ccd1a93e4ddc9" -SRC_URI[sha256sum] = "97ad95e78dedef69500b68befd39b756bfa4773b737628c63efd4cc2efd69cd4" +SRC_URI[md5sum] = "fcff1ca599c3d40a1d1ba58a637454ba" +SRC_URI[sha256sum] = "a5340df37ba44f6b5b82f8c6732aaaa42ffc6d9a829c15b345e824360eb3e66e" FILES_${PN} += "${datadir}/dbus-1" diff --git a/recipes-kde/kf5/tier2/knotifications/knotifications.bb b/recipes-kde/kf5/tier2/knotifications/knotifications.bb index 3a683ed7..1c9a24b4 100644 --- a/recipes-kde/kf5/tier2/knotifications/knotifications.bb +++ b/recipes-kde/kf5/tier2/knotifications/knotifications.bb @@ -22,7 +22,7 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "bf36d93f3d709845cc6ead010dd1fd18" -SRC_URI[sha256sum] = "e4004df99c6b470c0454e6c7a0e94ed540549ce6e6cc848f7c97b4e620a59ec2" +SRC_URI[md5sum] = "e440b9e4af3646d44a6e49e0a90fd05b" +SRC_URI[sha256sum] = "ed7d33414840c8b25ce0f7fc446516bd85458b4e349825da026eb511a1d875cb" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/kservicetypes5" diff --git a/recipes-kde/kf5/tier2/kpackage/kpackage.inc b/recipes-kde/kf5/tier2/kpackage/kpackage.inc index 4b856356..85d45d3f 100644 --- a/recipes-kde/kf5/tier2/kpackage/kpackage.inc +++ b/recipes-kde/kf5/tier2/kpackage/kpackage.inc @@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "d0d8ac3bbf1e7600d1d24f5d0720f9b9" -SRC_URI[sha256sum] = "0887882000eeef5c12bb613672075187b1f031e8d87dbaecdadc02c9112a8a2f" +SRC_URI[md5sum] = "957d5828be226a4ea723583bb3295d0e" +SRC_URI[sha256sum] = "b6eb027aa8fbb0a45d87b026ae7117f14c08385628b5da5ba55994f7f01c926c" diff --git a/recipes-kde/kf5/tier2/kpty/kpty.bb b/recipes-kde/kf5/tier2/kpty/kpty.bb index dbbb7107..8209ed0f 100644 --- a/recipes-kde/kf5/tier2/kpty/kpty.bb +++ b/recipes-kde/kf5/tier2/kpty/kpty.bb @@ -10,5 +10,5 @@ inherit kde-kf5 gettext DEPENDS += "kcoreaddons kcoreaddons-native ki18n" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "4ef89f1799ea2277235b91ccbca83e6d" -SRC_URI[sha256sum] = "64c25954915c2070edfd2e0649110ce4bafa19af352f9ac3e4979f68e06daafc" +SRC_URI[md5sum] = "300f267605d0f636ded6d06c30d245f0" +SRC_URI[sha256sum] = "de98c5e8c13135aee4038b53b7656d8dad88e6a652140390608fdedc2344f031" diff --git a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb index 7813bcc6..fff3f193 100644 --- a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb +++ b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb @@ -7,5 +7,5 @@ inherit kde-kf5 gettext DEPENDS += "ki18n" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "bd4531f7f14a08a77be539d3b497dc82" -SRC_URI[sha256sum] = "b0b285f610d402f78a671cd538f50b20d7c6ea7d7b6f583bcdd4c411e0b042f5" +SRC_URI[md5sum] = "e301ff355e446d8c1bc0a11c915f9024" +SRC_URI[sha256sum] = "6c538b35e727f75e90178b6b5b17d299a3ce797bd82a6adb0af4e41096eb6082" diff --git a/recipes-kde/kf5/tier3/baloo/baloo.bb b/recipes-kde/kf5/tier3/baloo/baloo.bb index 6cc05070..65ae90d1 100644 --- a/recipes-kde/kf5/tier3/baloo/baloo.bb +++ b/recipes-kde/kf5/tier3/baloo/baloo.bb @@ -26,8 +26,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "048f63d294112627b7a7add69d322893" -SRC_URI[sha256sum] = "f121d9537ce785e3fa13888c09fac4f22b493a6ec6521ef880156df27e9e31ff" +SRC_URI[md5sum] = "e88453ed2738b111f009cc7d41297689" +SRC_URI[sha256sum] = "31e954b94078c9a6a6ab134adc7c84299614552fe6d2e528a366bceea712a290" SRC_URI += " \ file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \ diff --git a/recipes-kde/kf5/tier3/kactivities/kactivities.bb b/recipes-kde/kf5/tier3/kactivities/kactivities.bb index 8420e028..55efa5b7 100644 --- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb +++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb @@ -13,8 +13,8 @@ DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kauth-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "264605f72182f3eb239d682353dac182" -SRC_URI[sha256sum] = "47eb6967336d4d985b079e5b5b44afc51d66e7ed3a85cea923e295e10a952340" +SRC_URI[md5sum] = "c1efcac197d32e238c66e0270da68c1f" +SRC_URI[sha256sum] = "289d25367515e8d4668f460e3274b68ed6322a7f1c6228602c0f20462303353f" do_compile_prepend() { # Error: Could not locate service type file kservicetypes5/ "kfileitemactionplugin.desktop" , tried ... diff --git a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb index 28d0415d..dbf6817e 100644 --- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb +++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb @@ -10,5 +10,5 @@ DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui kconfig-native kcoreaddon kauth-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "8ee693c4ae47dce50e513cae00593d75" -SRC_URI[sha256sum] = "59339ef15f2740665fded42638d197ac9638f763191c30054d1870e4695ce684" +SRC_URI[md5sum] = "55e8d562f7fb8fd9d34f04a69eb83400" +SRC_URI[sha256sum] = "38af8bb592a323b05d05b72d22b9bd5d48932a01e86941fec5e0e5ca59054368" diff --git a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb index 353568a6..e7b7886e 100644 --- a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb +++ b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb @@ -10,7 +10,7 @@ DEPENDS += "kitemviews kconfigwidgets kcoreaddons ki18n kiconthemes kservice kxm kdeclarative kcoreaddons-native kauth-native kconfig-native kpackage-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "40336bb5a8308148b492a899c293c1c6" -SRC_URI[sha256sum] = "df21667f6dae44707d13e51780ffe157fd0a29d4b946b14876a2a96633b32e66" +SRC_URI[md5sum] = "b6838a8882ac218eeed28ce34f604fcb" +SRC_URI[sha256sum] = "0b15971ece6003636d012e37760324b005b06050d4d076bbe30eed427717ce58" FILES_${PN} += "${datadir}/kservicetypes5" diff --git a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb index 37c85c89..86b8f91f 100644 --- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb +++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb @@ -11,7 +11,7 @@ DEPENDS += "kauth kconfig kcodecs kguiaddons kwidgetsaddons kdoctools \ gettext-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "47f7c6f667b077e19a2154f9ca96a993" -SRC_URI[sha256sum] = "a54382442dedd4da340f291d81d1dd1a89289bcb42e8d82d34555e44611e3c6a" +SRC_URI[md5sum] = "e271bdcb47dae2819266494c96fbf01d" +SRC_URI[sha256sum] = "1d70a761eefe60e6f7beb3517ed64edbb6266cfe85bbb65603c9764e524b6170" RDEPENDS_${PN} += "perl" diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb index eefc28d9..855cc021 100644 --- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb +++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb @@ -14,8 +14,8 @@ DEPENDS += "qtdeclarative kconfig kconfig-native ki18n kiconthemes kio kwidgetsa SRC_URI += "file://0001-kpackagelauncherqml-Add-include-of-QDebug.patch" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "f160282c3735eb1f0a97befdb89c86ec" -SRC_URI[sha256sum] = "2dde12110310cbb980381fd51c0926f2f5cf202760a0a871a01a2412080a5d52" +SRC_URI[md5sum] = "1d10421e41b6c95bd6f1daf546eb5a51" +SRC_URI[sha256sum] = "8b38aba552f06596a47d52d364f7a21784e741cfb0c7f23815f1cf067fd7c6a4" FILES_${PN} += "${OE_QMAKE_PATH_QML}/org/kde" FILES_${PN}-dbg += " \ diff --git a/recipes-kde/kf5/tier3/kded/kded.bb b/recipes-kde/kf5/tier3/kded/kded.bb index ab0820bd..8ceca7c2 100644 --- a/recipes-kde/kf5/tier3/kded/kded.bb +++ b/recipes-kde/kf5/tier3/kded/kded.bb @@ -10,8 +10,8 @@ DEPENDS += "${BPN}-native kconfig kcoreaddons kcrash kdbusaddons kdoctools kinit kconfig-native kcoreaddons-native kdoctools-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "7e7bf7ec6077d89157a8af6cfaf129d2" -SRC_URI[sha256sum] = "44336777a02273a62c14b4c47dcdf71f3ab2627b46f72b2991eb10d8f3cb8478" +SRC_URI[md5sum] = "5d988b80af68a939723e7122d80deddf" +SRC_URI[sha256sum] = "8b96b50313783b5edcf5bb8a0bc4873a844cb1ca662feb0ace9a932e8bfc5277" 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 diff --git a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc index 25f34135..f4107bb8 100644 --- a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc +++ b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc @@ -7,5 +7,5 @@ inherit kde-kf5 DEPENDS += "qttools kcoreaddons kconfig kdoctools" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "2950d4d7107000daa97b58bb74c24ff9" -SRC_URI[sha256sum] = "1ba67344b46e1cb0809975f84c667019158e69ae1b884ab3a995ca1d8d434acf" +SRC_URI[md5sum] = "1751dd862efc2e354fdfe976b1fb1c56" +SRC_URI[sha256sum] = "c6038ac44f05083e6d1e7e2d8b950b31d493f1bf587f4b89984fefae5f973b66" diff --git a/recipes-kde/kf5/tier3/kdesu/kdesu.bb b/recipes-kde/kf5/tier3/kdesu/kdesu.bb index 4a5467a7..f3c29d53 100644 --- a/recipes-kde/kf5/tier3/kdesu/kdesu.bb +++ b/recipes-kde/kf5/tier3/kdesu/kdesu.bb @@ -16,7 +16,7 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "15674fef2daeb8db192b9ebd5ae09276" -SRC_URI[sha256sum] = "8af37b0ca1563c58e5f8446f66286b2d418946960575cf6f444ae314aa198f06" +SRC_URI[md5sum] = "57e7acfc570c56c9f44d6fdcc995c6a7" +SRC_URI[sha256sum] = "25b35914fa9cab6f70d09970324385d7ea14f3edb6ff1908bc12e403e31732b1" FILES_${PN}-dbg += "${libdir}/kdesu/kf5/.debug" diff --git a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb index 3a8fdc86..409a5afa 100644 --- a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb +++ b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb @@ -20,5 +20,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "c0257bcea1f7616b672f3fc7177864f1" -SRC_URI[sha256sum] = "3aad10187eba6385c568b43294311606917d9230543a6c46a7db7b1cec7fa3f4" +SRC_URI[md5sum] = "af5d1d27653f8936fc8a5b04bcf6d802" +SRC_URI[sha256sum] = "ee8375464179fbdc167209608595792bf188618258fe383adf36affca65cccb2" diff --git a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb index 0ddf31cd..8747007e 100644 --- a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb +++ b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb @@ -10,8 +10,8 @@ inherit kde-kf5 gettext DEPENDS += "karchive kconfig kconfig-native kservice kcoreaddons kcoreaddons-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "84a3fbe4831c41a6c0c790f6f6e641a0" -SRC_URI[sha256sum] = "aecc1537cc03124ccc6f9f625424ec96d0904afe800c411a84dab5233a7a8a2f" +SRC_URI[md5sum] = "b2a49f90cf14feed7b604172f6cd6ce1" +SRC_URI[sha256sum] = "a5b54d48822055e409f04fe4a85bb057798c0b0c815a5f7c6ca24bd47c4809b0" FILES_${PN} += " \ ${datadir}/emoticons \ diff --git a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb index 0ae45919..145302f9 100644 --- a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb +++ b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb @@ -16,8 +16,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "2e48a4c3d6db9215e18ba79737e5419b" -SRC_URI[sha256sum] = "729562dcaa1fea9f18b57a39a680276d1fdfd1b3333d4308e6c5218b061775da" +SRC_URI[md5sum] = "66b9a2f049424b563934bd858ffdcfe6" +SRC_URI[sha256sum] = "ba0a9084bd456fe4b9b9e308a0105ea744cf980bf4b5fcb0b1cd0a302a7cb5e7" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb index 160f1ba2..9009dcc0 100644 --- a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb +++ b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb @@ -10,6 +10,5 @@ DEPENDS += "qtsvg ki18n kconfig kconfigwidgets kwidgetsaddons kitemviews gettext kcoreaddons-native kauth-native kconfig-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "2ed7f444fee9475a9c10f55df000828b" -SRC_URI[sha256sum] = "54c833a09f1b9d117ede26b9ec5d069b84b7304ace6a173c7fd5470d849d2d29" - +SRC_URI[md5sum] = "8fbb2e1cd0312229ebd65db6e70a6290" +SRC_URI[sha256sum] = "2a7dc525c1e9eea8c8952ca4eeccc22c28bb37ea83895fd7166174263218aa07" diff --git a/recipes-kde/kf5/tier3/kinit/kinit.bb b/recipes-kde/kf5/tier3/kinit/kinit.bb index 943e134e..ab173ba9 100644 --- a/recipes-kde/kf5/tier3/kinit/kinit.bb +++ b/recipes-kde/kf5/tier3/kinit/kinit.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "279f146d8deaaed0a54ce30be0ebb146" -SRC_URI[sha256sum] = "24d52d2786d61f28c966f6de7beab6ab064f6fdefb0a9def9b43ad2bafe42911" +SRC_URI[md5sum] = "32e77d84467dc519f4717038a390c3b5" +SRC_URI[sha256sum] = "ae49e0a3cf8a86868afb57bfd820c65be60939e4a79d39e54608fcc9f307914c" FILES_${PN} += "${datadir}/dbus-1 ${libdir}/libkdeinit5_klauncher.so" FILES_${PN}-dbg += "${libdir}/*/*/.debug" diff --git a/recipes-kde/kf5/tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb index cfcd88fd..2d0d0912 100644 --- a/recipes-kde/kf5/tier3/kio/kio.bb +++ b/recipes-kde/kf5/tier3/kio/kio.bb @@ -26,8 +26,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "f59187ad0967a046c4e472f9058bd02d" -SRC_URI[sha256sum] = "f18f51d5d85156de52bf21e7344e06b9fcb6c815043797615171c7a66bb743c8" +SRC_URI[md5sum] = "6874b25b79849c61fe5e4ab6c47ab280" +SRC_URI[sha256sum] = "f43ab29c0ab51c78bd323e57fa6bba4aedf2d26d70df973b7ef7c80c9fc81597" SRC_URI += "file://0001-Extend-upstream-workaround-for-bug-371721-to-also-co.patch" diff --git a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb index 386e65aa..36c9c5c9 100644 --- a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb +++ b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "b7df8ce68cee3cdcbd9c96d513fbeae6" -SRC_URI[sha256sum] = "f17bc9cc0852c3a4433e1ffaeb88ad7af3611a9ec95409c391b39fa57e84da5d" +SRC_URI[md5sum] = "adba0a0a44b47fb7ab3ef0c391115cd7" +SRC_URI[sha256sum] = "4052f0ac27bc32de02493494816809261e762eeb2e906168d9e749aa99ab8cd0" FILES_${PN} += " \ ${OE_QMAKE_PATH_QML}/org/kde/newstuff \ diff --git a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb index 0fdd4e13..e0b68f05 100644 --- a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb +++ b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb @@ -21,5 +21,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "a204fa266ddd15e68d745919e005d8ab" -SRC_URI[sha256sum] = "7c2c1717a09ef445ed50053a96e18787eb2118e3d14a81dae3cc6df317f49811" +SRC_URI[md5sum] = "63ea3c6bdf1dab6b121dc10275ee04c5" +SRC_URI[sha256sum] = "d333e83fb372b93493092084418af9fa5557e017c30c923bbd6a5d6f2a7d0f16" diff --git a/recipes-kde/kf5/tier3/kparts/kparts.bb b/recipes-kde/kf5/tier3/kparts/kparts.bb index 03d48123..95d9345a 100644 --- a/recipes-kde/kf5/tier3/kparts/kparts.bb +++ b/recipes-kde/kf5/tier3/kparts/kparts.bb @@ -25,8 +25,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "4bc8c3285edac47f808e80e7dd075100" -SRC_URI[sha256sum] = "f3e75ac95b1e3c61054cd9140be4b917296f0a666df3487a589cfe055978055e" +SRC_URI[md5sum] = "8a8c053eb8c4f608ffa1a44ea600a9b1" +SRC_URI[sha256sum] = "f7a701a02d89c5555d92047760314c64fd51beb13ed393ebee67597e13396aa5" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/kf5/tier3/kpeople/kpeople.bb b/recipes-kde/kf5/tier3/kpeople/kpeople.bb index 70192709..bfae563b 100644 --- a/recipes-kde/kf5/tier3/kpeople/kpeople.bb +++ b/recipes-kde/kf5/tier3/kpeople/kpeople.bb @@ -14,8 +14,8 @@ DEPENDS += "kcoreaddons \ kitemviews" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "53a8feb7e1047fc57f2706f335ca4de8" -SRC_URI[sha256sum] = "2a0800096207d0728c01027b65ab1f9c9b0b8aba0189e523c0050e723b812e72" +SRC_URI[md5sum] = "f9a9e37f81628de31ff0e12386b04855" +SRC_URI[sha256sum] = "1d78459d0c7da5674d64d6ef421fcd3598823a44c3a62ca534dcbd650649a279" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/kf5/tier3/krunner/krunner.bb b/recipes-kde/kf5/tier3/krunner/krunner.bb index d78ad871..cd130e1f 100644 --- a/recipes-kde/kf5/tier3/krunner/krunner.bb +++ b/recipes-kde/kf5/tier3/krunner/krunner.bb @@ -19,12 +19,13 @@ DEPENDS += "qtdeclarative \ threadweaver" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "06dc735cc1fd86a050307b14f68a2143" -SRC_URI[sha256sum] = "1856e17a2fd8d6ad94f463fe2cb44d7377439650dd47f88444e924d650e32165" +SRC_URI[md5sum] = "80a77eadbf97af8eac975624346f25b8" +SRC_URI[sha256sum] = "95bd2ed35f25d369bc2c613cbad87f78083bffde6ade3ad0ec9e69547fa1d099" FILES_${PN} += " \ ${datadir}/k*5 \ ${datadir}/kdevappwizard \ + ${datadir}/dbus-1 \ ${OE_QMAKE_PATH_QML}/org/kde \ " FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/*/.debug" diff --git a/recipes-kde/kf5/tier3/kservice/kservice.bb b/recipes-kde/kf5/tier3/kservice/kservice.bb index 31ed696c..49e26d85 100644 --- a/recipes-kde/kf5/tier3/kservice/kservice.bb +++ b/recipes-kde/kf5/tier3/kservice/kservice.bb @@ -11,8 +11,8 @@ inherit kde-kf5 gettext DEPENDS += "kconfig kconfig-native kcoreaddons-native kcrash kdbusaddons ki18n kdoctools-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "c2903ab8cd2d4ecbde8be3a57f1607ad" -SRC_URI[sha256sum] = "90130adca003f0d583afc1031ba1bd303857a938dd9e596127891c07f4da10a6" +SRC_URI[md5sum] = "25d13fea84f873dd73832b0503493106" +SRC_URI[sha256sum] = "2d31c96d8fad235aa2bfc96258ac03d7ec064184fe6a54856f9d7407fbae4a7d" FILES_${PN} += "${datadir}/kservicetypes5" diff --git a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb index 08b8d00d..377d10cf 100644 --- a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb +++ b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb @@ -22,8 +22,8 @@ DEPENDS += "qtxmlpatterns \ libgit2" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "7372625c4a1c3ebc23ee70590f0436cb" -SRC_URI[sha256sum] = "f9a0109aff18175ef528186e099d0881b977dde7435c433c5541df44b5a18609" +SRC_URI[md5sum] = "f7fa45ec348426e7c1984ccbcfbd3197" +SRC_URI[sha256sum] = "31e7b3118a2cb56176d85538ef43f41842add3ef5c881786a7db7122c37ebea4" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" diff --git a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb index 91a26582..d9215ce3 100644 --- a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb +++ b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb @@ -11,7 +11,7 @@ DEPENDS += "kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwidge gettext-native sonnet-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "21ccdcec5a0377defc35360d33fa4b3a" -SRC_URI[sha256sum] = "8afb6e8178ecc45cbeb054b26ad1e4b928eccd61d6b0d883d7abd650fd031c2d" +SRC_URI[md5sum] = "dfbececfe3068ae4fde38d63e1fb0990" +SRC_URI[sha256sum] = "eef0847aa98489437784361a281a16cbd52b3ac8a1a83619c370078e96ea1288" FILES_${PN} += "${datadir}/kservicetypes5" diff --git a/recipes-kde/kf5/tier3/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch b/recipes-kde/kf5/tier3/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch deleted file mode 100644 index fa44230c..00000000 --- a/recipes-kde/kf5/tier3/kwallet/files/0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 184ac153212ef545434ec56c3d414b636c11e6d3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 4 Dec 2014 14:44:29 +0100 -Subject: [PATCH] add NO_CMAKE_FIND_ROOT_PATH in find to org.kde.KWallet.xml -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -in sysrooted environment build ended up in: - -| make[2]: *** No rule to make target '/home/a.mueller/tmp/oe-core-glibc/work/cortexa9hf-vfp-neon-angstrom-linux-gnueabi/kwallet/5.5.0-r0/git/src/runtime/kwalletd/kwallet_xml-NOTFOUND', needed by 'src/runtime/kwalletd/home/a.mueller/tmp/oe-core-glibc/work/cortexa9hf-vfp-neon-angstrom-linux-gnueabi/kwallet/5.5.0-r0/git/src/runtime/kwalletd/kwallet_xml-notfound.cpp'. Stop. - -Upstream-Status: pending - -Signed-off-by: Andreas Müller ---- - src/runtime/kwalletd/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/runtime/kwalletd/CMakeLists.txt b/src/runtime/kwalletd/CMakeLists.txt -index 907ef19..4b71d85 100644 ---- a/src/runtime/kwalletd/CMakeLists.txt -+++ b/src/runtime/kwalletd/CMakeLists.txt -@@ -79,7 +79,7 @@ if (KF5Gpgmepp_FOUND) - ) - endif(KF5Gpgmepp_FOUND) - --find_file(kwallet_xml org.kde.KWallet.xml HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet) -+find_file(kwallet_xml org.kde.KWallet.xml HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet NO_CMAKE_FIND_ROOT_PATH) - - qt5_add_dbus_adaptor( kwalletd_SRCS ${kwallet_xml} kwalletd.h KWalletD ) - --- -1.8.3.1 - diff --git a/recipes-kde/kf5/tier3/kwallet/kwallet.bb b/recipes-kde/kf5/tier3/kwallet/kwallet.bb index 5839c394..f1dbcc03 100644 --- a/recipes-kde/kf5/tier3/kwallet/kwallet.bb +++ b/recipes-kde/kf5/tier3/kwallet/kwallet.bb @@ -29,9 +29,7 @@ DEPENDS += " \ # TBD: add KF5Gpgmepp with PACKAGECONFIG?? PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "ab5492c0b6690fac3ad3aa1bbca5341e" -SRC_URI[sha256sum] = "8782caeb8d75da67a84c8eddf1d28af19fb01ffc0bbf7a35c0240e22519ccabb" - -SRC_URI += "file://0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch" +SRC_URI[md5sum] = "c7a7e47f5e7853f864d1ea295dd2dfdd" +SRC_URI[sha256sum] = "dc06fe8917cf5ea61251e42e9c7e9e5662eb223aace1bf8ee4becf6a896cdae3" FILES_${PN} += "${datadir}" diff --git a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb index abe9258a..5065b290 100644 --- a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb +++ b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb @@ -26,8 +26,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "07eedff202e8180f8b4204f44e424b6c" -SRC_URI[sha256sum] = "e77b3f59d393d3610ecae83d89f6692bd144d899fb9c6559139b7cb6b8da0e31" +SRC_URI[md5sum] = "35c0ea3f6313ba866d045a0e22288ce8" +SRC_URI[sha256sum] = "64f73ada0b1e08c97db00cfe2967b0d8354b338cd85e76644f79da022af49589" # REVISIT remove ugly hack for wayland-only environments SRC_URI += " \ diff --git a/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb b/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb index 1d18084a..d3a0387e 100644 --- a/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb +++ b/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb @@ -9,5 +9,5 @@ inherit kde-kf5 gettext DEPENDS += "ki18n kio kcoreaddons-native kconfig-native kauth-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "bb0ffae515ea0e5cf3b1019882c67249" -SRC_URI[sha256sum] = "a181b54e093a257309d960c797159e7bcbeccee7aa5b59e4e708880045eca793" +SRC_URI[md5sum] = "0970500fa7bc1ed484bdcefd513fed80" +SRC_URI[sha256sum] = "4a79382406f247bd9ace01859cb92948e74e48c7abb94b9e47066f0453812a3d" diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb index a507526a..7704ba15 100644 --- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb +++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb @@ -37,8 +37,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "f212c5751b3c91126a7ec6646399cc45" -SRC_URI[sha256sum] = "7060e5b61eb8b00a350967528e0c22e18edd9cdc2cb7cb398aae3874ac859f17" +SRC_URI[md5sum] = "7ff3b1bd717bc266c1bd3a649fc9f798" +SRC_URI[sha256sum] = "4f23f37de0c404dc07809538fd531fa557780e99c854203980846c32a2c370b7" FILES_${PN} += " \ ${datadir}/kdevappwizard \ diff --git a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb index e6dcb6b3..1fa1d998 100644 --- a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb +++ b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb @@ -23,8 +23,8 @@ DEPENDS += " \ RRECCOMENDS_${PN} += "oxygen-fonts" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "eb9d48b9db29ef1a410c12f764feb451" -SRC_URI[sha256sum] = "345f6dc25d5f864aaeeffec8b5888c25b3248dcab16210c60663e2a65d1143e1" +SRC_URI[md5sum] = "04fd4313dac0a2313af4fbc37d7863f4" +SRC_URI[sha256sum] = "08cb88ef7c7ceb7cd43cbc7f3040daf7128d22bb75f8eb3956d55afd3e1b3670" FILES_${PN} += " \ ${datadir}/knotifications5 \ 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 7ef0adf9..cace5505 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 @@ -6,8 +6,8 @@ inherit kde-kf5 DEPENDS = "qttools-native" -SRC_URI[md5sum] = "30c63be84a5bbbf38ebda1f666085fb2" -SRC_URI[sha256sum] = "6e120bb40411ef559583ef693c0c03a41df3bb40a932bf7444c97e04266d5daf" +SRC_URI[md5sum] = "cf6779e72493dd229902007720eb0d96" +SRC_URI[sha256sum] = "6188a8ac8d799439204f69a1eb229431fc9f196790b88d6fb72bb3d57edb2332" SRC_URI += "file://0001-FindQtWaylandScanner.cmake-align-path-to-our-needs.patch" PV = "${KF5_VERSION}" diff --git a/recipes-kde/packagegroups/kf5-world.bb b/recipes-kde/packagegroups/kf5-world.bb index 279d4614..57ce0953 100644 --- a/recipes-kde/packagegroups/kf5-world.bb +++ b/recipes-kde/packagegroups/kf5-world.bb @@ -17,6 +17,7 @@ TIER_1 = " \ kguiaddons \ ki18n \ kidletime \ + kirigami \ kitemmodels \ kitemviews \ kplotting \ diff --git a/recipes-kde/packagegroups/plasma-world.bb b/recipes-kde/packagegroups/plasma-world.bb index 4f19fc29..def66f8f 100644 --- a/recipes-kde/packagegroups/plasma-world.bb +++ b/recipes-kde/packagegroups/plasma-world.bb @@ -13,7 +13,6 @@ TIER_1 = " \ " TIER_2 = " \ - kirigami \ " TIER_3 = " \