From ee861a17268a54a17b3b321d9a1ff82ed547e606 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 26 Apr 2022 19:45:46 +0000
Subject: Tue Apr 26 19:45:46 UTC 2022

a/mkinitrd-1.4.11-x86_64-29.txz:  Rebuilt.
  Support mounting additional partitions from the initrd - useful for anyone
  still stuck with a separated /usr. ;-) Thanks to PiterPunk.
  Ensure that the target directory exists before trying to copy a module into
  it (workaround for coreutils 9.1 behavior change).
ap/vim-8.2.4830-x86_64-1.txz:  Upgraded.
l/SDL2-2.0.22-x86_64-1.txz:  Upgraded.
l/elfutils-0.187-x86_64-1.txz:  Upgraded.
l/fluidsynth-2.2.7-x86_64-1.txz:  Upgraded.
n/gnupg2-2.2.35-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.2.4830-x86_64-1.txz:  Upgraded.
xap/xpdf-4.04-x86_64-1.txz:  Upgraded.
---
 source/kde/FTBFSlog                                |  3 +++
 source/kde/kde/patch/digikam.patch                 |  2 ++
 ....51efe295a222070743187af0367b0bf957879337.patch | 28 ++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 source/kde/kde/patch/digikam.patch
 create mode 100644 source/kde/kde/patch/digikam/digikam.51efe295a222070743187af0367b0bf957879337.patch

(limited to 'source/kde')

diff --git a/source/kde/FTBFSlog b/source/kde/FTBFSlog
index 859555ed..1c1b8b23 100644
--- a/source/kde/FTBFSlog
+++ b/source/kde/FTBFSlog
@@ -1,3 +1,6 @@
+Tue Apr 26 19:35:10 UTC 2022
+  kde/digikam: fix build with latest akonadi-contacts. Thanks to nobodino.
++--------------------------+
 Mon Feb  7 20:57:55 UTC 2022
   All packages tested and found to compile properly.
 +--------------------------+
diff --git a/source/kde/kde/patch/digikam.patch b/source/kde/kde/patch/digikam.patch
new file mode 100644
index 00000000..a44206c2
--- /dev/null
+++ b/source/kde/kde/patch/digikam.patch
@@ -0,0 +1,2 @@
+# Fix build with recent akonadi-contacts:
+cat $CWD/patch/digikam/digikam.51efe295a222070743187af0367b0bf957879337.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/digikam/digikam.51efe295a222070743187af0367b0bf957879337.patch b/source/kde/kde/patch/digikam/digikam.51efe295a222070743187af0367b0bf957879337.patch
new file mode 100644
index 00000000..a2933bc7
--- /dev/null
+++ b/source/kde/kde/patch/digikam/digikam.51efe295a222070743187af0367b0bf957879337.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
+
-- 
cgit v1.2.3