[arch-commits] Commit in kmymoney/trunk (PKGBUILD kmymoney-gpgme-1.7.patch)

[Antonio Rojas]

    Date: Thursday, October 27, 2016 @ 22:23:50
  Author: arojas
Revision: 193818

Build against gpgme++ from gpgme 1.7

Added:
  kmymoney/trunk/kmymoney-gpgme-1.7.patch
Modified:
  kmymoney/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   10 +++++++---
 kmymoney-gpgme-1.7.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-27 21:47:59 UTC (rev 193817)
+++ PKGBUILD	2016-10-27 22:23:50 UTC (rev 193818)
@@ -8,7 +8,7 @@
 
 pkgname=kmymoney
 pkgver=4.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
 arch=('i686' 'x86_64')
 url="http://kmymoney2.sourceforge.net/"
@@ -18,9 +18,10 @@
 replaces=('kmymoney2')
 changelog=$pkgname.changelog
 source=(http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz
-        4.8_build.patch)
+        4.8_build.patch kmymoney-gpgme-1.7.patch)
 sha256sums=('c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2'
-            '21cd9d7fece1b38b87ade8e4fc7f01397cf44a7fe0bc44cd08dda01d05207215')
+            '21cd9d7fece1b38b87ade8e4fc7f01397cf44a7fe0bc44cd08dda01d05207215'
+            '5a240ebedd8e6f80892187fc6543d58125c4832aff0698c0aa53ba6302033535')
 
 prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
@@ -27,6 +28,9 @@
 
 #https://bugs.kde.org/show_bug.cgi?id=364355
   patch -Np1 -i "${srcdir}"/4.8_build.patch
+
+  # Build against gpgme++ from gpgme 1.7
+  patch -p1 -i "${srcdir}"/kmymoney-gpgme-1.7.patch
 }
 
 

Added: kmymoney-gpgme-1.7.patch
===================================================================
--- kmymoney-gpgme-1.7.patch	                        (rev 0)
+++ kmymoney-gpgme-1.7.patch	2016-10-27 22:23:50 UTC (rev 193818)
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2251518..7ab4a02 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,7 @@ else (WIN32)
+   find_package(Boost "1.33.1" COMPONENTS graph)
+ endif (WIN32)
+ # needed by libkgpgfile
+-find_package(QGpgme REQUIRED)
++find_package(Gpgmepp REQUIRED)
+ find_package(KdepimLibs REQUIRED)
+ find_package(SharedMimeInfo REQUIRED)
+ 
+diff --git a/libkgpgfile/CMakeLists.txt b/libkgpgfile/CMakeLists.txt
+index a41a6a4..d60a93c 100644
+--- a/libkgpgfile/CMakeLists.txt
++++ b/libkgpgfile/CMakeLists.txt
+@@ -7,6 +7,6 @@ set(kgpgfile_STAT_SRCS
+    )
+ 
+ kde4_add_library(kgpgfile STATIC ${kgpgfile_STAT_SRCS})
+-target_link_libraries(kgpgfile ${QGPGME_LIBRARIES})
++target_link_libraries(kgpgfile Gpgmepp)
+ 
+ 
+diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp
+index b1870be..a5d3d4e 100644
+--- a/libkgpgfile/kgpgfile.cpp
++++ b/libkgpgfile/kgpgfile.cpp
+@@ -47,7 +47,6 @@
+ #include <gpgme++/keylistresult.h>
+ #include <gpgme++/key.h>
+ #include <gpgme++/data.h>
+-#include <qgpgme/dataprovider.h>
+ 
+ class KGPGFile::Private
+ {
+