gpgme: bump version

This commit is contained in:
Jerome Duval
2015-05-06 19:46:09 +00:00
parent f5b8470dfa
commit f293143eb2
2 changed files with 26 additions and 41 deletions

View File

@@ -7,9 +7,9 @@ Currently it uses GnuPG as its backend but the API isn't restricted to \
this engine; in fact we have already developed a backend for CMS (S/MIME).
"
HOMEPAGE="http://www.gnupg.org/gpgme.html"
SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.5.2.tar.bz2"
CHECKSUM_SHA256="1e98b0a0a16f0265e8ebe72ef11acd2272322f682188d3e5098770e7f204f1d4"
REVISION="2"
SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$portVersion.tar.bz2"
CHECKSUM_SHA256="bb38c0ec8815c9e94e6047b484984808a8dad9d6bec8df33dc5339fd55ffea6c"
REVISION="1"
LICENSE="
GNU GPL v2
GNU LGPL v2.1
@@ -19,15 +19,15 @@ COPYRIGHT="
2001-2010 g10 Code GmbH
"
ARCHITECTURES="x86_gcc2 x86 ?x86 ?x86_64"
ARCHITECTURES="x86_gcc2 x86 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
#TODO: fix gpgme-config hardcoded package paths
PROVIDES="
gpgme${secondaryArchSuffix} = $portVersion compat >= 1.5
cmd:gpgme_tool${secondaryArchSuffix} = $portVersion compat >= 1.5
lib:libgpgme_pthread${secondaryArchSuffix} = 11.13.1 compat >= 11
lib:libgpgme${secondaryArchSuffix} = 11.13.1 compat >= 11
lib:libgpgme_pthread${secondaryArchSuffix} = 11.13.3 compat >= 11
lib:libgpgme${secondaryArchSuffix} = 11.13.3 compat >= 11
"
REQUIRES="
haiku${secondaryArchSuffix}
@@ -58,15 +58,11 @@ BUILD_PREREQUIRES="
cmd:perl
cmd:tar
"
PATCHES="gpgme-1.5.2.patchset"
PATCHES="gpgme-$portVersion.patchset"
BUILD()
{
#libtoolize --force --copy --install
aclocal
automake --add-missing
./autogen.sh
#autoconf
autoreconf -fi
runConfigure ./configure
make $jobArgs
}
@@ -106,8 +102,8 @@ TEST()
PROVIDES_devel="
gpgme${secondaryArchSuffix}_devel = $portVersion compat >= 1.5
cmd:gpgme_config${secondaryArchSuffix} = $portVersion compat >= 1.5
devel:libgpgme_pthread${secondaryArchSuffix} = 11.13.1 compat >= 11
devel:libgpgme${secondaryArchSuffix} = 11.13.1 compat >= 11
devel:libgpgme_pthread${secondaryArchSuffix} = 11.13.3 compat >= 11
devel:libgpgme${secondaryArchSuffix} = 11.13.3 compat >= 11
"
REQUIRES_devel="
gpgme${secondaryArchSuffix} == $portVersion base

View File

@@ -1,18 +1,15 @@
From ce6d32b33fa2385e4627239a10c12ac7d18a66c5 Mon Sep 17 00:00:00 2001
From ad2ffee0a05c84e3cfcfe37ed80405c604239b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 16 Nov 2014 14:50:17 +0100
Subject: [PATCH 1/3] configure.ac: Haiku does have a thread-safe getenv
Subject: configure.ac: Haiku does have a thread-safe getenv
Also force HAVE_PTHREAD.
---
configure.ac | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0ffe847..0f33189 100644
index 298a22b..fde3200 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,7 @@ GPG_DEFAULT=no
@@ -139,6 +139,7 @@ GPG_DEFAULT=no
GPGSM_DEFAULT=no
GPGCONF_DEFAULT=no
G13_DEFAULT=no
@@ -20,7 +17,7 @@ index 0ffe847..0f33189 100644
component_system=None
have_dosish_system=no
have_android_system=no
@@ -186,11 +187,16 @@ case "${host}" in
@@ -184,11 +185,16 @@ case "${host}" in
AC_HELP_STRING([--enable-w32-qt], [build GPGME Qt for W32]),
build_w32_qt=$enableval)
;;
@@ -41,7 +38,7 @@ index 0ffe847..0f33189 100644
# XXX: Probably use exec-prefix here?
# GPG_DEFAULT='/usr/bin/gpg'
@@ -200,6 +206,11 @@ case "${host}" in
@@ -198,6 +204,11 @@ case "${host}" in
;;
esac
@@ -57,21 +54,17 @@ index 0ffe847..0f33189 100644
1.8.3.4
From 24a23b475810c5a5fba58f3d6615b2811cf07392 Mon Sep 17 00:00:00 2001
From 77041cb8f42c3052000ab6c264747726f6cff431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Wed, 19 Nov 2014 21:52:09 +0100
Subject: [PATCH 2/3] Makefile.am: replace hardcoded -lpthread by an AC_SUBST
Subject: Makefile.am: replace hardcoded -lpthread by an AC_SUBST
---
src/Makefile.am | 2 +-
tests/gpg/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index b7ddbc1..5ac20de 100644
index 58922f9..c11cbc5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -185,7 +185,7 @@ libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \
@@ -188,7 +188,7 @@ libgpgme_pthread_la_LDFLAGS = \
@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
@@ -79,14 +72,14 @@ index b7ddbc1..5ac20de 100644
+ @PTHREAD_LIBS@ @GPG_ERROR_LIBS@
if BUILD_W32_GLIB
libgpgme_glib_la_LDFLAGS = $(no_undefined) \
libgpgme_glib_la_LDFLAGS = \
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 5c1266e..5261da2 100644
index 5f40dfe..595f729 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -61,7 +61,7 @@ INCLUDES = -I$(top_builddir)/src
@@ -59,7 +59,7 @@ EXTRA_DIST = start-stop-agent initial.test final.test \
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
LDADD = ../../src/libgpgme.la
-t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
+t_thread1_LDADD = ../../src/libgpgme-pthread.la @PTHREAD_LIBS@
@@ -97,15 +90,11 @@ index 5c1266e..5261da2 100644
1.8.3.4
From 82e7a0cfbfea15ffee496882e5fd3cf93325a948 Mon Sep 17 00:00:00 2001
From f0333beb0cc6343a4a837420fa28a358f1d6040b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Wed, 26 Nov 2014 02:24:03 +0100
Subject: [PATCH 3/3] gpgme-config.in: replace hardcoded -lpthread by an
AC_SUBST
Subject: gpgme-config.in: replace hardcoded -lpthread by an AC_SUBST
---
src/gpgme-config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gpgme-config.in b/src/gpgme-config.in
index 4be1e08..bf83deb 100644