[neon/extras/kmymoney/Neon/release] debian/patches: backport patch
Jonathan Riddell
null at kde.org
Mon Jan 17 11:46:32 GMT 2022
Git commit 9581cd40d196126d6de18e16d15abb00003833d7 by Jonathan Riddell.
Committed on 17/01/2022 at 11:46.
Pushed by jriddell into branch 'Neon/release'.
backport patch
A +32 -0 debian/patches/akonadi-paths.diff
https://invent.kde.org/neon/extras/kmymoney/commit/9581cd40d196126d6de18e16d15abb00003833d7
diff --git a/debian/patches/akonadi-paths.diff b/debian/patches/akonadi-paths.diff
new file mode 100644
index 0000000..7dc0f84
--- /dev/null
+++ b/debian/patches/akonadi-paths.diff
@@ -0,0 +1,32 @@
+commit a06d2fe154f755c3af1e7f261cd631929b9da998
+Author: Ömer Fadıl USTA <omerusta at gmail.com>
+Date: Sat Oct 2 22:16:06 2021 +0300
+
+ Fix Compile for Newer Akonadi Builds
+
+diff --git a/kmymoney/mymoney/mymoneycontact.cpp b/kmymoney/mymoney/mymoneycontact.cpp
+index acc3575ef..a32357290 100644
+--- a/kmymoney/mymoney/mymoneycontact.cpp
++++ b/kmymoney/mymoney/mymoneycontact.cpp
+@@ -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
More information about the Neon-commits
mailing list