[arch-commits] Commit in kmymoney/trunk (4f8a333c.patch PKGBUILD)

[Antonio Rojas]

    Date: Monday, March 14, 2022 @ 07:45:17
  Author: arojas
Revision: 1152156

Qt 5.15.3 rebuild (FS#74111)

Added:
  kmymoney/trunk/4f8a333c.patch
Modified:
  kmymoney/trunk/PKGBUILD

----------------+
 4f8a333c.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD       |   16 ++++++++++++----
 2 files changed, 59 insertions(+), 4 deletions(-)

Added: 4f8a333c.patch
===================================================================
--- 4f8a333c.patch	                        (rev 0)
+++ 4f8a333c.patch	2022-03-14 07:45:17 UTC (rev 1152156)
@@ -0,0 +1,47 @@
+From 4f8a333c2273c2564197dc622c77ad675ac73adc Mon Sep 17 00:00:00 2001
+From: Thomas Baumgart <thb at 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-03-14 01:46:46 UTC (rev 1152155)
+++ PKGBUILD	2022-03-14 07:45:17 UTC (rev 1152156)
@@ -7,7 +7,7 @@
 
 pkgname=kmymoney
 pkgver=5.1.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
 arch=('x86_64')
 url="https://kmymoney.org/"
@@ -20,11 +20,20 @@
 makedepends=('boost' '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})
+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)
 validpgpkeys=('D69A745A55331F44F404D8258D4DE062AA2EB01C')
 sha256sums=('37bdc4e763a2849b9f739f73e38b389c02bde1c1b1844edcfa7e3ab1d5bf7b3b'
-            'SKIP')
+            'SKIP'
+            '822a1e7a1c7692b50f0c7f9dc76f6548cb83b0fac86f93a10105818d7a037d80'
+            '6e98eb3ef809019f71b131e6c4901dee5ced49fbf4c01a8dacce060f39e2a497')
 
+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
 
@@ -32,7 +41,6 @@
   cd build
 
   cmake ../ \
-    -DCMAKE_INSTALL_LIBDIR=lib \
     -DENABLE_WEBENGINE=ON \
     -DCMAKE_SKIP_RPATH=YES \
     -Wno-dev