commit: ec20f1d83e744fbeb7310fc3cf31be0e8faa6630 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Aug 26 09:42:17 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Aug 26 10:31:41 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec20f1d8
media-gfx/digikam: Fix build with >=kde-apps/akonadi-contact-23.08 Closes: https://bugs.gentoo.org/913046 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/digikam/digikam-8.1.0-r1.ebuild | 12 +++++++++ media-gfx/digikam/files/digikam-8.1.0-cmake.patch | 31 ++++++++++++----------- 2 files changed, 28 insertions(+), 15 deletions(-) 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 <[email protected]> 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
