diff options
Diffstat (limited to 'external/libgpg-error/w32-build-fixes-5.patch')
| -rw-r--r-- | external/libgpg-error/w32-build-fixes-5.patch | 73 |
1 files changed, 39 insertions, 34 deletions
diff --git a/external/libgpg-error/w32-build-fixes-5.patch b/external/libgpg-error/w32-build-fixes-5.patch index 8a65cedea2da..80d52f720e13 100644 --- a/external/libgpg-error/w32-build-fixes-5.patch +++ b/external/libgpg-error/w32-build-fixes-5.patch @@ -14,8 +14,8 @@ #include "gpgrt-int.h" ---- src/gpg-error.c 2020-06-06 00:18:40.199791000 +0200 -+++ src/gpg-error.c~ 2020-06-05 18:44:14.223182300 +0200 +--- src/gpg-error.c 2022-03-04 20:25:28.000000000 +0900 ++++ src/gpg-error.c~ 2023-08-30 15:10:24.521856169 +0900 @@ -61,6 +61,11 @@ #define drop_locale_dir(dir) #endif @@ -28,35 +28,35 @@ static void i18n_init (void) { - ---- src/spawn-w32.c~ 2022-01-03 16:33:24.000000000 +0100 -+++ src/spawn-w32.c 2022-01-03 16:46:57.173841200 +0100 +--- src/spawn-w32.c 2023-08-30 15:24:46.861855840 +0900 ++++ src/spawn-w32.c~ 2023-08-30 15:26:04.581855810 +0900 @@ -56,7 +56,7 @@ * Previous versions interpreted X_OK as F_OK anyway, so we'll just * use F_OK directly. */ #undef X_OK -+#define X_OK 0 -#define X_OK F_OK ++#define X_OK 0 /* For HANDLE and the internal file descriptor (fd) of this module: * HANDLE can be represented by an intptr_t which should be true for ---- 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 @@ +--- src/logging.c 2023-03-21 18:33:56.000000000 +0900 ++++ src/logging.c~ 2023-08-30 15:37:20.661855553 +0900 +@@ -44,7 +44,12 @@ # include <netinet/in.h> # include <arpa/inet.h> #endif /*!HAVE_W32_SYSTEM*/ +-#include <unistd.h> +#ifdef _WIN32 +# include <io.h> ++# include <process.h> +#else +# include <unistd.h> +#endif --#include <unistd.h> #include <fcntl.h> /* #include <execinfo.h> */ -@@ -57,6 +53,15 @@ +@@ -53,6 +58,15 @@ #ifdef HAVE_W32_SYSTEM @@ -72,40 +72,45 @@ # 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) +--- src/Makefile.am 2022-08-19 17:39:54.000000000 +0900 ++++ src/Makefile.am~ 2023-08-30 15:41:10.371855465 +0900 +@@ -208,8 +208,8 @@ + # libgpg_error_la_DEPENDENCIES = \ + # $(srcdir)/gpg-error.vers + +-libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD) ++libgpg_error_la_CPPFLAGS = -DLOCALEDIR=$(localelidir) ++libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(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) +--- src/Makefile.in 2023-08-30 14:44:01.102310369 +0900 ++++ src/Makefile.in~ 2023-08-30 15:54:38.371855157 +0900 +@@ -662,8 +662,8 @@ + + # libgpg_error_la_DEPENDENCIES = \ + # $(srcdir)/gpg-error.vers +-libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD) ++libgpg_error_la_CPPFLAGS = -DLOCALEDIR=$(localedir) ++libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) -ladvapi32 $(LIBTHREAD) gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \ - -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags) ---- 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 @@ + -DLOCALEDIR=\"$(localedir)\" +--- src/sysutils.c 2023-03-21 18:33:56.000000000 +0900 ++++ src/sysutils.c~ 2023-08-30 15:57:34.401855090 +0900 +@@ -22,7 +22,12 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> +-#include <unistd.h> +#ifdef _WIN32 +# include <io.h> ++# define W_OK 02 +#else +# include <unistd.h> +#endif --#include <unistd.h> #include <errno.h> #ifdef HAVE_W32_SYSTEM # include <windows.h> @@ -131,10 +136,10 @@ 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 @@ - is not defined. If LENGTH is zero and RETLEN NULL the fucntion +--- src/w32-gettext.c 2022-03-04 21:44:26.000000000 +0900 ++++ src/w32-gettext.c~ 2023-08-30 16:01:12.861855006 +0900 +@@ -1325,7 +1325,7 @@ + is not defined. If LENGTH is zero and RETLEN NULL the function assumes that STRING is a nul-terminated string and returns a (wchar_t)0-terminated string. */ +wchar_t * |