pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 976994 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/976994
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=204
This commit is contained in:
Dominique Leuenberger 2022-05-13 21:03:18 +00:00 committed by Git OBS Bridge
commit e06f1acb8f
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Fix-build-with-akonadi-contacts-22.04.patch Normal file
View File

@ -0,0 +1,28 @@
From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@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

6
digikam.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri May 13 06:46:48 UTC 2022 - Wolfgang Bauer <wbauer@tmo.at>
- Add Fix-build-with-akonadi-contacts-22.04.patch to fix build with
the latest Akonadi versions
-------------------------------------------------------------------
Mon Mar 7 10:17:39 UTC 2022 - Wolfgang Bauer <wbauer@tmo.at>

3
digikam.spec
View File

@ -33,6 +33,8 @@ Source2: %{name}.keyring
%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 @@ 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