From 61895f0899758028e72b7f9461177b34640e1683 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 18 Dec 2021 18:36:15 +0100
Subject: [PATCH] media-gfx/digikam: Fix build with
 >=kde-apps/akonadi-contacts-21.12.0

Closes: https://bugs.gentoo.org/829539
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 media-gfx/digikam/digikam-7.3.0-r1.ebuild     |  5 ++-
 .../files/digikam-7.3.0-akonadi-21.12.0.patch | 31 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch

diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
index 7f3918113e25e..46f064167d80d 100644
--- a/media-gfx/digikam/digikam-7.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
@@ -108,7 +108,10 @@ RDEPEND="${COMMON_DEPEND}
 	panorama? ( media-gfx/hugin )
 "
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-akonadi-21.12.0.patch"
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
new file mode 100644
index 0000000000000..6e4dd25a4028c
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
@@ -0,0 +1,31 @@
+From 95a8ece964681fc6823e968541da2da2da06b3dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
+Date: Sat, 2 Oct 2021 21:50:04 +0300
+Subject: [PATCH] Fix compile for newer Akonadi Build Versions
+
+---
+ core/utilities/extrasupport/addressbook/akonadiiface.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+index 8e43dad0da..cb38036e39 100644
+--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
++++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+@@ -41,7 +41,14 @@
+ #endif
+ 
+ #include <kjob.h>
++#include <akonadi_version.h>
++
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Item>
++#else
+ #include <AkonadiCore/Item>
++#endif
++
+ #include <Akonadi/Contact/ContactSearchJob>
+ #include <KContacts/Addressee>
+ 
+-- 
+2.34.1
+