[neon/extras/kmymoney/Neon/release] debian/patches: backport patch to fix build

Harald Sitter null at kde.org
Fri Nov 26 07:32:34 GMT 2021


Git commit 5e6aff15f901460aa05d132f2c848b04f0b3657a by Harald Sitter.
Committed on 26/11/2021 at 07:31.
Pushed by sitter into branch 'Neon/release'.

backport patch to fix build

not sure this will actually fix the release build but I reckon it should.
backport from 5.1 branch

A  +49   -0    debian/patches/265d4dc3d1dc8592ec1122aa04bfb7d431a43d5d.patch
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/extras/kmymoney/commit/5e6aff15f901460aa05d132f2c848b04f0b3657a

diff --git a/debian/patches/265d4dc3d1dc8592ec1122aa04bfb7d431a43d5d.patch b/debian/patches/265d4dc3d1dc8592ec1122aa04bfb7d431a43d5d.patch
new file mode 100644
index 0000000..0ef21fd
--- /dev/null
+++ b/debian/patches/265d4dc3d1dc8592ec1122aa04bfb7d431a43d5d.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
+-- 
+GitLab
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..76b7325
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+265d4dc3d1dc8592ec1122aa04bfb7d431a43d5d.patch


More information about the Neon-commits mailing list