[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/

[Andreas Sturmlechner]

commit:     f9d833272ef7ee42b6f9514fcac499b2dc691e3c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 00:07:28 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  9 00:13:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d83327

media-gfx/digikam: Fix build with kde-apps/akonadi-22.04.0

Closes: https://bugs.gentoo.org/841695
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/digikam/digikam-7.5.0.ebuild             |  6 ++++-
 .../files/digikam-7.5.0-akonadi-22.04.0.patch      | 28 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild b/media-gfx/digikam/digikam-7.5.0.ebuild
index 1c774239c811..63edd26cbf88 100644
--- a/media-gfx/digikam/digikam-7.5.0.ebuild
+++ b/media-gfx/digikam/digikam-7.5.0.ebuild
@@ -106,7 +106,11 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-7.3.0-cmake.patch"
+	# upstream git master
+	"${FILESDIR}/${P}-akonadi-22.04.0.patch"
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp

diff --git a/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
new file mode 100644
index 000000000000..a2933bc71d3f
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
@@ -0,0 +1,28 @@
+From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@×××××××××.org>
+Date: Fri, 22 Apr 2022 19:13:28 +0200
+Subject: [PATCH] Fix build with akonadi-contacts 22.04
+
+---
+ core/utilities/extrasupport/addressbook/akonadiiface.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+index 6a78863cf6..8e65a405da 100644
+--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
++++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+@@ -49,7 +49,11 @@
+ #include <AkonadiCore/Item>
+ #endif
+ 
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
++#include <Akonadi/ContactSearchJob>
++#else
+ #include <Akonadi/Contact/ContactSearchJob>
++#endif
+ #include <KContacts/Addressee>
+ 
+ #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
+-- 
+GitLab
+