[neon/extras/kmymoney/Neon/release] debian: Add patch to fix build failures against KDEPIM 21.12.

[Patrick Franz]

Git commit baaeefdf723b2a3b5dfec0ae310ff835f745e240 by Patrick Franz.
Committed on 02/04/2022 at 11:21.
Pushed by jriddell into branch 'Neon/release'.

Add patch to fix build failures against KDEPIM 21.12.

M  +3    -0    debian/changelog
A  +39   -0    debian/patches/fix_build_kdepim_21.12.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/extras/kmymoney/commit/baaeefdf723b2a3b5dfec0ae310ff835f745e240

diff --git a/debian/changelog b/debian/changelog
index df27cc9..ebbf3fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kmymoney (5.1.2-4) UNRELEASED; urgency=medium
 
+  [ Patrick Franz ]
+  * Add patch to fix build failures against KDEPIM 21.12.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Apr 2022 13:18:05 +0200
 
 kmymoney (5.1.2-3) unstable; urgency=medium
diff --git a/debian/patches/fix_build_kdepim_21.12.patch b/debian/patches/fix_build_kdepim_21.12.patch
new file mode 100644
index 0000000..2fc37a4
--- /dev/null
+++ b/debian/patches/fix_build_kdepim_21.12.patch
@@ -0,0 +1,39 @@
+From 0da96ecec95b7aa637d81d761c3ca24c5bc79417 Mon Sep 17 00:00:00 2001
+From: Thomas Baumgart <thb at net-bembel.de>
+Date: Sun, 14 Nov 2021 16:44:19 +0100
+Subject: [PATCH] Fix Compile for Newer Akonadi Builds
+
+(cherry picked from commit a06d2fe154f755c3af1e7f261cd631929b9da998)
+---
+ kmymoney/mymoney/mymoneycontact.cpp | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/kmymoney/mymoney/mymoneycontact.cpp b/kmymoney/mymoney/mymoneycontact.cpp
+index 4b3f9eb21..8e030ffea 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
+-- 
+GitLab
+
diff --git a/debian/patches/series b/debian/patches/series
index 9cac220..0b799a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 upstream_Remove-unused-variable-definition.patch
 upstream_Fix-build-with-newer-Gwenhywfar-versions.patch
+fix_build_kdepim_21.12.patch