Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package digikam for openSUSE:Factory checked
in at 2022-05-13 23:03:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/digikam (Old)
and /work/SRC/openSUSE:Factory/.digikam.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam"
Fri May 13 23:03:18 2022 rev:204 rq:976994 version:7.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2022-03-07
17:48:26.499093842 +0100
+++ /work/SRC/openSUSE:Factory/.digikam.new.1538/digikam.changes
2022-05-13 23:03:25.619137202 +0200
@@ -1,0 +2,6 @@
+Fri May 13 06:46:48 UTC 2022 - Wolfgang Bauer <wba...@tmo.at>
+
+- Add Fix-build-with-akonadi-contacts-22.04.patch to fix build with
+ the latest Akonadi versions
+
+-------------------------------------------------------------------
New:
----
Fix-build-with-akonadi-contacts-22.04.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.de5egT/_old 2022-05-13 23:03:27.339138784 +0200
+++ /var/tmp/diff_new_pack.de5egT/_new 2022-05-13 23:03:27.343138788 +0200
@@ -33,6 +33,8 @@
%endif
# 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-build-with-akonadi-contacts-22.04.patch
# QtWebEngine is not available on ppc and zSystems
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 %{mips} %{riscv}
BuildRequires: QtAV-devel >= 1.12
@@ -171,6 +173,7 @@
# Leap 15 only has exiv2 0.26
%patch0 -p1
%endif
+%patch1 -p1
%build
%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON
++++++ Fix-build-with-akonadi-contacts-22.04.patch ++++++
>From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <aro...@archlinux.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
