diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-08-01 23:30:59 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-08-02 09:00:16 +0200 |
commit | 886a355a893951afa67e6f95616777980b700e7c (patch) | |
tree | 05a4a9255094722bad3d194328c167deb307535d /source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch | |
parent | 18570c2f3bedf7370815285dc11da0ebc401a5cd (diff) | |
download | current-886a355a893951afa67e6f95616777980b700e7c.tar.gz current-886a355a893951afa67e6f95616777980b700e7c.tar.xz |
Mon Aug 1 23:30:59 UTC 202220220801233059
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.
Diffstat (limited to '')
-rw-r--r-- | source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch | 34 |
1 files changed, 0 insertions, 34 deletions
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 |