Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2021-12-01 20:47:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Wed Dec 1 20:47:28 2021 rev:200 rq:934981 version:7.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2021-08-28 22:29:29.953998428 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new.31177/digikam.changes 2021-12-02 02:11:37.555326628 +0100 @@ -1,0 +2,6 @@ +Wed Dec 1 11:06:53 UTC 2021 - Wolfgang Bauer <wba...@tmo.at> + +- Add Fix-compile-for-newer-Akonadi-Build-Versions.patch to fix + build with Akonadi 21.12 + +------------------------------------------------------------------- New: ---- Fix-compile-for-newer-Akonadi-Build-Versions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.muPbQe/_old 2021-12-02 02:11:38.939322407 +0100 +++ /var/tmp/diff_new_pack.muPbQe/_new 2021-12-02 02:11:38.943322395 +0100 @@ -29,6 +29,8 @@ 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 @@ %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 @@ # Leap 15 only has exiv2 0.26 %patch0 -p1 %endif +%patch1 -p1 %build %cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON ++++++ Fix-compile-for-newer-Akonadi-Build-Versions.patch ++++++ >From 95a8ece964681fc6823e968541da2da2da06b3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omeru...@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
