diff options
| author | Danny Rawlins <monster.romster@gmail.com> | 2016-12-15 12:57:52 +1100 |
|---|---|---|
| committer | Danny Rawlins <monster.romster@gmail.com> | 2016-12-15 12:57:52 +1100 |
| commit | 03e614f483f5db2615ae43c115d9bccdb25cca62 (patch) | |
| tree | 2f8684f65ce6885ea8e708661ac206fdcb6c2a6d | |
| parent | 7546d1f7e363da96c63072c149a0dd6e0dffd1b4 (diff) | |
| download | contrib-03e614f483f5db2615ae43c115d9bccdb25cca62.tar.gz contrib-03e614f483f5db2615ae43c115d9bccdb25cca62.tar.xz | |
gpgme: fix cmake
| -rw-r--r-- | gpgme/.md5sum | 2 | ||||
| -rw-r--r-- | gpgme/Pkgfile | 15 | ||||
| -rw-r--r-- | gpgme/gpgme-1.1.8-et_EE.patch | 11 | ||||
| -rw-r--r-- | gpgme/gpgme-1.8.0-cmake.patch | 33 |
4 files changed, 55 insertions, 6 deletions
diff --git a/gpgme/.md5sum b/gpgme/.md5sum index 1c5846d17..889033597 100644 --- a/gpgme/.md5sum +++ b/gpgme/.md5sum @@ -1 +1,3 @@ +34078cb2ce4b6e9e89c3cd444556826e gpgme-1.1.8-et_EE.patch +e7f9eec6d2dde8d9cf03cd8596a1f6aa gpgme-1.8.0-cmake.patch 722a4153904b9b5dc15485a22d29263b gpgme-1.8.0.tar.bz2 diff --git a/gpgme/Pkgfile b/gpgme/Pkgfile index 390353b66..1340df664 100644 --- a/gpgme/Pkgfile +++ b/gpgme/Pkgfile @@ -6,20 +6,23 @@ name=gpgme version=1.8.0 -release=1 -source=(https://www.gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2) +release=2 +source=(https://www.gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2 + gpgme-1.1.8-et_EE.patch + gpgme-1.8.0-cmake.patch) build() { cd $name-$version + patch -p1 -i $SRC/gpgme-1.1.8-et_EE.patch + patch -p1 -i $SRC/gpgme-1.8.0-cmake.patch + ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib \ - --with-gpg=/usr/bin/gpg \ - --with-pth=yes + --libexecdir=/usr/lib make - make tests make DESTDIR=$PKG install + rm -r $PKG/usr/share/info } diff --git a/gpgme/gpgme-1.1.8-et_EE.patch b/gpgme/gpgme-1.1.8-et_EE.patch new file mode 100644 index 000000000..293debb5b --- /dev/null +++ b/gpgme/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/gpgme/gpgme-1.8.0-cmake.patch b/gpgme/gpgme-1.8.0-cmake.patch new file mode 100644 index 000000000..09775b868 --- /dev/null +++ b/gpgme/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 + |