[neon/extras/kmymoney/Neon/stable_focal] debian/patches: hopefully patch not needed now

Jonathan Esk-Riddell null at kde.org
Wed Aug 24 13:14:41 BST 2022


Git commit 4c3f2e104f0513e1d0a2d67a4d31eaab3d9fd575 by Jonathan Esk-Riddell.
Committed on 24/08/2022 at 12:14.
Pushed by jriddell into branch 'Neon/stable_focal'.

hopefully patch not needed now

D  +0    -32   debian/patches/akonadi-paths.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/kmymoney/commit/4c3f2e104f0513e1d0a2d67a4d31eaab3d9fd575

diff --git a/debian/patches/akonadi-paths.diff b/debian/patches/akonadi-paths.diff
deleted file mode 100644
index 7dc0f84..0000000
--- a/debian/patches/akonadi-paths.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 65e82a6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-akonadi-paths.diff


More information about the Neon-commits mailing list