Date: Sunday, September 4, 2022 @ 10:13:07 Author: arojas Revision: 1292819
upgpkg: kmymoney 5.1.3-1: Update to 5.1.3 Modified: kmymoney/trunk/PKGBUILD Deleted: kmymoney/trunk/4f8a333c.patch ----------------+ 4f8a333c.patch | 47 ----------------------------------------------- PKGBUILD | 19 +++++-------------- 2 files changed, 5 insertions(+), 61 deletions(-) Deleted: 4f8a333c.patch =================================================================== --- 4f8a333c.patch 2022-09-04 09:19:46 UTC (rev 1292818) +++ 4f8a333c.patch 2022-09-04 10:13:07 UTC (rev 1292819) @@ -1,47 +0,0 @@ -From 4f8a333c2273c2564197dc622c77ad675ac73adc Mon Sep 17 00:00:00 2001 -From: Thomas Baumgart <t...@net-bembel.de> -Date: Sun, 3 Oct 2021 09:31:07 +0200 -Subject: [PATCH] Fix build with newer Gwenhywfar versions - -Use our own DEPRECATED definition ---- - 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 c4908f338..b18ce7813 100644 ---- a/kmymoney/plugins/kbanking/kbanking.h -+++ b/kmymoney/plugins/kbanking/kbanking.h -@@ -31,16 +31,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. -@@ -163,7 +162,7 @@ private: - * - * @deprecated - */ -- bool updateAccount(const MyMoneyAccount& acc) DEPRECATED; -+ bool updateAccount(const MyMoneyAccount& acc) Q_DECL_DEPRECATED; - - /** - * Trigger the password cache timer --- -GitLab - Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-04 09:19:46 UTC (rev 1292818) +++ PKGBUILD 2022-09-04 10:13:07 UTC (rev 1292819) @@ -6,8 +6,8 @@ # Contributor: Todd Maynard <a...@toddmaynard.com> pkgname=kmymoney -pkgver=5.1.2 -pkgrel=9 +pkgver=5.1.3 +pkgrel=1 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" arch=('x86_64') url="https://kmymoney.org/" @@ -20,20 +20,11 @@ makedepends=('extra-cmake-modules' 'kdoctools' 'doxygen') optdepends=('perl: for financequote.pl') changelog=$pkgname.changelog -source=(https://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig} - https://invent.kde.org/office/kmymoney/-/commit/a06d2fe1.patch - 4f8a333c.patch) +source=(https://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}) validpgpkeys=('D69A745A55331F44F404D8258D4DE062AA2EB01C') -sha256sums=('37bdc4e763a2849b9f739f73e38b389c02bde1c1b1844edcfa7e3ab1d5bf7b3b' - 'SKIP' - '822a1e7a1c7692b50f0c7f9dc76f6548cb83b0fac86f93a10105818d7a037d80' - '6e98eb3ef809019f71b131e6c4901dee5ced49fbf4c01a8dacce060f39e2a497') +sha256sums=('3938b8078b7391ba32e12bb4239762fae134683a0c2ec1a75105c302ca3e5e3f' + 'SKIP') -prepare() { - patch -d $pkgname-$pkgver -p1 < a06d2fe1.patch # Fix build with akonadi 21.12 - patch -d $pkgname-$pkgver -p1 < 4f8a333c.patch # Fix build with gwenhywfar 5.8 -} - build() { cd "${srcdir}"/$pkgname-$pkgver