Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmymoney for openSUSE:Factory checked in at 2021-10-04 18:40:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmymoney (Old) and /work/SRC/openSUSE:Factory/.kmymoney.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmymoney" Mon Oct 4 18:40:46 2021 rev:75 rq:923010 version:5.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kmymoney/kmymoney.changes 2021-06-24 18:23:20.456967252 +0200 +++ /work/SRC/openSUSE:Factory/.kmymoney.new.2443/kmymoney.changes 2021-10-04 18:42:38.410318262 +0200 @@ -1,0 +2,7 @@ +Mon Oct 4 11:45:46 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Add patches to fix build with newer gwenhywfar versions: + * 0001-Remove-unused-variable-definition.patch + * 0002-Fix-build-with-newer-Gwenhywfar-versions.patch + +------------------------------------------------------------------- New: ---- 0001-Remove-unused-variable-definition.patch 0002-Fix-build-with-newer-Gwenhywfar-versions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmymoney.spec ++++++ --- /var/tmp/diff_new_pack.EFnEVk/_old 2021-10-04 18:42:38.910319074 +0200 +++ /var/tmp/diff_new_pack.EFnEVk/_new 2021-10-04 18:42:38.914319081 +0200 @@ -31,6 +31,9 @@ Group: Productivity/Office/Finance URL: https://www.kmymoney.org/ Source0: https://download.kde.org/stable/kmymoney/%{version}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Remove-unused-variable-definition.patch +Patch1: 0002-Fix-build-with-newer-Gwenhywfar-versions.patch BuildRequires: doxygen BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -107,7 +110,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build %if %{with qtwebengine} ++++++ 0001-Remove-unused-variable-definition.patch ++++++ >From 125db90e64d77657918335df85f4c45b0d04325d Mon Sep 17 00:00:00 2001 From: Thomas Baumgart <[email protected]> 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 ++++++ 0002-Fix-build-with-newer-Gwenhywfar-versions.patch ++++++ >From 265d4dc3d1dc8592ec1122aa04bfb7d431a43d5d Mon Sep 17 00:00:00 2001 From: Thomas Baumgart <[email protected]> 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
