diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-07-13 23:43:10 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-07-13 23:54:48 +0200 |
| commit | 2f564f978d22353c1fc71e8f9ca786ae6d1da99a (patch) | |
| tree | efbe8ef00f1cdb9c5a35a147e0816ce2c9bd5388 | |
| parent | media-gfx/digikam: Add IUSE jpegxl (diff) | |
| download | kde-2f564f978d22353c1fc71e8f9ca786ae6d1da99a.tar.gz kde-2f564f978d22353c1fc71e8f9ca786ae6d1da99a.tar.bz2 kde-2f564f978d22353c1fc71e8f9ca786ae6d1da99a.zip | |
media-gfx/digikam: Fix IUSE addressbook, still(!) broken upstream
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | media-gfx/digikam/digikam-9999.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch | 26 |
2 files changed, 30 insertions, 1 deletions
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index 0f546c872d..0a06c8d6d0 100644 --- a/media-gfx/digikam/digikam-9999.ebuild +++ b/media-gfx/digikam/digikam-9999.ebuild @@ -102,7 +102,10 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-8.4.0-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-8.4.0-cmake.patch" + "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp 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 0000000000..537a369904 --- /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 <asturm@gentoo.org> +Date: Tue, 26 Mar 2024 13:23:51 +0100 +Subject: [PATCH] addressbook: Fix upstream's AkonadiCore prefix confusion + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + 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 + |