From 579f31fca8d4f2cbcda005c087d3adced55edb31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 16 Feb 2015 19:31:58 +0100 Subject: [PATCH] build all tier3 and tier4 recipes from tarball instead of git MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The following recipes are still build from git: polkit-qt-1_0.112.0.bb phonon_4.8.bb kwayland.bb The following kf5 recipes are still open: portingAids/kmediaplayer-5.7.0 kapidox-5.7.0 Signed-off-by: Andreas Müller --- ...003-only-build-kf5-config-for-native.patch | 36 +++++++++++-------- .../kdelibs4support/kdelibs4support-native.bb | 6 ++-- .../kdelibs4support/kdelibs4support.inc | 6 ++-- .../kf5/porting-aids-tier3/khtml/khtml.bb | 6 ++-- .../porting-aids-tier3/kjsembed/kjsembed.bb | 6 ++-- .../kf5/porting-aids-tier3/krunner/krunner.bb | 6 ++-- .../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 | 5 ++- 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 | 4 +-- recipes-kde/kf5/tier3/kinit/kinit.bb | 4 +-- recipes-kde/kf5/tier3/kio/kio.bb | 4 +-- recipes-kde/kf5/tier3/knewstuff/knewstuff.bb | 4 +-- .../tier3/knotifications/knotifications.bb | 4 +-- .../kf5/tier3/knotifyconfig/knotifyconfig.bb | 4 +-- recipes-kde/kf5/tier3/kparts/kparts.bb | 4 +-- recipes-kde/kf5/tier3/kservice/kservice.bb | 4 +-- ...-install-katehighlightingindexer-onl.patch | 8 ++--- .../kf5/tier3/ktexteditor/ktexteditor.inc | 4 +-- .../kf5/tier3/ktextwidgets/ktextwidgets.bb | 4 +-- recipes-kde/kf5/tier3/kwallet/kwallet.bb | 4 +-- recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb | 4 +-- .../plasma-framework/plasma-framework.bb | 4 +-- .../frameworkintegration.bb | 4 +-- 32 files changed, 90 insertions(+), 85 deletions(-) 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 edad2aea..d0fcbac6 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 @@ -1,4 +1,4 @@ -From 9db80c0ea1ac3355d8d79ba0c6607e88e469fae6 Mon Sep 17 00:00:00 2001 +From ac2556aa6a1bdbbdb7347079bfe4bddb74756263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 8 Dec 2014 13:37:14 +0100 Subject: [PATCH 3/3] only build kf5-config for native @@ -10,15 +10,15 @@ Upstream-Status: Inappropriate [cross-specific] Signed-off-by: Andreas Müller --- - CMakeLists.txt | 22 +---- - src/CMakeLists.txt | 223 ------------------------------------------ + CMakeLists.txt | 26 +----- + src/CMakeLists.txt | 198 +----------------------------------------- src/kdecore/kglobal.cpp | 18 ---- src/kdecore/klocale_kde.cpp | 4 - src/kdecore/kstandarddirs.cpp | 1 - - 5 files changed, 2 insertions(+), 266 deletions(-) + 5 files changed, 4 insertions(+), 243 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 493d309..f3174b0 100644 +index 25c35c5..60f7775 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,27 +16,11 @@ include(CMakeFindFrameworks) @@ -59,8 +59,14 @@ index 493d309..f3174b0 100644 endif () if (APPLE) cmake_find_frameworks(CoreFoundation) -@@ -149,7 +132,6 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - endif() +@@ -143,13 +126,8 @@ install( + + + +-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") +- ki18n_install(po) +- kdoctools_install(po) +-endif() add_subdirectory(cmake) add_subdirectory(data) -add_subdirectory(docs) @@ -68,7 +74,7 @@ index 493d309..f3174b0 100644 if (BUILD_TESTING) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4a1d80d..5543fb2 100644 +index 64a53d8..9f2e8ac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,4 @@ @@ -94,7 +100,7 @@ index 4a1d80d..5543fb2 100644 set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdecore/k4aboutdata.cpp -@@ -52,39 +26,9 @@ set(libkdelibs4support_SRCS +@@ -52,39 +52,9 @@ set(libkdelibs4support_SRCS kdecore/kcurrencycode.cpp kdecore/kdebug.cpp kdecore/kdebugdbusiface.cpp @@ -134,7 +140,7 @@ index 4a1d80d..5543fb2 100644 kdecore/kcalendarera.cpp kdecore/kcalendarsystem.cpp kdecore/kcalendarsystemcoptic.cpp -@@ -108,96 +52,6 @@ set(libkdelibs4support_SRCS +@@ -108,96 +78,6 @@ set(libkdelibs4support_SRCS kdecore/ktzfiletimezone.cpp kdecore/klocale.cpp kdecore/klocale_kde.cpp @@ -231,7 +237,7 @@ index 4a1d80d..5543fb2 100644 ) set_source_files_properties( solid/org.freedesktop.PowerManagement.xml -@@ -205,36 +59,6 @@ set_source_files_properties( solid/org.freedesktop.PowerManagement.xml +@@ -205,36 +85,6 @@ set_source_files_properties( solid/org.freedesktop.PowerManagement.xml solid/org.kde.Solid.PowerManagement.PolicyAgent.xml PROPERTIES NO_NAMESPACE TRUE) @@ -268,7 +274,7 @@ index 4a1d80d..5543fb2 100644 if (APPLE) set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} -@@ -260,10 +84,6 @@ configure_file(kdecore/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-da +@@ -260,10 +110,6 @@ configure_file(kdecore/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-da configure_file(kdecore/config-localization.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-localization.h) @@ -279,7 +285,7 @@ index 4a1d80d..5543fb2 100644 check_function_exists(mmap HAVE_MMAP) check_symbol_exists(posix_madvise "sys/mman.h" HAVE_MADVISE) configure_file(config-kdelibs4support.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdelibs4support.h ) -@@ -309,32 +129,12 @@ endif() +@@ -309,32 +155,12 @@ endif() target_link_libraries(KF5KDELibs4Support PUBLIC @@ -312,7 +318,7 @@ index 4a1d80d..5543fb2 100644 ${platformLinkLibraries} ) -@@ -362,26 +362,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES +@@ -362,26 +188,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES ) @@ -430,5 +436,5 @@ index 4161425..6bb6a69 100644 #include #include -- -1.8.3.1 +1.9.3 diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb index df74526d..8864eff2 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb @@ -3,9 +3,9 @@ require ${BPN}.inc inherit native DEPENDS += " \ - kconfig-native \ - kcoreaddons-native \ - ki18n-native \ + kconfig-native \ + kcoreaddons-native \ + ki18n-native \ " SRC_URI += " \ diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc index 8efdeb3e..328db9f8 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5-porting-aids PV = "${KF5_VERSION}" -SRCREV = "b796420399d81b96ce9d1a9ae8712018b2f67171" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "8699a1c9a310e75117349b176fb15187" +SRC_URI[sha256sum] = "652508f6e8efaa3923e525644ec0049eaaf3badb073bd3ec5a7f7ad016d086ee" SRC_URI += " \ file://0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch \ diff --git a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb index f13582da..40b0e12b 100644 --- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb +++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 cmake-lib perlnative +inherit kde-kf5-porting-aids cmake-lib perlnative DEPENDS += " \ karchive \ @@ -32,8 +32,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "ed0e2d2269bcad299a1379877b48118f54eb8ad9" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "e7467a0a2af4147e98f285f65e5aa7c1" +SRC_URI[sha256sum] = "260ab3bfd6214e3d03fc1c58a22bad05f964ebef3f77f8448145736b3e46993a" CMAKE_HIDE_ERROR[1] = "KF5KHtml, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" CMAKE_HIDE_ERROR[2] = "KF5KHtml, -S${includedir}, -S${STAGING_INCDIR}" diff --git a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb index aff08a9f..b87bae0c 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb @@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 cmake-lib +inherit kde-kf5-porting-aids cmake-lib DEPENDS += "qtsvg qttools kjs ki18n kdoctools" PV = "${KF5_VERSION}" -SRCREV = "72645d0ca8942b2550377567fe861183de8ab038" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "c5ec56e2460296046bc57714105e5d2c" +SRC_URI[sha256sum] = "8daa6a8929495d7cc5f335291ba481b9fe778fe4e6389a911628384e3069279c" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5JsEmbed, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb index 2aaf8a04..d109ceab 100644 --- a/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb +++ b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb @@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = " \ file://src/abstractrunner.h;endline=18;md5=a6a49d7635ef149bcddf8c46f0eae999 \ " -inherit kde-kf5 cmake-lib +inherit kde-kf5-porting-aids cmake-lib DEPENDS += "qtdeclarative kconfig kcoreaddons ki18n kio kservice plasma-framework solid threadweaver" PV = "${KF5_VERSION}" -SRCREV = "f79f3177cc5ea057e128be791c3cbe198f18038f" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "53a16b6cc0a3c8f4129c030a8041a1f5" +SRC_URI[sha256sum] = "ecac62be93e5ef0bbaf98cbb8f8a546bed4c1e593f5a52f0ec3d70b9ffef6b84" CMAKE_HIDE_ERROR[1] = "KF5Runner, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" CMAKE_HIDE_ERROR[2] = "KF5Runner, -S${includedir}, -S${STAGING_INCDIR}" diff --git a/recipes-kde/kf5/tier3/kactivities/kactivities.bb b/recipes-kde/kf5/tier3/kactivities/kactivities.bb index b420333b..67a9f2bf 100644 --- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb +++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb @@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kxmlgui kio kdbusaddons kdeclarative kcmutils" PV = "${KF5_VERSION}" -SRCREV = "26fbf4fab77f3458893715541f3abae5743ad59c" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "5dfd4efc47839bb89bb1e4a45a651899" +SRC_URI[sha256sum] = "2978ab55a9ce484db5790a13fa1ae081bb1e3b3925c34c1ac91a9700148882b4" SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch" diff --git a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb index b0f4d8b9..b44ba383 100644 --- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb +++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb @@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui" PV = "${KF5_VERSION}" -SRCREV = "5111bfa15d9e7181bdb0155e287942fb448802cf" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "c741e9e3fc6451841a62dc1e7deb6c66" +SRC_URI[sha256sum] = "14297ff266c260e81dc94d2d882583f4dc35399926afacae5025ebaf73e463ef" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5Bookmarks, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb index b87b6b09..69838d6a 100644 --- a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb +++ b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb @@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "kitemviews kconfigwidgets kcoreaddons ki18n kiconthemes kservice kxmlgui" PV = "${KF5_VERSION}" -SRCREV = "967cd1d56e91f2a2c9885c9aa9872028b8bf3eea" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "44d7f2b251cc4725d6ca52007cdd291d" +SRC_URI[sha256sum] = "1a73e8b897e845be383e0fc12f66f15164427d8e85c8aad294672fe89bff19ac" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5KCMUtils, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb index b247377d..f2462fe2 100644 --- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb +++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb @@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "kauth kcodecs kdoctools kguiaddons kwidgetsaddons" PV = "${KF5_VERSION}" -SRCREV = "1335e3e55ab7f68e59aae9bf5529eeabc9738d27" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "92e496e9e439d0a4518d2500fa6e51d5" +SRC_URI[sha256sum] = "fb3d04efebb0ac570defd92eff778cc78052ca8a33c2e5b88b415c02e2d9791c" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5ConfigWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb index 81779b11..096f9a5a 100644 --- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb +++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb @@ -10,8 +10,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "qtdeclarative kconfig ki18n kiconthemes kio kwidgetsaddons kwindowsystem kglobalaccel kguiaddons libepoxy" PV = "${KF5_VERSION}" -SRCREV = "e86059398d493a320b6f228858ea19c8a168b4ba" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "414cb5a4c26c5c3150c2867e29ec0181" +SRC_URI[sha256sum] = "afe4295bcb8e85b0ffee754b0db29056a7c422bf62934233991a812292bba18e" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5Declarative, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kded/kded.bb b/recipes-kde/kf5/tier3/kded/kded.bb index 0570178a..3675f18a 100644 --- a/recipes-kde/kf5/tier3/kded/kded.bb +++ b/recipes-kde/kf5/tier3/kded/kded.bb @@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "kconfig kcoreaddons kcrash kdbusaddons kdoctools kinit kservice" PV = "${KF5_VERSION}" -SRCREV = "a72c1fcbf6600c1c84e71c312a586386dcd7ce62" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "b1c65c8fb85a6a7bd574694fdb1ec044" +SRC_URI[sha256sum] = "e3fe0ef4adcf13b51944b52835ab886e8572dc82fa177a7d1fc4337563a38604" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KDED, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc index bf02ed90..c8289bae 100644 --- a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc +++ b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc @@ -9,7 +9,6 @@ inherit kde-kf5 DEPENDS += "qttools kcoreaddons kconfig kdoctools" PV = "${KF5_VERSION}" -SRCREV = "99314346bfba565a19c5f95579edc3b03593a975" -S = "${WORKDIR}/git" - +SRC_URI[md5sum] = "18d291ebba78f4f49404df63b68ede75" +SRC_URI[sha256sum] = "f814bf2cdaee63be39e94d57ef72434276bd4146f730cc97a33745fc5395de78" diff --git a/recipes-kde/kf5/tier3/kdesu/kdesu.bb b/recipes-kde/kf5/tier3/kdesu/kdesu.bb index 54389e99..b1534874 100644 --- a/recipes-kde/kf5/tier3/kdesu/kdesu.bb +++ b/recipes-kde/kf5/tier3/kdesu/kdesu.bb @@ -14,8 +14,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "d9e904b9d25cb68a413349e5af5a280be7731c52" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "250d7641fab53f241b8c1a6b586fca28" +SRC_URI[sha256sum] = "adab63b45de0b5b614a4b5185658782d5ae1a6ef0c96792927b3ff3adf9f5b2e" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5Su, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb index 888c10e6..6f5531a6 100644 --- a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb +++ b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb @@ -18,8 +18,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "a4727611d297f7776c4ea67d521ff6e932843e3b" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "3c8027a2eb04cc76bf8dba23cddb88fa" +SRC_URI[sha256sum] = "bf4f68adbeeea32f8d179dc8b1b266dd53fee7870101776fb73121d98c12eb13" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5WebKit, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb index 81a78b6b..9c7052f9 100644 --- a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb +++ b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb @@ -10,8 +10,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "karchive kconfig kservice kcoreaddons" PV = "${KF5_VERSION}" -SRCREV = "df487b4808daa448692b8d3277f745a952e71945" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "0505fcffffb67aeeff888ead356b3e88" +SRC_URI[sha256sum] = "bb6db7dd33a617446570b19b62cd6eeb3f7cfa14fe7e6a4cef643bc0ba19a4cc" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5Emoticons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb index 7e557a44..2865fff7 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}" -SRCREV = "f9eb427b293c40eec96784e059054bafd431c9bc" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "a54ad9ea7f1ed3eb5d8f3f3708e1d78c" +SRC_URI[sha256sum] = "3e0996ca5a1f29ef9c0ff2ba503cde4a395d898702594237f1a91ff0c6b4934a" SRC_URI += "file://0001-HACK-Add-a-stub-runtime-implementation-to-enable-bui.patch" diff --git a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb index 03b40d84..8f6cf124 100644 --- a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb +++ b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb @@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "qtsvg ki18n kconfig kconfigwidgets kwidgetsaddons kitemviews" PV = "${KF5_VERSION}" -SRCREV = "2286886decfec2b1a956b813b4c078c38bc2f43b" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "d41b5a4f68e350b1d36e05c99f060e53" +SRC_URI[sha256sum] = "4f06c930303761fc9985422cc0bb0c474f6430235adbf61378c1e943866c3984" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5IconThemes, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kinit/kinit.bb b/recipes-kde/kf5/tier3/kinit/kinit.bb index 38ef4a03..7383ad60 100644 --- a/recipes-kde/kf5/tier3/kinit/kinit.bb +++ b/recipes-kde/kf5/tier3/kinit/kinit.bb @@ -19,8 +19,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "d96cf2f4ebb63ef63e7b9c43987a2f85429db8f8" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "df35cdef22ccd888a22af1291a88eb3f" +SRC_URI[sha256sum] = "a2eb4b356cd940018afa975fd3ddd81384a44aa46a27aa2611c19d83f08ff5bb" SRC_URI += " \ file://0001-return-WAYLAND_DISPLAY-if-all-known-options-fail.patch \ diff --git a/recipes-kde/kf5/tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb index 9adb2648..6736791f 100644 --- a/recipes-kde/kf5/tier3/kio/kio.bb +++ b/recipes-kde/kf5/tier3/kio/kio.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "ec023712125ffc0a8cbb617c93285bdaa21f6381" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "2b8c55bc56b2c2fc1948fcf3aa5714fe" +SRC_URI[sha256sum] = "f47284fbd03bd4f7fdb3eed9f6d67c2741628517bc82c822c4f9e5409c1bc475" PACKAGECONFIG[full] = "-DKIOCORE_ONLY=OFF,-DKIOCORE_ONLY=ON, kbookmarks kcompletion kconfigwidgets kiconthemes kitemviews kjobwidgets kwidgetsaddons kwindowsystem" # Note that kdeclarative fails without KIOWidgets diff --git a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb index b1b14d40..5269ba3f 100644 --- a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb +++ b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb @@ -22,8 +22,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "1ccdf90d041bd945bfd33e275f4f00b3ea51c4aa" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "567dc7bb3520b9e8cf2f92b7afd854f3" +SRC_URI[sha256sum] = "f439a71807d49d24d9edbaf9bdb1ea37551b17181caa8a854552603fc573e371" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5NewStuff, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/knotifications/knotifications.bb b/recipes-kde/kf5/tier3/knotifications/knotifications.bb index 63e7cef7..94585874 100644 --- a/recipes-kde/kf5/tier3/knotifications/knotifications.bb +++ b/recipes-kde/kf5/tier3/knotifications/knotifications.bb @@ -11,8 +11,8 @@ DEPENDS += "kwindowsystem kservice kconfig kiconthemes kcodecs kcoreaddons phono DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}" PV = "${KF5_VERSION}" -SRCREV = "b5c1488beeedac53a23f8464d8ef3cea941ecfe8" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "b610f0a52530f6ced9ea5cc206c39d7a" +SRC_URI[sha256sum] = "43242ba806feedb226b77c414bcc5fc20cbb37c83ac006949725265b83d02b7d" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5Notifications, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb index 441369f1..504c5d25 100644 --- a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb +++ b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb @@ -20,8 +20,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "85e224e073a825e3d789408417b16f80a8ddd231" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "ef6469371ce05c59555c33b27aee2ed9" +SRC_URI[sha256sum] = "dae21941999cbcceeabfa2310cef4cca1c7362872070c9e2d004b473cd145b5f" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5NotifyConfig, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kparts/kparts.bb b/recipes-kde/kf5/tier3/kparts/kparts.bb index 696348bc..599609ad 100644 --- a/recipes-kde/kf5/tier3/kparts/kparts.bb +++ b/recipes-kde/kf5/tier3/kparts/kparts.bb @@ -21,8 +21,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "e979067f95c4f9c1a841631d52b8cced588f83f0" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "0f930b69e7bf0f4477eb509a2bcb9246" +SRC_URI[sha256sum] = "4f27f0d239607a74fd4c7c42a04f427051f87d273a0da6c632a36980c3ac4873" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5Parts, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kservice/kservice.bb b/recipes-kde/kf5/tier3/kservice/kservice.bb index 8b9b8b60..a78b80be 100644 --- a/recipes-kde/kf5/tier3/kservice/kservice.bb +++ b/recipes-kde/kf5/tier3/kservice/kservice.bb @@ -11,8 +11,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "kconfig kcoreaddons kcrash kdbusaddons ki18n kdoctools" PV = "${KF5_VERSION}" -SRCREV = "75cb3119ee0a5e0bfe2b4c38a23e346d93dc465e" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "97f50a98baf0464612e9346b0196d8e5" +SRC_URI[sha256sum] = "4a8ad09c9d5cf44bead302c0ea0a1b4ca749ff9f67c3c11815c0832c36f3f1ab" CMAKE_HIDE_ERROR[1] = "KF5Service, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" CMAKE_HIDE_ERROR[2] = "KF5Service, -S${includedir}, -S${STAGING_INCDIR}" diff --git a/recipes-kde/kf5/tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch b/recipes-kde/kf5/tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch index 31e90372..546db401 100644 --- a/recipes-kde/kf5/tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch +++ b/recipes-kde/kf5/tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch @@ -48,15 +48,15 @@ index 7dda78b..5c7b82c 100644 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 18c49c5..d9ce2db 100644 +index 16ec336..da9c0a9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,4 @@ +if(False) - # libgit2 integration - find_package(LibGit2 "0.22.0") if(LIBGIT2_FOUND) -@@ -314,12 +315,15 @@ install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) + SET (CMAKE_REQUIRED_LIBRARIES LibGit2::LibGit2) + check_function_exists(git_threads_init HAVE_GIT2_THREADS) +@@ -312,12 +313,15 @@ install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) # handle data files, .desktop & .cmake add_subdirectory(data) diff --git a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc index 91d4dd1d..a07dbdce 100644 --- a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc +++ b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc @@ -9,7 +9,7 @@ inherit kde-kf5 perlnative DEPENDS += "karchive kconfig kguiaddons ki18n kio kparts sonnet" PV = "${KF5_VERSION}" -SRCREV = "0d0924fb7900505bc9f9fab7767e35bb2b417f30" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "9a2f27c1ee892848bde4d21aaa694d7c" +SRC_URI[sha256sum] = "034f2401af66ff94e6ce1b8ecc99abce873ca146344a362ae5b8ef3f05572246" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" diff --git a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb index 39f9db4e..7862b6d7 100644 --- a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb +++ b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb @@ -9,8 +9,8 @@ inherit kde-kf5 cmake-lib DEPENDS += "kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwidgetsaddons kwindowsystem sonnet" PV = "${KF5_VERSION}" -SRCREV = "c9dfa8d8a289df07f40e83fb54976b6e06364020" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "bb39ff70f893174be874defd70924f52" +SRC_URI[sha256sum] = "45c97495dabf59cb77e4b3d0388bc42aee1e82f75f13a398908b0afb58aa107a" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5TextWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier3/kwallet/kwallet.bb b/recipes-kde/kf5/tier3/kwallet/kwallet.bb index 4ef773c9..11394ad0 100644 --- a/recipes-kde/kf5/tier3/kwallet/kwallet.bb +++ b/recipes-kde/kf5/tier3/kwallet/kwallet.bb @@ -23,8 +23,8 @@ DEPENDS += " \ # TBD: add KF5Gpgmepp with PACKAGECONFIG?? PV = "${KF5_VERSION}" -SRCREV = "5a605f8a6ec979aac537230e82bace01f499abb4" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "20174f02ae51be1e3d3d63f8b4dba722" +SRC_URI[sha256sum] = "30b06d87cc1e66728d0707cdf35aa6bf198b299b16d29a795f26ef060f6b75a5" SRC_URI += "file://0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch" diff --git a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb index 25a5b3d2..f2d6ff92 100644 --- a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb +++ b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb @@ -21,8 +21,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "41a2bcc80650843aee553a9b47e1ed86fb898268" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "8bcf5f6aabff251d3e722216c1ecfff2" +SRC_URI[sha256sum] = "0687ba5cf1a6dbd5cb699a48fa8793c132f8bbc9746662efc82610b4058cfcfe" # REVISIT remove ugly hack for wayland-only environments SRC_URI += " \ diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb index d0b578f4..b25acb63 100644 --- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb +++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb @@ -31,8 +31,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRCREV = "a39f20cc044c866389618a21fde26e27f8f06dfe" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "0e8c690beeec8da3b9ae9f45ca5c1942" +SRC_URI[sha256sum] = "35345ced57cce80e1089b3172edfd277a0dc5ed4148b9c52a18c2ca0869eb364" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5Plasma, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb index adc69375..a9b5debc 100644 --- a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb +++ b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb @@ -19,8 +19,8 @@ DEPENDS += " \ RRECCOMENDS_${PN} += "oxygen-fonts" PV = "${KF5_VERSION}" -SRCREV = "2571c2b39a707b5495f950f6a6879aff84ca7e82" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "cee7800425102977c1290869d8280bd1" +SRC_URI[sha256sum] = "e2fc33afc69c7dc8329b8f97340a6d052f035ad88593af2d6668da94fc001a34" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5FrameworkIntegration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"