gpg4libre: update libgpg-error and gpgme to latest

* libgpg-error has some fixes around autogen & win32 critical sects
* gpgme has a few nice additions around keyinfos
* update lib versions to deliver
* remove external/libgpg-error/fix-autoconf-macros.patch -> this is
upstream now

Change-Id: I5a58ac15a485621c54ca1c7a768268e8a541256c
Reviewed-on: https://gerrit.libreoffice.org/37926
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

3 files changed, 1 insertions, 41 deletions

diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index ba6e8c67f754..f23c8998819d 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,libgpg-error,libgpg-error)
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
-$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.so.0,src/.libs/libgpg-error.so.0.21.0))
+$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.so.0,src/.libs/libgpg-error.so.0.22.0))
 
 endif # $(DISABLE_DYNLOADING)
 
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 4606e80e860c..8ac6cf77a560 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libgpg-error,$(LIBGPGERROR_TARBALL)
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
-    external/libgpg-error/fix-autoconf-macros.patch \
     external/libgpg-error/disable-rpath-option.patch \
 ))
 
diff --git a/external/libgpg-error/fix-autoconf-macros.patch b/external/libgpg-error/fix-autoconf-macros.patch
deleted file mode 100644
index ba3246124b12..000000000000
--- a/external/libgpg-error/fix-autoconf-macros.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur libgpg-error.org/configure.ac libgpg-error/configure.ac
---- configure.ac	2017-02-16 18:43:50.697941033 +0100
-+++ configure.ac~	2017-02-16 18:44:07.085881259 +0100
-@@ -33,6 +33,11 @@
- # decimalized short revision number, a beta version string, and a flag
- # indicating a development version (mym4_isgit). Note that the m4
- # processing is done by autoconf and not during the configure run.
-+m4_define([m4_chomp_all],
-+[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [
-+/], [/ ]), [/*$]), [$1])])
-+
-+m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))])
- m4_define([mym4_version], [mym4_version_major.mym4_version_minor])
- m4_define([mym4_revision],
-           m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
-@@ -65,7 +70,22 @@
- AC_SUBST(VERSION_NUMBER)
- 
- AC_CONFIG_AUX_DIR([build-aux])
--AM_INIT_AUTOMAKE([serial-tests dist-bzip2])
-+
-+dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
-+dnl gives an error if it sees this, but for automake >= 1.13
-+dnl serial-tests is required so we have to include it.  Solution is to
-+dnl test for the version of automake (by running an external command)
-+dnl and provide it if necessary.  Note we have to do this entirely using
-+dnl m4 macros since automake queries this macro by running
-+dnl 'autoconf --trace ...'.
-+m4_define([serial_tests], [
-+    m4_esyscmd([automake --version |
-+                head -1 |
-+                awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}'
-+    ])
-+])
-+AM_INIT_AUTOMAKE(foreign serial_tests dist-bzip2) dnl NB: Do not [quote] this parameter.
-+
- AM_MAINTAINER_MODE
- AC_CONFIG_SRCDIR([src/err-sources.h.in])
- AC_CONFIG_HEADER([config.h])