From 886a355a893951afa67e6f95616777980b700e7c Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 1 Aug 2022 23:30:59 +0000
Subject: Mon Aug  1 23:30:59 UTC 2022

a/cryptsetup-2.5.0-x86_64-2.txz:  Rebuilt.
  Use file descriptor 3 in rc.luks's main loop so that sdtin works properly for
  cryptsetup and/or a keyscript. PiterPunk gave it to me like this and then I
  proceeded to break it. Sorry about that.
---
 source/kde/kde/build/kmymoney                      |  2 +-
 source/kde/kde/patch/kmymoney.patch                |  2 --
 .../kde/kde/patch/kmymoney/kmymoney.akonadi.patch  | 34 ----------------------
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 source/kde/kde/patch/kmymoney.patch
 delete mode 100644 source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch

(limited to 'source/kde')

diff --git a/source/kde/kde/build/kmymoney b/source/kde/kde/build/kmymoney
index 7ed6ff82d..d00491fd7 100644
--- a/source/kde/kde/build/kmymoney
+++ b/source/kde/kde/build/kmymoney
@@ -1 +1 @@
-5
+1
diff --git a/source/kde/kde/patch/kmymoney.patch b/source/kde/kde/patch/kmymoney.patch
deleted file mode 100644
index ead3686fe..000000000
--- a/source/kde/kde/patch/kmymoney.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fix build with recent akonadi:
-cat $CWD/patch/kmymoney/kmymoney.akonadi.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch b/source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch
deleted file mode 100644
index 6d062326c..000000000
--- a/source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -aurN kmymoney-5.1.2/kmymoney/mymoney/mymoneycontact.cpp kmymoney-5.1.2-mod/kmymoney/mymoney/mymoneycontact.cpp
---- kmymoney-5.1.2/kmymoney/mymoney/mymoneycontact.cpp	2021-06-23 17:49:12.000000000 +0200
-+++ kmymoney-5.1.2-mod/kmymoney/mymoney/mymoneycontact.cpp	2021-12-12 17:03:38.513691645 +0100
-@@ -8,11 +8,20 @@
- #include "mymoneycontact.h"
- 
- #ifdef ENABLE_ADDRESSBOOK
--#include <KIdentityManagement/IdentityManager>
- #include <KIdentityManagement/Identity>
-+#include <KIdentityManagement/IdentityManager>
-+#include <akonadi_version.h>
-+
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
-+#include <Akonadi/Collection>
-+#include <Akonadi/ItemFetchScope>
-+#include <Akonadi/RecursiveItemFetchJob>
-+#else
- #include <AkonadiCore/RecursiveItemFetchJob>
- #include <AkonadiCore/ItemFetchScope>
- #include <AkonadiCore/Collection>
-+#endif
-+
- #include <KContacts/Addressee>
- #include <QRegularExpression>
- #endif
-@@ -67,7 +76,7 @@
-         job->fetchScope().fetchFullPayload();
-         job->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::Parent);
-         job->setProperty("MyMoneyContact_email", email);
--        connect(job, SIGNAL(result(KJob*)), this, SLOT(searchContactResult(KJob*)));
-+        connect(job, &Akonadi::RecursiveItemFetchJob::result, this, &MyMoneyContact::searchContactResult);
-         job->start();
-     }
- #else
-- 
cgit v1.2.3-79-gdb01