From e9f2859bd1c6cdd9ba55dd956058880f5f064ef4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 21 Sep 2017 20:57:39 +0200 Subject: [PATCH] gpgme: bump version. --- ...{gpgme-1.6.0.recipe => gpgme-1.9.0.recipe} | 45 ++++--- app-crypt/gpgme/patches/gpgme-1.6.0.patchset | 114 ------------------ app-crypt/gpgme/patches/gpgme-1.9.0.patchset | 24 ++++ 3 files changed, 46 insertions(+), 137 deletions(-) rename app-crypt/gpgme/{gpgme-1.6.0.recipe => gpgme-1.9.0.recipe} (77%) delete mode 100644 app-crypt/gpgme/patches/gpgme-1.6.0.patchset create mode 100644 app-crypt/gpgme/patches/gpgme-1.9.0.patchset diff --git a/app-crypt/gpgme/gpgme-1.6.0.recipe b/app-crypt/gpgme/gpgme-1.9.0.recipe similarity index 77% rename from app-crypt/gpgme/gpgme-1.6.0.recipe rename to app-crypt/gpgme/gpgme-1.9.0.recipe index 31a830b71..70386139c 100644 --- a/app-crypt/gpgme/gpgme-1.6.0.recipe +++ b/app-crypt/gpgme/gpgme-1.9.0.recipe @@ -7,17 +7,18 @@ 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" -SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$portVersion.tar.bz2" -CHECKSUM_SHA256="b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d" -REVISION="2" -LICENSE=" - GNU GPL v2 - GNU LGPL v2.1 - " COPYRIGHT=" 1998-2010 Free Software Foundation, Inc. 2001-2010 g10 Code GmbH " +LICENSE=" + GNU GPL v2 + GNU LGPL v2.1 + " +REVISION="1" +SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$portVersion.tar.bz2" +CHECKSUM_SHA256="1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb" +PATCHES="gpgme-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -26,8 +27,8 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" gpgme${secondaryArchSuffix} = $portVersion compat >= 1.5 cmd:gpgme_tool${secondaryArchSuffix} = $portVersion compat >= 1.5 - lib:libgpgme_pthread${secondaryArchSuffix} = 11.14.0 compat >= 11 - lib:libgpgme${secondaryArchSuffix} = 11.14.0 compat >= 11 + lib:libgpgme${secondaryArchSuffix} = 11.18.0 compat >= 11 + lib:libgpgmepp${secondaryArchSuffix} = 6.4.0 compat >= 6 " REQUIRES=" haiku${secondaryArchSuffix} @@ -36,6 +37,17 @@ REQUIRES=" lib:libglib_2.0$secondaryArchSuffix lib:libassuan${secondaryArchSuffix} " + +PROVIDES_devel=" + gpgme${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 + cmd:gpgme_config${secondaryArchSuffix} = $portVersion compat >= 1.5 + devel:libgpgme${secondaryArchSuffix} = 11.18.0 compat >= 11 + devel:libgpgmepp${secondaryArchSuffix} = 6.4.0 compat >= 6 + " +REQUIRES_devel=" + gpgme${secondaryArchSuffix} == $portVersion base + " + BUILD_REQUIRES=" devel:libgpg_error${secondaryArchSuffix} devel:libglib_2.0$secondaryArchSuffix @@ -58,7 +70,6 @@ BUILD_PREREQUIRES=" cmd:perl cmd:tar " -PATCHES="gpgme-$portVersion.patchset" BUILD() { @@ -74,7 +85,7 @@ INSTALL() # remove libtool files rm $libDir/lib*.la - prepareInstalledDevelLibs libgpgme libgpgme-pthread + prepareInstalledDevelLibs libgpgme libgpgmepp packageEntries devel \ $developDir $binDir/gpgme-config @@ -84,15 +95,3 @@ TEST() { make check } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - gpgme${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 - cmd:gpgme_config${secondaryArchSuffix} = $portVersion compat >= 1.5 - devel:libgpgme_pthread${secondaryArchSuffix} = 11.14.0 compat >= 11 - devel:libgpgme${secondaryArchSuffix} = 11.14.0 compat >= 11 - " -REQUIRES_devel=" - gpgme${secondaryArchSuffix} == $portVersion base - " diff --git a/app-crypt/gpgme/patches/gpgme-1.6.0.patchset b/app-crypt/gpgme/patches/gpgme-1.6.0.patchset deleted file mode 100644 index de05199d4..000000000 --- a/app-crypt/gpgme/patches/gpgme-1.6.0.patchset +++ /dev/null @@ -1,114 +0,0 @@ -From 175ab125d4272580957fd804a68a21176ca6d5f3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Sun, 16 Nov 2014 14:50:17 +0100 -Subject: configure.ac: Haiku does have a thread-safe getenv - -Also force HAVE_PTHREAD. - -diff --git a/configure.ac b/configure.ac -index 7f03170..4a25f68 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,6 +139,7 @@ GPG_DEFAULT=no - GPGSM_DEFAULT=no - GPGCONF_DEFAULT=no - G13_DEFAULT=no -+PTHREAD_LIBS="" - component_system=None - have_dosish_system=no - have_android_system=no -@@ -184,11 +185,16 @@ case "${host}" in - AC_HELP_STRING([--enable-w32-qt], [build GPGME Qt for W32]), - build_w32_qt=$enableval) - ;; -+ *-haiku*) -+ have_thread_safe_getenv=yes -+ # Haiku has it in libroot -+ AC_CHECK_FUNC(pthread_create,have_pthread=yes) -+ ;; - *) -- AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes) -- if test "$have_pthread" = yes; then -- AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.]) -- fi -+ save_LIBS="$LIBS" -+ AC_SEARCH_LIBS(pthread_create,pthread,have_pthread=yes) -+ PTHREAD_LIBS="$LIBS" -+ LIBS="$save_LIBS" - - # XXX: Probably use exec-prefix here? - # GPG_DEFAULT='/usr/bin/gpg' -@@ -198,6 +204,11 @@ case "${host}" in - ;; - esac - -+if test "$have_pthread" = yes; then -+ AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.]) -+fi -+AC_SUBST(PTHREAD_LIBS) -+ - if test "$have_dosish_system" = yes; then - AC_DEFINE(HAVE_DOSISH_SYSTEM,1, - [Defined if we run on some of the PCDOS like systems --- -1.8.3.4 - - -From 1a7ff2570cc9ed13ac5b94131c44a91b74d7396e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Wed, 19 Nov 2014 21:52:09 +0100 -Subject: Makefile.am: replace hardcoded -lpthread by an AC_SUBST - - -diff --git a/src/Makefile.am b/src/Makefile.am -index 58922f9..c11cbc5 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -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@ \ -- -lpthread @GPG_ERROR_LIBS@ -+ @PTHREAD_LIBS@ @GPG_ERROR_LIBS@ - - if BUILD_W32_GLIB - libgpgme_glib_la_LDFLAGS = \ -diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am -index 107397b..6575578 100644 ---- a/tests/gpg/Makefile.am -+++ b/tests/gpg/Makefile.am -@@ -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@ - - # We don't run t-genkey in the test suite, because it takes too long - noinst_PROGRAMS = $(c_tests) t-genkey --- -1.8.3.4 - - -From 34d501197541ba7a37d385e064e1f3562546c13a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Wed, 26 Nov 2014 02:24:03 +0100 -Subject: gpgme-config.in: replace hardcoded -lpthread by an AC_SUBST - - -diff --git a/src/gpgme-config.in b/src/gpgme-config.in -index 4be1e08..bf83deb 100644 ---- a/src/gpgme-config.in -+++ b/src/gpgme-config.in -@@ -33,7 +33,7 @@ gpg_error_libs="@GPG_ERROR_LIBS@" - thread_modules="" - - @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread" --libs_pthread="-lpthread" -+libs_pthread="@PTHREAD_LIBS@" - cflags_pthread="" - - # Configure glib. --- -1.8.3.4 - diff --git a/app-crypt/gpgme/patches/gpgme-1.9.0.patchset b/app-crypt/gpgme/patches/gpgme-1.9.0.patchset new file mode 100644 index 000000000..82b4eb559 --- /dev/null +++ b/app-crypt/gpgme/patches/gpgme-1.9.0.patchset @@ -0,0 +1,24 @@ +From 54b2d7cab751b041efbc6dfe3c6f2d1ea86a35a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Sun, 16 Nov 2014 14:50:17 +0100 +Subject: configure.ac: Haiku does have a thread-safe getenv + +Also force HAVE_PTHREAD. + +diff --git a/configure.ac b/configure.ac +index 0dac6ce..c1e7477 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -218,6 +218,9 @@ case "${host}" in + AC_HELP_STRING([--enable-w32-glib], [build GPGME Glib for W32]), + build_w32_glib=$enableval) + ;; ++ *-haiku*) ++ have_thread_safe_getenv=yes ++ ;; + *) + + # XXX: Probably use exec-prefix here? +-- +2.13.1 +