From 7b246b5999caccde9a4f5e1c6f1049aa1bbff3b5 Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 28 Dec 2016 15:35:21 +0100 Subject: [PATCH] gpgme version bump and add patch --- util/crypt/gpgme/actions.py | 4 +--- .../remove-a-forgotten-instance-of-libsuffix.diff | 14 ++++++++++++++ util/crypt/gpgme/pspec.xml | 15 +++++++++++++-- 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 util/crypt/gpgme/files/remove-a-forgotten-instance-of-libsuffix.diff diff --git a/util/crypt/gpgme/actions.py b/util/crypt/gpgme/actions.py index dc9eec639c..f6ec08daa5 100644 --- a/util/crypt/gpgme/actions.py +++ b/util/crypt/gpgme/actions.py @@ -21,8 +21,6 @@ def build(): #autotools.make("check") def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.insinto("/usr/lib/cmake/Qgpgme", "lang/qt/src/QGpgmeConfig.cmake") - pisitools.insinto("/usr/lib/cmake/Qgpgme", "lang/qt/src/QGpgmeConfigVersion.cmake") + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README", "THANKS", "TODO") diff --git a/util/crypt/gpgme/files/remove-a-forgotten-instance-of-libsuffix.diff b/util/crypt/gpgme/files/remove-a-forgotten-instance-of-libsuffix.diff new file mode 100644 index 0000000000..b6bc778238 --- /dev/null +++ b/util/crypt/gpgme/files/remove-a-forgotten-instance-of-libsuffix.diff @@ -0,0 +1,14 @@ +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@libsuffix@;@LIBASSUAN_LIBS@" ++ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" + IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" + ) + +-- diff --git a/util/crypt/gpgme/pspec.xml b/util/crypt/gpgme/pspec.xml index cc581fa1e3..2253f53fd5 100644 --- a/util/crypt/gpgme/pspec.xml +++ b/util/crypt/gpgme/pspec.xml @@ -13,7 +13,7 @@ library GnuPG Made Easy is a library for making GnuPG easier to use GPGME is a library designed to make access to GnuPG easier for applications. It provides a high-Level Crypto application programming interface (API) for encryption, decryption, signing, signature verification and key management. - http://gd.tuwien.ac.at/pub/gnupg/gpgme/gpgme-1.7.1.tar.bz2 + http://gd.tuwien.ac.at/pub/gnupg/gpgme/gpgme-1.8.0.tar.bz2 gnupg libgpg-error-devel @@ -23,7 +23,10 @@ swig python3-devel python-devel - + + + remove-a-forgotten-instance-of-libsuffix.diff + @@ -34,6 +37,7 @@ libassuan libgcc qt5-base + python3 /usr/bin @@ -60,6 +64,13 @@ + + 2016-12-28 + 1.8.0 + Version bump. + Stefan Gronewold + groni@pisilinux.org + 2016-12-24 1.7.1