summaryrefslogtreecommitdiff
path: root/user/digikam/backport.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2022-06-12 18:26:44 -0500
committerZach van Rijn <me@zv.io>2022-10-21 18:34:01 -0500
commit176185bed4f79fb31bbe70d0467b8e9a2130aea5 (patch)
tree3dc4da9bdf4ced43606858dca09971211631d162 /user/digikam/backport.patch
parentce07012fbda53a7ae2eb7ad4198390072374076c (diff)
downloadpackages-176185bed4f79fb31bbe70d0467b8e9a2130aea5.tar.gz
packages-176185bed4f79fb31bbe70d0467b8e9a2130aea5.tar.bz2
packages-176185bed4f79fb31bbe70d0467b8e9a2130aea5.tar.xz
packages-176185bed4f79fb31bbe70d0467b8e9a2130aea5.zip
user/digikam: Update to 7.6.0
Diffstat (limited to 'user/digikam/backport.patch')
-rw-r--r--user/digikam/backport.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/user/digikam/backport.patch b/user/digikam/backport.patch
new file mode 100644
index 000000000..a2933bc71
--- /dev/null
+++ b/user/digikam/backport.patch
@@ -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
+