diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-crypt/gpgme/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'app-crypt/gpgme/files')
-rw-r--r-- | app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch | 11 | ||||
-rw-r--r-- | app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch | 33 | ||||
-rw-r--r-- | app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch | 16 |
3 files changed, 60 insertions, 0 deletions
diff --git a/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch new file mode 100644 index 000000000000..293debb5b91d --- /dev/null +++ b/app-crypt/gpgme/files/gpgme-1.1.8-et_EE.patch @@ -0,0 +1,11 @@ +--- gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:25:48.000000000 +1100 ++++ gpgme-1.1.8/src/gpgme-config.in 2009-03-08 10:35:53.000000000 +1100 +@@ -64,7 +64,7 @@ + while test $# -gt 0; do + case "$1" in + -*=*) +- optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ++ optarg=`echo "$1" | sed 's/[-_[:alnum:]]*=//'` + ;; + *) + optarg= diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch new file mode 100644 index 000000000000..09775b868eb6 --- /dev/null +++ b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch @@ -0,0 +1,33 @@ +From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@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@. +-- + +b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from +cmake config files, but missed one instance. + +Signed-off-by: Heiko Becker <heirecka@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@libsuffix@;@LIBASSUAN_LIBS@" ++ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" + IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" + ) + +-- +2.8.0.rc3 + diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch new file mode 100644 index 000000000000..9dd3e85cbfb7 --- /dev/null +++ b/app-crypt/gpgme/files/gpgme-1.8.0-gcc-7.patch @@ -0,0 +1,16 @@ +diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp +index eb3af56..af47594 100644 +--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp ++++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp +@@ -51,2 +51,3 @@ + #include <cassert> ++#include <functional> /* std::mem_fn */ + +diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h +index 32b23db..c4f85c2 100644 +--- a/lang/qt/src/threadedjobmixin.h ++++ b/lang/qt/src/threadedjobmixin.h +@@ -53,2 +53,3 @@ + #include <cassert> ++#include <functional> /* std::function */ + |