[neon/extras/kmymoney/Neon/release] debian: update the patches
Pino Toscano
null at kde.org
Mon Aug 15 14:02:06 BST 2022
Git commit b00b0779809ad5316ccb7e3734123d522ed068bb by Pino Toscano.
Committed on 31/07/2022 at 06:21.
Pushed by jriddell into branch 'Neon/release'.
update the patches
- upstream_Remove-unused-variable-definition.patch: drop, backported
from upstream
- upstream_Fix-build-with-newer-Gwenhywfar-versions.patch: drop,
backported from upstream
- fix_build_kdepim_21.12.patch: drop, fixed upstream
M +6 -0 debian/changelog
D +0 -39 debian/patches/fix_build_kdepim_21.12.patch
D +0 -3 debian/patches/series
D +0 -49 debian/patches/upstream_Fix-build-with-newer-Gwenhywfar-versions.patch
D +0 -36 debian/patches/upstream_Remove-unused-variable-definition.patch
https://invent.kde.org/neon/extras/kmymoney/commit/b00b0779809ad5316ccb7e3734123d522ed068bb
diff --git a/debian/changelog b/debian/changelog
index e98efc2..5e004df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ kmymoney (5.1.3-0r1) UNRELEASED; urgency=medium
[ Pino Toscano ]
* New upstream release.
* Bump Standards-Version to 4.6.1, no changes required.
+ * Update the patches:
+ - upstream_Remove-unused-variable-definition.patch: drop, backported from
+ upstream
+ - upstream_Fix-build-with-newer-Gwenhywfar-versions.patch: drop, backported
+ from upstream
+ - fix_build_kdepim_21.12.patch: drop, fixed upstream
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sun, 31 Jul 2022 08:10:43 +0200
diff --git a/debian/patches/fix_build_kdepim_21.12.patch b/debian/patches/fix_build_kdepim_21.12.patch
deleted file mode 100644
index 2fc37a4..0000000
--- a/debian/patches/fix_build_kdepim_21.12.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 0b799a7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream_Remove-unused-variable-definition.patch
-upstream_Fix-build-with-newer-Gwenhywfar-versions.patch
-fix_build_kdepim_21.12.patch
diff --git a/debian/patches/upstream_Fix-build-with-newer-Gwenhywfar-versions.patch b/debian/patches/upstream_Fix-build-with-newer-Gwenhywfar-versions.patch
deleted file mode 100644
index 376b90a..0000000
--- a/debian/patches/upstream_Fix-build-with-newer-Gwenhywfar-versions.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index 3c77098..0000000
--- a/debian/patches/upstream_Remove-unused-variable-definition.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
-
More information about the Neon-commits
mailing list