gpg4libre: update gpgme, libassuan and libgpg-error

seen upstream & removed here:

- external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch
- external/gpgmepp/version.patch
- external/libgpg-error/clang-cl.patch
- external/libgpg-error/libgpg-error_gawk5.patch

Change-Id: Iea2b681fa839ae55cb954c2ad3edf4291b149dbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/61322
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

3 files changed, 28 insertions, 49 deletions

diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk
index 955dddd3c7ae..7a08028adbdd 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.1))
+$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.3))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/libassuan/fix-autoconf-macros.patch b/external/libassuan/fix-autoconf-macros.patch
index 4a2d035b5cc7..743ca460ba9d 100644
--- a/external/libassuan/fix-autoconf-macros.patch
+++ b/external/libassuan/fix-autoconf-macros.patch
@@ -1,23 +1,8 @@
 diff -ur libassuan.org/configure.ac libassuan/configure.ac
 --- configure.ac	2017-02-16 18:32:51.549527554 +0100
 +++ configure.ac~	2017-02-16 18:32:59.893497890 +0100
-@@ -44,6 +44,14 @@
- # the decimalized short revision number, a beta version string and a
- # flag indicating a development version (mym4_isbeta).  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_argn],
-+[m4_assert([0 < $1])]dnl
-+[m4_pushdef([_$0], [_m4_popdef([_$0])]m4_dquote([$]m4_incr([$1])))_$0($@)])
-+m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))])
- m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \
-                            mym4_package mym4_major mym4_minor mym4_micro),[:]))
- m4_define([mym4_isbeta],       m4_argn(2, mym4_verslist))
 @@ -75,7 +80,22 @@
- VERSION=$PACKAGE_VERSION
+ AC_SUBST(LIBASSUAN_LT_REVISION)
  
  AC_CONFIG_AUX_DIR([build-aux])
 -AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
@@ -40,17 +25,3 @@ diff -ur libassuan.org/configure.ac libassuan/configure.ac
  AM_MAINTAINER_MODE
  AC_CONFIG_SRCDIR(src/assuan.h.in)
  AC_CONFIG_MACRO_DIR(m4)
-@@ -475,10 +475,12 @@
-               [Defined if LOCAL_PEEREID is supported (NetBSD specific)])
-   else
-     # (Open)Solaris
--    AC_CHECK_FUNCS([getpeerucred], AC_CHECK_HEADERS([ucred.h]))
-+    AC_CHECK_FUNCS([getpeerucred])
-     if test $ac_cv_func_getpeerucred != yes; then
-         # FreeBSD
-         AC_CHECK_FUNCS([getpeereid])
-+    else
-+        AC_CHECK_HEADERS([ucred.h])
-     fi
-   fi
- fi
diff --git a/external/libassuan/w32-build-fixes.patch.1 b/external/libassuan/w32-build-fixes.patch.1
index b0dbbf841a24..cac6ea1045bc 100644
--- a/external/libassuan/w32-build-fixes.patch.1
+++ b/external/libassuan/w32-build-fixes.patch.1
@@ -1,14 +1,3 @@
---- libassuan/src/Makefile.am
-+++ libassuan/src/Makefile.am
-@@ -81,7 +81,7 @@
- 
- if HAVE_W32_SYSTEM
- 
--LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
-+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
-      `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
-      sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
- 
 --- libassuan.orig/src/mkheader.c	2013-03-15 20:26:09.000000000 +0100
 +++ libassuan/src/mkheader.c	2017-09-24 14:17:33.584583300 +0200
 @@ -99,7 +99,7 @@
@@ -20,24 +9,43 @@
      }
    else if (!strcmp (tag, "include:types"))
      {
+diff -ru libassuan.orig/src/Makefile.in libassuan/src/Makefile.in
+--- libassuan.orig/src/Makefile.in	2020-06-10 17:26:08.699728800 +0200
++++ libassuan/src/Makefile.in	2020-06-10 17:22:11.066865300 +0200
+@@ -462,7 +462,7 @@
+ 	assuan-pipe-connect.c assuan-socket-connect.c assuan-uds.c \
+ 	assuan-logging.c assuan-socket.c $(am__append_2) \
+ 	$(am__append_3) $(am__append_4)
++@HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
+-@HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
+ @HAVE_W32_SYSTEM_TRUE@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ @HAVE_W32_SYSTEM_TRUE@     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
+ 
 diff -ru libassuan.orig/src/Makefile.am libassuan/src/Makefile.am
 --- libassuan.orig/src/Makefile.am	2017-09-24 14:20:05.906065400 +0200
 +++ libassuan/src/Makefile.am	2017-09-24 14:40:59.038850200 +0200
-@@ -142,11 +142,11 @@
+@@ -87,7 +87,7 @@
+ 
+ if HAVE_W32_SYSTEM
+ 
++LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
+-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
+      `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+      sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
+ 
+@@ -148,9 +148,9 @@
                $(DESTDIR)$(bindir)/gpgcedev.dll
  endif
  
--mkheader: mkheader.c Makefile
 +mkheader$(EXEEXT): mkheader.c Makefile
+-mkheader: mkheader.c Makefile
  	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
  
--assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
--	./mkheader $(host_os) $(srcdir)/assuan.h.in \
 +assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
 +	./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \
-                    @VERSION@ @VERSION_NUMBER@ >$@
- 
- 
+-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
+-	./mkheader $(host_os) $(srcdir)/assuan.h.in \
+                    $(PACKAGE_VERSION) $(VERSION_NUMBER) >$@
 diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c
 --- libassuan.orig/src/assuan-handler.c 2016-06-25 16:27:49.000000000 +0200
 +++ libassuan/src/assuan-handler.c      2017-09-24 15:32:51.200956200 +0200