[neon/extras/kmymoney/Neon/release] debian: build with newer Gwenhywfar (#995676)

[Pino Toscano]

Git commit a1dc8fbea10f22cf01b5a371dd6106bd12672883 by Pino Toscano.
Committed on 12/10/2021 at 05:11.
Pushed by jriddell into branch 'Neon/release'.

build with newer Gwenhywfar (#995676)

backport upstream commit 125db90e64d77657918335df85f4c45b0d04325d and
commit 265d4dc3d1dc8592ec1122aa04bfb7d431a43d5d

M  +5    -0    debian/changelog
M  +2    -0    debian/patches/series
A  +49   -0    debian/patches/upstream_Fix-build-with-newer-Gwenhywfar-versions.patch
A  +36   -0    debian/patches/upstream_Remove-unused-variable-definition.patch

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

diff --git a/debian/changelog b/debian/changelog
index fcffc25..aa27be8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 kmymoney (5.1.2-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit 125db90e64d77657918335df85f4c45b0d04325d, and
+    commit 265d4dc3d1dc8592ec1122aa04bfb7d431a43d5d to build with newer versions
+    of Gwenhywfar; patches upstream_Remove-unused-variable-definition.patch and
+    upstream_Fix-build-with-newer-Gwenhywfar-versions.patch. (Closes: #995676)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 12 Oct 2021 07:05:48 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index be23571..a9e61dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+upstream_Remove-unused-variable-definition.patch
+upstream_Fix-build-with-newer-Gwenhywfar-versions.patch
 cmake-libical-own-module.diff
diff --git a/debian/patches/upstream_Fix-build-with-newer-Gwenhywfar-versions.patch b/debian/patches/upstream_Fix-build-with-newer-Gwenhywfar-versions.patch
new file mode 100644
index 0000000..376b90a
--- /dev/null
+++ b/debian/patches/upstream_Fix-build-with-newer-Gwenhywfar-versions.patch
@@ -0,0 +1,49 @@
+From 265d4dc3d1dc8592ec1122aa04bfb7d431a43d5d Mon Sep 17 00:00:00 2001
+From: Thomas Baumgart <thb at net-bembel.de>
+Date: Sun, 3 Oct 2021 09:41:17 +0200
+Subject: [PATCH] Fix build with newer Gwenhywfar versions
+
+Use our own DEPRECATED definition
+
+(cherry picked from commit 4f8a333c2273c2564197dc622c77ad675ac73adc)
+---
+ kmymoney/plugins/kbanking/kbanking.h | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/kmymoney/plugins/kbanking/kbanking.h b/kmymoney/plugins/kbanking/kbanking.h
+index 17ca59b16..b3e2c549b 100644
+--- a/kmymoney/plugins/kbanking/kbanking.h
++++ b/kmymoney/plugins/kbanking/kbanking.h
+@@ -30,16 +30,15 @@ class KBAccountSettings;
+ // ----------------------------------------------------------------------------
+ // Project Includes
+ 
++#include "banking.hpp"
+ #include "kmymoneyplugin.h"
+-#include "onlinepluginextended.h"
++#include "kmymoneyutils.h"
++#include "mymoney/onlinejobtyped.h"
+ #include "mymoneyaccount.h"
+ #include "mymoneykeyvaluecontainer.h"
+-
+-#include "mymoney/onlinejobtyped.h"
++#include "onlinepluginextended.h"
+ #include "onlinetasks/sepa/sepaonlinetransfer.h"
+ 
+-#include "banking.hpp"
+-
+ /**
+   * This class represents the KBanking plugin towards KMymoney.
+   * All GUI related issues are handled in this object.
+@@ -158,7 +157,7 @@ private:
+       *
+       * @deprecated
+       */
+-    bool updateAccount(const MyMoneyAccount& acc) DEPRECATED;
++    bool updateAccount(const MyMoneyAccount& acc) KMYMONEY_DEPRECATED;
+ 
+     /**
+       * Trigger the password cache timer
+-- 
+2.33.0
+
diff --git a/debian/patches/upstream_Remove-unused-variable-definition.patch b/debian/patches/upstream_Remove-unused-variable-definition.patch
new file mode 100644
index 0000000..3c77098
--- /dev/null
+++ b/debian/patches/upstream_Remove-unused-variable-definition.patch
@@ -0,0 +1,36 @@
+From 125db90e64d77657918335df85f4c45b0d04325d Mon Sep 17 00:00:00 2001
+From: Thomas Baumgart <thb at net-bembel.de>
+Date: Sun, 3 Oct 2021 09:40:26 +0200
+Subject: [PATCH] Remove unused variable definition
+
+(cherry picked from commit 4fb686b8722ec0592910c3227ab60caa6bacdd14)
+---
+ kmymoney/kmymoneyutils.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/kmymoney/kmymoneyutils.h b/kmymoney/kmymoneyutils.h
+index 3469ab039..7beff71f9 100644
+--- a/kmymoney/kmymoneyutils.h
++++ b/kmymoney/kmymoneyutils.h
+@@ -25,14 +25,16 @@
+ // ----------------------------------------------------------------------------
+ // Project Includes
+ 
++#ifndef KMYMONEY_DEPRECATED
++#define KMYMONEY_DEPRECATED Q_DECL_DEPRECATED
++#endif
++
+ class QIcon;
+ 
+ /**
+   * @author Thomas Baumgart
+   */
+ 
+-static QString m_lastNumberUsed;
+-
+ class QPixmap;
+ class QWizard;
+ class QWidget;
+-- 
+2.33.0
+