commit: c3f608950506703a0b4fa667b638434ee8d22cf2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Mar 26 12:56:13 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Mar 26 12:59:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f60895
media-gfx/digikam: Fix IUSE addressbook Closes: https://bugs.gentoo.org/927858 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/digikam/digikam-8.3.0.ebuild | 14 +++++------- .../files/digikam-8.3.0-cmake-addressbook.patch | 26 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/media-gfx/digikam/digikam-8.3.0.ebuild b/media-gfx/digikam/digikam-8.3.0.ebuild index cc2ba25def3e..887be4124f06 100644 --- a/media-gfx/digikam/digikam-8.3.0.ebuild +++ b/media-gfx/digikam/digikam-8.3.0.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://www.digikam.org/"; LICENSE="GPL-2" SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop spell" +IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell" # bug 366505 RESTRICT="test" @@ -74,11 +74,6 @@ COMMON_DEPEND=" ) imagemagick? ( media-gfx/imagemagick:= ) lensfun? ( media-libs/lensfun ) - marble? ( - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=kde-apps/marble-23.08.3:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - ) opengl? ( >=dev-qt/qtopengl-${QTMIN}:5 virtual/opengl @@ -106,7 +101,10 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-cmake-addressbook.patch" +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -130,11 +128,11 @@ src_configure() { -DENABLE_QWEBENGINE=ON -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) $(cmake_use_find_package calendar KF5CalendarCore) + -DENABLE_GEOLOCATION=$(usex geolocation) $(cmake_use_find_package gphoto2 Gphoto2) $(cmake_use_find_package heif Libheif) $(cmake_use_find_package imagemagick ImageMagick) $(cmake_use_find_package lensfun LensFun) - $(cmake_use_find_package marble Marble) -DENABLE_MYSQLSUPPORT=$(usex mysql) -DENABLE_INTERNALMYSQL=$(usex mysql) $(cmake_use_find_package opengl OpenGL) diff --git a/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch b/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch new file mode 100644 index 000000000000..537a36990404 --- /dev/null +++ b/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch @@ -0,0 +1,26 @@ +From 82ce7f02d65c43605c28b9ca69f8cbd7e12a5bee Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Tue, 26 Mar 2024 13:23:51 +0100 +Subject: [PATCH] addressbook: Fix upstream's AkonadiCore prefix confusion + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + core/utilities/extrasupport/addressbook/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/utilities/extrasupport/addressbook/CMakeLists.txt b/core/utilities/extrasupport/addressbook/CMakeLists.txt +index 5923f1fc34..23f31d01d8 100644 +--- a/core/utilities/extrasupport/addressbook/CMakeLists.txt ++++ b/core/utilities/extrasupport/addressbook/CMakeLists.txt +@@ -16,7 +16,7 @@ include_directories($<TARGET_PROPERTY:Qt${QT_VERSION_MAJOR}::Widgets,INTERFACE_I + + if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) + include_directories( +- $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES> ++ $<TARGET_PROPERTY:KPim${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES> + $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::Contacts,INTERFACE_INCLUDE_DIRECTORIES> + + $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::CoreAddons,INTERFACE_INCLUDE_DIRECTORIES> +-- +2.44.0 +
