summaryrefslogtreecommitdiffstats
path: root/source/kde
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-06-23 18:15:29 +0000
committer Eric Hameleers <alien@slackware.com>2022-06-24 06:59:46 +0200
commit159667f56ee028f8fa05b6b2112e5cbba0897d50 (patch)
tree8e49e1b683d606b1d02271c2eccd2da2bc244316 /source/kde
parentab672bcf47dca57cfce72407176dd6460c3397b7 (diff)
downloadcurrent-159667f56ee028f8fa05b6b2112e5cbba0897d50.tar.gz
current-159667f56ee028f8fa05b6b2112e5cbba0897d50.tar.xz
Thu Jun 23 18:15:29 UTC 202220220623181529
d/parallel-20220622-noarch-1.txz: Upgraded. kde/digikam-7.7.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/kde/build/digikam2
-rw-r--r--source/kde/kde/patch/digikam.patch2
-rw-r--r--source/kde/kde/patch/digikam/digikam.51efe295a222070743187af0367b0bf957879337.patch28
3 files changed, 1 insertions, 31 deletions
diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/digikam
+++ b/source/kde/kde/build/digikam
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/digikam.patch b/source/kde/kde/patch/digikam.patch
deleted file mode 100644
index a44206c2f..000000000
--- a/source/kde/kde/patch/digikam.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index a2933bc71..000000000
--- a/source/kde/kde/patch/digikam/digikam.51efe295a222070743187af0367b0bf957879337.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-