[arch-commits] Commit in gpgme/trunk (2 files)

[Christian Hesse]

    Date: Saturday, March 11, 2017 @ 19:45:23
  Author: eworm
Revision: 290630

upgpkg: gpgme 1.8.0-2

Remove a forgotten instance of @libsuffix@ (FS#53249)

Added:
  gpgme/trunk/0001-remove-a-forgotten-instance-of-libsuffix.patch
Modified:
  gpgme/trunk/PKGBUILD

-----------------------------------------------------+
 0001-remove-a-forgotten-instance-of-libsuffix.patch |   33 ++++++++++++++++++
 PKGBUILD                                            |   13 +++++--
 2 files changed, 43 insertions(+), 3 deletions(-)

Added: 0001-remove-a-forgotten-instance-of-libsuffix.patch
===================================================================
--- 0001-remove-a-forgotten-instance-of-libsuffix.patch	                        (rev 0)
+++ 0001-remove-a-forgotten-instance-of-libsuffix.patch	2017-03-11 19:45:23 UTC (rev 290630)
@@ -0,0 +1,33 @@
+From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Wed, 16 Nov 2016 23:09:45 +0100
+Subject: [PATCH] Remove a forgotten instance of @libsuffix@
+
+* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
+instance of @libsuffix at .
+--
+
+b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
+cmake config files, but missed one instance.
+
+Signed-off-by: Heiko Becker <heirecka at exherbo.org>
+---
+ lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 928d19f..cbe9713 100644
+--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
+ 
+ set_target_properties(Gpgmepp PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme at libsuffix@;@LIBASSUAN_LIBS@"
++  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
+   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
+ )
+ 
+-- 
+2.8.0.rc3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-11 19:38:54 UTC (rev 290629)
+++ PKGBUILD	2017-03-11 19:45:23 UTC (rev 290630)
@@ -6,17 +6,24 @@
 pkgbase=gpgme
 pkgname=(gpgme qgpgme)
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64')
 url="http://www.gnupg.org/related_software/gpgme/"
 license=('LGPL')
 makedepends=('libgpg-error' 'gnupg' 'qt5-base')
-source=(https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2{,.sig})
+source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
+        '0001-remove-a-forgotten-instance-of-libsuffix.patch')
 sha256sums=('596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33'
-         'SKIP')
+         'SKIP'
+         'fb743604a031b9f8be816ccb643a78ed12a660d7cbeb8519387d7f44c7d33c8a')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch
 
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  patch -Np1 < "${srcdir}/0001-remove-a-forgotten-instance-of-libsuffix.patch"
+}
+
 build() {
   cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr --disable-fd-passing --disable-static \