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>

8 files changed, 164 insertions, 244 deletions

diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index 3afd218eef9e..1d9c016e09df 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.22.0))
+$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.28.0))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 485dc7374445..af74bb1d07c3 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -13,16 +13,13 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libgpg-error,$(LIBGPGERROR_TARBALL)
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
 
-# clang-cl.patch src/gpgrt-int.h part upstream at <https://dev.gnupg.org/T4356> "Declaration of
-#  _gpgrt_functions_w32_pollable in src/gpgrt-int.h should be extern"
 $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
-	external/libgpg-error/libgpg-error_gawk5.patch \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-3.patch.1) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \
 	external/libgpg-error/w32-build-fixes-4.patch \
-	external/libgpg-error/clang-cl.patch \
+	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-5.patch) \
 	$(if $(filter LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \
 ))
 
diff --git a/external/libgpg-error/clang-cl.patch b/external/libgpg-error/clang-cl.patch
deleted file mode 100644
index ef1447fb61d9..000000000000
--- a/external/libgpg-error/clang-cl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/gpg-error.h.in
-+++ src/gpg-error.h.in
-@@ -141,7 +141,7 @@
- 
- 
- /* GCC feature test.  */
--#if __GNUC__
-+#if defined __GNUC__
- # define _GPG_ERR_GCC_VERSION (__GNUC__ * 10000 \
-                                + __GNUC_MINOR__ * 100 \
-                                + __GNUC_PATCHLEVEL__)
---- src/gpgrt-int.h
-+++ src/gpgrt-int.h
-@@ -359,7 +359,7 @@
- 
- #if _WIN32
- /* Prototypes for w32-estream.c.  */
--struct cookie_io_functions_s _gpgrt_functions_w32_pollable;
-+extern struct cookie_io_functions_s _gpgrt_functions_w32_pollable;
- int _gpgrt_w32_pollable_create (void *_GPGRT__RESTRICT *_GPGRT__RESTRICT cookie,
-                                 unsigned int modeflags,
-                                 struct cookie_io_functions_s next_functions,
diff --git a/external/libgpg-error/libgpg-error_gawk5.patch b/external/libgpg-error/libgpg-error_gawk5.patch
deleted file mode 100644
index 3be76a4538a8..000000000000
--- a/external/libgpg-error/libgpg-error_gawk5.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- src/Makefile.am
-+++ src/Makefile.am~
-@@ -266,7 +266,7 @@
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
--		-v prefix=GPG_ERR_ -v namespace=errnos_ \
-+		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
- 		$(srcdir)/errnos.in >$@
- 
- 
---- src/mkerrcodes.awk
-+++ src/mkerrcodes.awk~
-@@ -81,7 +81,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- src/mkerrcodes1.awk
-+++ src/mkerrcodes1.awk~
-@@ -81,7 +81,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- src/mkerrcodes2.awk
-+++ src/mkerrcodes2.awk~
-@@ -91,7 +91,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- src/mkerrnos.awk
-+++ src/mkerrnos.awk~
-@@ -83,7 +83,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
---- src/mkstrtable.awk
-+++ src/mkstrtable.awk~
-@@ -77,7 +77,7 @@
- #
- # The variable prefix can be used to prepend a string to each message.
- #
--# The variable namespace can be used to prepend a string to each
-+# The variable pkg_namespace can be used to prepend a string to each
- # variable and macro name.
- 
- BEGIN {
-@@ -102,7 +102,7 @@
-       print "/* The purpose of this complex string table is to produce";
-       print "   optimal code with a minimum of relocations.  */";
-       print "";
--      print "static const char " namespace "msgstr[] = ";
-+      print "static const char " pkg_namespace "msgstr[] = ";
-       header = 0;
-     }
-   else
-@@ -110,7 +110,7 @@
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-@@ -150,7 +150,7 @@
-   else
-     print "  gettext_noop (\"" last_msgstr "\");";
-   print "";
--  print "static const int " namespace "msgidx[] =";
-+  print "static const int " pkg_namespace "msgidx[] =";
-   print "  {";
-   for (i = 0; i < coded_msgs; i++)
-     print "    " pos[i] ",";
-@@ -158,7 +158,7 @@
-   print "  };";
-   print "";
-   print "static GPG_ERR_INLINE int";
--  print namespace "msgidxof (int code)";
-+  print pkg_namespace "msgidxof (int code)";
-   print "{";
-   print "  return (0 ? 0";
- 
---- src/Makefile.in
-+++ src/Makefile.in~
-@@ -1321,7 +1321,7 @@
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
--		-v prefix=GPG_ERR_ -v namespace=errnos_ \
-+		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
- 		$(srcdir)/errnos.in >$@
- 
- mkheader: mkheader.c Makefile
- 
diff --git a/external/libgpg-error/libgpgerror-bundled-soname.patch.1 b/external/libgpg-error/libgpgerror-bundled-soname.patch.1
index 4f927def368a..6b5c47b4cf1d 100644
--- a/external/libgpg-error/libgpgerror-bundled-soname.patch.1
+++ b/external/libgpg-error/libgpgerror-bundled-soname.patch.1
@@ -3,7 +3,7 @@
 @@ -540,7 +540,7 @@
  @HAVE_LD_VERSION_SCRIPT_TRUE@libgpg_error_vers_opt = -Wl,--version-script=$(srcdir)/gpg-error.vers
  libgpg_error_la_LDFLAGS = \
-   $(no_undefined) $(export_symbols) $(libgpg_error_vers_opt) \
+   -no-undefined $(export_symbols) $(libgpg_error_vers_opt) \
 -  $(extra_ltoptions) -version-info \
 +  $(extra_ltoptions) -release lo -version-info \
    @LIBGPG_ERROR_LT_CURRENT@:@LIBGPG_ERROR_LT_REVISION@:@LIBGPG_ERROR_LT_AGE@
diff --git a/external/libgpg-error/w32-build-fixes-2.patch.1 b/external/libgpg-error/w32-build-fixes-2.patch.1
index 3d9c4324a89c..0f8a8b36ef1c 100644
--- a/external/libgpg-error/w32-build-fixes-2.patch.1
+++ b/external/libgpg-error/w32-build-fixes-2.patch.1
@@ -3,7 +3,7 @@ diff -ru libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in
 +++ libgpg-error/src/Makefile.in	2017-09-12 08:57:11.648083800 +0200
 @@ -512,8 +512,7 @@
  @HAVE_W32_SYSTEM_TRUE@arch_sources = w32-gettext.c w32-lock.c w32-lock-obj.h w32-thread.c \
- @HAVE_W32_SYSTEM_TRUE@	       w32-iconv.c w32-estream.c
+ @HAVE_W32_SYSTEM_TRUE@	       w32-iconv.c w32-estream.c w32-reg.c spawn-w32.c
  
 -@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 -@HAVE_W32_SYSTEM_TRUE@            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
diff --git a/external/libgpg-error/w32-build-fixes-5.patch b/external/libgpg-error/w32-build-fixes-5.patch
new file mode 100644
index 000000000000..2633df9ee6c9
--- /dev/null
+++ b/external/libgpg-error/w32-build-fixes-5.patch
@@ -0,0 +1,144 @@
+--- src/gpg-error.c	2020-06-06 00:18:40.199791000 +0200
++++ src/gpg-error.c~	2020-06-05 18:44:14.223182300 +0200
+@@ -61,6 +61,11 @@
+ #define drop_locale_dir(dir)
+ #endif
+ 
++#ifdef _WIN32
++# define strncasecmp _strnicmp
++# define strcasecmp _stricmp
++#endif
++
+ static void
+ i18n_init (void)
+ {
+--- src/logging.c	2020-06-05 18:58:59.254413200 +0200
++++ src/logging.c~	2019-12-12 15:23:37.000000000 +0100
+@@ -44,7 +44,11 @@
+ # include <netinet/in.h>
+ # include <arpa/inet.h>
+ #endif /*!HAVE_W32_SYSTEM*/
++#ifdef _WIN32
++# include <io.h>
++#else
++# include <unistd.h>
++#endif
+-#include <unistd.h>
+ #include <fcntl.h>
+ /* #include <execinfo.h> */
+ 
+@@ -57,6 +53,15 @@
+ 
+ 
+ #ifdef HAVE_W32_SYSTEM
++# ifndef  S_IRUSR
++#  define S_IRUSR _S_IREAD
++# endif
++# ifndef  S_IWUSR
++#  define S_IWUSR _S_IWRITE
++# endif
++# ifndef  S_IXUSR
++#  define S_IXUSR 0x00400000
++# endif
+ # ifndef S_IRWXG
+ #  define S_IRGRP S_IRUSR
+ #  define S_IWGRP S_IWUSR
+--- src/Makefile.am	2020-06-06 01:01:31.931459300 +0200
++++ src/Makefile.am~	2020-02-06 18:39:06.000000000 +0100
+@@ -213,7 +213,7 @@
+ # without the extra_cppflags because they may include am -idirafter
+ # which is not supported by the RC compiler.
+ libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
++libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(LIBTHREAD)
+-libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD)
+ 
+ gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
+ gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
+--- src/Makefile.in	2020-06-06 01:01:31.931459300 +0200
++++ src/Makefile.in~	2020-02-06 18:39:06.000000000 +0100
+@@ -659,7 +659,7 @@
+ # without the extra_cppflags because they may include am -idirafter
+ # which is not supported by the RC compiler.
+ libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
++libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(LIBTHREAD)
+-libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD)
+ gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
+ gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
+                      -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
+--- src/spawn-w32.c	2020-06-05 18:47:05.807099200 +0200
++++ src/spawn-w32.c~	2020-06-05 18:44:14.114035900 +0200
+@@ -834,7 +834,11 @@
+   /* We don't use ENVP.  */
+   (void)envp;
+ 
++#ifdef _WIN32
++  if (_access (pgmname, 04))
++#else
+   if (access (pgmname, X_OK))
++#endif
+     return _gpg_err_code_from_syserror ();
+ 
+   /* Prepare security attributes.  */
+--- src/sysutils.c	2020-06-06 00:23:52.457265500 +0200
++++ src/sysutils.c~	2019-12-12 15:23:37.000000000 +0100
+@@ -22,7 +22,11 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <string.h>
++#ifdef _WIN32
++# include <io.h>
++#else
++# include <unistd.h>
++#endif
+-#include <unistd.h>
+ #include <errno.h>
+ #ifdef HAVE_W32_SYSTEM
+ # include <windows.h>
+@@ -274,11 +270,12 @@
+ gpg_err_code_t
+ _gpgrt_mkdir (const char *name, const char *modestr)
+ {
++#ifdef _WIN32
+-#ifdef HAVE_W32CE_SYSTEM
+   wchar_t *wname;
+   (void)modestr;
+ 
++  size_t size;
++  wname = utf8_to_wchar (name, -1, &size);
+-  wname = utf8_to_wchar (name);
+   if (!wname)
+     return _gpg_err_code_from_syserror ();
+   if (!CreateDirectoryW (wname, NULL))
+--- src/visibility.c	2020-06-05 18:54:56.410442900 +0200
++++ src/visibility.c~	2019-01-04 12:56:54.000000000 +0100
+@@ -1067,11 +1067,7 @@
+ _gpgrt_log_assert (const char *expr, const char *file,
+                    int line, const char *func)
+ {
+-#ifdef GPGRT_HAVE_MACRO_FUNCTION
+   _gpgrt__log_assert (expr, file, line, func);
+-#else
+-  _gpgrt__log_assert (expr, file, line);
+-#endif
+ }
+ 
+ 
+--- src/w32-add.h	2020-06-06 00:32:38.502203300 +0200
++++ src/w32-add.h~	2018-12-07 14:48:19.000000000 +0100
+@@ -65,3 +65,5 @@
+ char *gpgrt_w32_reg_query_string (const char *root,
+                                   const char *dir,
+                                   const char *name);
++
++wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen);
+--- src/w32-gettext.c	2020-06-06 00:33:24.680341900 +0200
++++ src/w32-gettext.c~	2020-06-05 18:44:14.254481700 +0200
+@@ -1355,7 +1355,7 @@
+    string STRING.  Caller must free this value. On failure returns
+    NULL.  The result of calling this function with STRING set to NULL
+    is not defined. */
++wchar_t *
+-static wchar_t *
+ utf8_to_wchar (const char *string, size_t length, size_t *retlen)
+ {
+   int n;
diff --git a/external/libgpg-error/w32-build-fixes.patch b/external/libgpg-error/w32-build-fixes.patch
index 96a62e32042c..1de57e424089 100644
--- a/external/libgpg-error/w32-build-fixes.patch
+++ b/external/libgpg-error/w32-build-fixes.patch
@@ -52,107 +52,6 @@ diff -ur libgpg-error.org/src/estream-printf.c libgpg-error/src/estream-printf.c
  #include <stdarg.h>
  #include <errno.h>
  #include <stddef.h>
---- src/Makefile.am	2017-02-28 13:33:38.000000000 +0100
-+++ src/Makefile.am~	2017-09-10 21:52:19.739988146 +0200
-@@ -99,9 +99,9 @@
- 
- CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
- 	gpg-error.h gpgrt.h \
--        mkerrcodes mkerrcodes.h gpg-error.def mkw32errmap.tab.h \
-+        mkerrcodes.exe mkerrcodes.h gpg-error.def mkw32errmap.tab.h \
- 	mkw32errmap.map.c err-sources-sym.h err-codes-sym.h errnos-sym.h \
--	gpg-extra/errno.h mkheader $(tmp_files) lock-obj-pub.native.h
-+	gpg-extra/errno.h mkheader.exe $(tmp_files) lock-obj-pub.native.h
- 
- 
- #
-@@ -251,7 +251,7 @@
- 
- # It is correct to use $(CC_FOR_BUILD) here.  We want to run the
- # program at build time.
--mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile
-+mkerrcodes.exe: mkerrcodes.c mkerrcodes.h Makefile
- 	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c
- 
- if HAVE_W32CE_SYSTEM
-@@ -261,7 +261,7 @@
- 	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c
- endif
- 
--code-from-errno.h: mkerrcodes Makefile
-+code-from-errno.h: mkerrcodes.exe Makefile
- 	./mkerrcodes | $(AWK) -f $(srcdir)/mkerrcodes2.awk >$@
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
-@@ -270,7 +270,7 @@
- 		$(srcdir)/errnos.in >$@
- 
- 
--mkheader: mkheader.c Makefile
-+mkheader.exe: mkheader.c Makefile
- 	$(CC_FOR_BUILD) -g -O0 -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
- 
- parts_of_gpg_error_h = 	 	\
-@@ -297,7 +297,7 @@
- 
- # We also depend on versioninfo.rc because that is build by
- # config.status and thus has up-to-date version numbers.
--gpg-error.h: Makefile mkheader $(parts_of_gpg_error_h) \
-+gpg-error.h: Makefile mkheader.exe $(parts_of_gpg_error_h) \
-              versioninfo.rc ../config.h
- 	$(pre_mkheader_cmds)
- 	./mkheader $(host_os) $(host_triplet)  $(srcdir)/gpg-error.h.in \
-diff -ru libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in
---- src/Makefile.in	2017-02-28 15:03:41.000000000 +0100
-+++ src/Makefile.in~	2017-09-10 21:53:48.447987149 +0200
-@@ -493,9 +493,9 @@
- tmp_files = _mkerrcodes.h _gpg-error.def.h mkw32errmap.tab.h mkw32errmap.map.c
- CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
- 	gpg-error.h gpgrt.h \
--        mkerrcodes mkerrcodes.h gpg-error.def mkw32errmap.tab.h \
-+        mkerrcodes.exe mkerrcodes.h gpg-error.def mkw32errmap.tab.h \
- 	mkw32errmap.map.c err-sources-sym.h err-codes-sym.h errnos-sym.h \
--	gpg-extra/errno.h mkheader $(tmp_files) lock-obj-pub.native.h
-+	gpg-extra/errno.h mkheader.exe $(tmp_files) lock-obj-pub.native.h
- 
- 
- #
-@@ -1309,7 +1309,7 @@
- 
- # It is correct to use $(CC_FOR_BUILD) here.  We want to run the
- # program at build time.
--mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile
-+mkerrcodes.exe: mkerrcodes.c mkerrcodes.h Makefile
- 	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c
- 
- # It is correct to use $(CC_FOR_BUILD) here.  We want to run the
-@@ -1317,7 +1317,7 @@
- @HAVE_W32CE_SYSTEM_TRUE@mkw32errmap: mkw32errmap.c mkw32errmap.tab.h Makefile
- @HAVE_W32CE_SYSTEM_TRUE@	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c
- 
--code-from-errno.h: mkerrcodes Makefile
-+code-from-errno.h: mkerrcodes.exe Makefile
- 	./mkerrcodes | $(AWK) -f $(srcdir)/mkerrcodes2.awk >$@
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
-@@ -1325,7 +1325,7 @@
- 		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
- 		$(srcdir)/errnos.in >$@
- 
--mkheader: mkheader.c Makefile
-+mkheader.exe: mkheader.c Makefile
- 	$(CC_FOR_BUILD) -g -O0 -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
- 
- @FORCE_USE_SYSCFG_FALSE@./lock-obj-pub.native.h: Makefile gen-posix-lock-obj$(EXEEXT) posix-lock-obj.h
-@@ -1333,7 +1333,7 @@
- 
- # We also depend on versioninfo.rc because that is build by
- # config.status and thus has up-to-date version numbers.
--gpg-error.h: Makefile mkheader $(parts_of_gpg_error_h) \
-+gpg-error.h: Makefile mkheader.exe $(parts_of_gpg_error_h) \
-              versioninfo.rc ../config.h
- 	$(pre_mkheader_cmds)
- 	./mkheader $(host_os) $(host_triplet)  $(srcdir)/gpg-error.h.in \
 --- src/mkheader.c	2016-11-16 13:22:03.000000000 +0100
 +++ src/mkheader.c~	2017-02-19 17:35:32.172009000 +0100
 @@ -16,7 +16,11 @@
@@ -204,3 +103,19 @@ diff -ur libgpg-error.org/src/w32-estream.c libgpg-error/src/w32-estream.c
  /*
   * In order to support es_poll on Windows, we create a proxy shim that
   * we use as the estream I/O functions.  This shim creates reader and
+--- src/spawn-w32.c	    2019-08-22 12:30:38.000000000 +0200
++++ src/spawn-w32.c~	2020-05-26 01:37:17.759077700 +0200
+@@ -34,7 +34,11 @@
+ #ifdef HAVE_SIGNAL_H
+ # include <signal.h>
+ #endif
+-#include <unistd.h>
++#ifdef _WIN32
++# include <io.h>
++#else
++# include <unistd.h>
++#endif
+ #include <fcntl.h>
+ #ifdef HAVE_STAT
+ # include <sys/stat.h>
+