gpgme: bump version.

This commit is contained in:
Jerome Duval
2015-06-10 17:41:48 +00:00
parent 1eb7d38399
commit 45a0e9c9f0
2 changed files with 12 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
From ad2ffee0a05c84e3cfcfe37ed80405c604239b82 Mon Sep 17 00:00:00 2001
From 175ab125d4272580957fd804a68a21176ca6d5f3 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: configure.ac: Haiku does have a thread-safe getenv
@@ -6,7 +6,7 @@ Subject: configure.ac: Haiku does have a thread-safe getenv
Also force HAVE_PTHREAD.
diff --git a/configure.ac b/configure.ac
index 298a22b..fde3200 100644
index 7f03170..4a25f68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@ GPG_DEFAULT=no
@@ -54,7 +54,7 @@ index 298a22b..fde3200 100644
1.8.3.4
From 77041cb8f42c3052000ab6c264747726f6cff431 Mon Sep 17 00:00:00 2001
From 1a7ff2570cc9ed13ac5b94131c44a91b74d7396e 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: Makefile.am: replace hardcoded -lpthread by an AC_SUBST
@@ -74,12 +74,12 @@ index 58922f9..c11cbc5 100644
if BUILD_W32_GLIB
libgpgme_glib_la_LDFLAGS = \
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 5f40dfe..595f729 100644
index 107397b..6575578 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -59,7 +59,7 @@ EXTRA_DIST = start-stop-agent initial.test final.test \
@@ -61,7 +61,7 @@ EXTRA_DIST = initial.test final.test \
AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
AM_LDFLAGS = -no-install
LDADD = ../../src/libgpgme.la
-t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
+t_thread1_LDADD = ../../src/libgpgme-pthread.la @PTHREAD_LIBS@
@@ -90,7 +90,7 @@ index 5f40dfe..595f729 100644
1.8.3.4
From f0333beb0cc6343a4a837420fa28a358f1d6040b Mon Sep 17 00:00:00 2001
From 34d501197541ba7a37d385e064e1f3562546c13a 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: gpgme-config.in: replace hardcoded -lpthread by an AC_SUBST