From f6fd15e0418aea97c7ee77672468561cdac302e5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 26 Aug 2023 15:57:31 +0100 Subject: gentoo auto-resync : 26:08:2023 - 15:57:31 --- media-gfx/digikam/Manifest | 4 +-- media-gfx/digikam/digikam-8.1.0-r1.ebuild | 12 +++++++++ media-gfx/digikam/files/digikam-8.1.0-cmake.patch | 31 ++++++++++++----------- 3 files changed, 30 insertions(+), 17 deletions(-) (limited to 'media-gfx/digikam') diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index cd7bdacc398f..8ac1f2a01ad9 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,5 +1,5 @@ -AUX digikam-8.1.0-cmake.patch 5948 BLAKE2B c1fde60bf77039a4d4a974a9112237e014b27cbbdae0348965dcff97377e5a4929dc04a6c12e71e38534554e0bf55ef5cdd0e4a1c099996ca237f7dc3acb44f3 SHA512 65bbba111168809a6afea5c001b2af6cab8a04f9547abcec8adcd535d4631b28e274e0a93279519f7fef5b92aec1019e09973ec92e27d55a4292b7557ddcd4df +AUX digikam-8.1.0-cmake.patch 6067 BLAKE2B fbb3c441dd0214417fda0650997300bc9a53cab10c58fa29d3f0d5bf331b877a126a9d2577a230ff397355610dfa7f7a6a689e625c371b60448674ba8ca05c35 SHA512 2b042cd0264e521d9b353a05a1aac0a78e1b9b4f4f00aa58d68f2f4fd3940cc17bfb5025ac730c71b96d59cd4abae4f816c552ac0cd58aec3a7f9dc9b1de7415 AUX digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch 1613 BLAKE2B 774c24f498c37ccc9a3eca7165734b870861f38b7d196f3b7ad75eef4340854be3c20988fc043b6e7c3a6ac53bf7529834f28daf8fabed9d8692dbd60016e65f SHA512 31197b360de14d858379cfd2a937a0a2a21e16b60ad7a82aafa3fb67ddeb2a3e9ecdf190fa4bec1a97bb912c44ed594104b1a5df40f1c317ea1b0e9f8e76cae3 DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B 0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069 SHA512 cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4 -EBUILD digikam-8.1.0-r1.ebuild 4336 BLAKE2B 061ea80c923e46f72b296805b3772a585c5574880f622a6e8dd419fc1e3c819eb069127b67e355ef0fc472bb18f23e6dc69ec8c3ed4ccd53b0cf94edac1e85c8 SHA512 028b4cd48bfd08f5f919794eb8216a063d6f3ddbf0e87024a0ca0afb840bf532548d54f5378465b2a48ac79519d736314475eee8c1bcc64d93ecd717c37c3414 +EBUILD digikam-8.1.0-r1.ebuild 4707 BLAKE2B 9328b7de79fedf579e7b40fa561dd3300843b1646207aa57c96ebb5124932f073a7ff81f2793e5690ce9d8b7a6efa8816e485e7c47ee3604239721c16e022175 SHA512 2d15904f13e3e861740fd044da8d1c9938c33027c7d63429746383e5bb6278fefc1d75b9f7d62cb1951e93d132129b604c6e7c6975ab0838304794e308ea32c2 MISC metadata.xml 955 BLAKE2B 49eb64d1179383122e4fe65b2edc22929b46dba0fdb44cbd6230b33268143a9c7d4dc56a7414029864bce0a06c60c56476abc0264f151fad356020b5998b79e3 SHA512 dbe088987df5f09a8d166a293423f006eb97ab57fd0415871dc30a1a066e33a7e9e4c13a5608dd69dd96b06082bac5c216c7d9506ca60d326ab10ade96b6af39 diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild b/media-gfx/digikam/digikam-8.1.0-r1.ebuild index 3eebbe374fb0..1480188f76bc 100644 --- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild +++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild @@ -122,6 +122,18 @@ pkg_setup() { ecm_pkg_setup } +src_prepare() { + ecm_src_prepare + if has_version ">=kde-apps/akonadi-contacts-23.08.0"; then + sed -e "/KF5[:]*Akonadi/s/KF5/KPim5/" \ + -i core/CMakeLists.txt \ + core/utilities/extrasupport/CMakeLists.txt \ + core/utilities/extrasupport/addressbook/CMakeLists.txt \ + core/app/DigikamCoreTarget.cmake \ + core/cmake/rules/RulesKDEFramework.cmake || die + fi +} + # FIXME: Unbundle libraw (libs/rawengine/libraw) src_configure() { local mycmakeargs=( diff --git a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch index 16c1ffa5c37d..8e1f71e661a1 100644 --- a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch +++ b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch @@ -1,20 +1,20 @@ -From 05b6e81bd4ceca8d6166aa0a000919cde2bfde3e Mon Sep 17 00:00:00 2001 +From 5171575601ebc553cb747a2757caf63b433820b3 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 17 Feb 2019 23:51:03 +0100 Subject: [PATCH] Un-break optional Qt/KF5 detection And if we enable an option, make the necessary libraries REQUIRED. --- - core/cmake/rules/RulesKDEFramework.cmake | 34 +++----------- + core/cmake/rules/RulesKDEFramework.cmake | 41 +++-------------- core/cmake/rules/RulesQtFramework.cmake | 58 +++++------------------- core/cmake/rules/RulesX11.cmake | 7 +-- - 3 files changed, 18 insertions(+), 81 deletions(-) + 3 files changed, 19 insertions(+), 87 deletions(-) diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake -index 610033425c..2d8acc7956 100644 +index 610033425c..3ea9b1351d 100644 --- a/core/cmake/rules/RulesKDEFramework.cmake +++ b/core/cmake/rules/RulesKDEFramework.cmake -@@ -26,19 +26,15 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET +@@ -26,35 +26,20 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET ) if(ENABLE_KFILEMETADATASUPPORT) @@ -30,16 +30,17 @@ index 610033425c..2d8acc7956 100644 if(ENABLE_AKONADICONTACTSUPPORT) - +- - find_package(KF5 ${AKONADI_MIN_VERSION} QUIET - OPTIONAL_COMPONENTS -+ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED -+ COMPONENTS - Akonadi - AkonadiContact # For KDE Mail Contacts support. - Contacts # API for contacts/address book data. -@@ -46,15 +42,9 @@ if(ENABLE_AKONADICONTACTSUPPORT) - +- Akonadi +- AkonadiContact # For KDE Mail Contacts support. +- Contacts # API for contacts/address book data. +- ) +- ++ find_package(KF5Akonadi ${AKONADI_MIN_VERSION} REQUIRED) ++ find_package(KF5AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support. ++ find_package(KF5Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for contacts/address book data. endif() -find_package(KF5 ${KSANE_MIN_VERSION} QUIET @@ -56,7 +57,7 @@ index 610033425c..2d8acc7956 100644 if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) -@@ -62,18 +52,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) +@@ -62,18 +47,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) endif() @@ -175,5 +176,5 @@ index d7659eed34..9c145970b2 100644 set(HAVE_X11 TRUE) -- -2.41.0 +2.42.0 -- cgit v1.2.3