Accepting request 934981 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/934981
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=200

Fix-compile-for-newer-Akonadi-Build-Versions.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>
+ 
+-- 
+GitLab
+

digikam.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec  1 11:06:53 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>
+
+- Add Fix-compile-for-newer-Akonadi-Build-Versions.patch to fix
+  build with Akonadi 21.12
+
 -------------------------------------------------------------------
 Sat Aug 28 07:54:54 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 

digikam.spec

@@ -29,6 +29,8 @@ URL:            https://www.digikam.org/
 Source0:        https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE -- Lower minimum exiv2 version to 0.26
 Patch0:         0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         Fix-compile-for-newer-Akonadi-Build-Versions.patch
 # QtWebEngine is not available on ppc and zSystems
 ExclusiveArch:  %{arm} aarch64 %{ix86} x86_64 %{mips} %{riscv}
 BuildRequires:  QtAV-devel >= 1.12
@@ -152,6 +154,7 @@ Additional program to browse and view photos
 %package -n libdigikamcore%{soversion}
 Summary:        The main digikam libraries
 Group:          Development/Libraries/KDE
+# DNN ABI is not stable and not using symbol versioning (boo#1185700)
 %requires_eq %(rpm --qf %%{name} -qf %{_libdir}/libopencv_dnn.so.%{pkg_version opencv-devel})
 Recommends:     %{name}-plugins
 
@@ -166,6 +169,7 @@ The main digikam libraries that are being shared between showfoto and digikam
 # Leap 15 only has exiv2 0.26
 %patch0 -p1
 %endif
+%patch1 -p1
 
 %build
 %cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON