download.lst | 4 -
external/libgpg-error/ExternalPackage_libgpg-error.mk | 2
external/libgpg-error/ExternalProject_libgpg-error.mk | 5 -
external/libgpg-error/UnpackedTarball_libgpg-error.mk | 1
external/libgpg-error/w32-build-fixes-2.patch.1 | 24 +-----
external/libgpg-error/w32-build-fixes-3.patch.1 | 57 --------------
external/libgpg-error/w32-build-fixes-5.patch | 70 +++++++++---------
7 files changed, 49 insertions(+), 114 deletions(-)
New commits:
commit 380348d7188fcdd9e5a4427771e1d226455bee9a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Jan 6 20:55:53 2023 +0900
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Sep 9 23:52:27 2023 +0200
libgpg-error: upgrade to release 1.47
* Remove external/libgpg-error/w32-build-fixes-3.patch.1, which has
redundant contents with a part of
external/libgpg-error/w32-build-fixes-5.patch.
Change-Id: I330b5f92717c1c5f6c0637940dfe7c3ac7e58b21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145169
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/download.lst b/download.lst
index 212077f775b6..8bdd7d7bf9ed 100644
--- a/download.lst
+++ b/download.lst
@@ -319,8 +319,8 @@ LIBFFI_TARBALL := libffi-3.3.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBGPGERROR_SHA256SUM :=
a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
-LIBGPGERROR_TARBALL := libgpg-error-1.43.tar.bz2
+LIBGPGERROR_SHA256SUM :=
9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
+LIBGPGERROR_TARBALL := libgpg-error-1.47.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index 7ee849d2369c..fd887fb5776d 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.32.1))
+$(eval $(call
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.34.0))
else ifeq ($(OS),MACOSX)
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk
b/external/libgpg-error/ExternalProject_libgpg-error.mk
index 055cd3cbe394..88b9b2be504a 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -39,9 +39,8 @@ $(call
gb_ExternalProject_get_state_target,libgpg-error,build):
--disable-rpath \
--disable-languages \
--disable-doc \
- CFLAGS=" $(CFLAGS) $(call
gb_ExternalProject_get_build_flags,libgpg-error)" \
- CPPFLAGS=" $(SOLARINC)" \
- $(if $(filter MSC,$(COM)),--force_use_syscfg=true) \
+ CFLAGS="$(CFLAGS) $(call
gb_ExternalProject_get_build_flags,libgpg-error)" \
+ CPPFLAGS="$(SOLARINC)" \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
$(if $(filter
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 72ff13069c76..698c41997326 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -16,7 +16,6 @@ $(eval $(call
gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
$(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
$(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 \
$(if $(filter
MSC,$(COM)),external/libgpg-error/w32-build-fixes-5.patch) \
diff --git a/external/libgpg-error/w32-build-fixes-2.patch.1
b/external/libgpg-error/w32-build-fixes-2.patch.1
index 0f8a8b36ef1c..5f2a7b925842 100644
--- a/external/libgpg-error/w32-build-fixes-2.patch.1
+++ b/external/libgpg-error/w32-build-fixes-2.patch.1
@@ -1,17 +1,7 @@
diff -ru libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in
---- libgpg-error.orig/src/Makefile.in 2017-09-12 08:18:29.376536700 +0200
-+++ 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 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)
-+@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) -DLOCALEDIR=$(localedir) $(AM_CPPFLAGS)
-
- @HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC
$(RCCOMPILE)
- @HAVE_W32_SYSTEM_TRUE@SUFFIXES = .rc .lo
-@@ -1242,7 +1241,7 @@
+--- libgpg-error.orig/src/Makefile.in 2023-04-06 17:30:13.000000000 +0900
++++ libgpg-error/src/Makefile.in 2023-08-30 14:44:01.102310369 +0900
+@@ -1619,7 +1618,7 @@
@have_w32_system_t...@.rc.lo:
@@ -20,12 +10,12 @@ diff -ru libgpg-error.orig/src/Makefile.in
libgpg-error/src/Makefile.in
@have_w32_system_t...@versioninfo.lo : gpg-error.w32-manifest
-@@ -1283,7 +1282,7 @@
+@@ -1660,7 +1659,7 @@
# It is correct to use $(CPP). We want the host's idea of the error codes.
- mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
+ mkerrcodes.h: Makefile mkerrcodes.awk
$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
-- $(CPP) $(CPPFLAGS) $(extra_cppflags) -P _$@ | grep GPG_ERR_ | \
-+ $(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
+- $(CPP) $(CPPFLAGS) -P _$@ | grep GPG_ERR_ | \
++ $(CPP) $(CPPFLAGS) _$@ | grep GPG_ERR_ | \
$(AWK) -f $(srcdir)/mkerrcodes.awk >$@
-rm _$@
diff --git a/external/libgpg-error/w32-build-fixes-3.patch.1
b/external/libgpg-error/w32-build-fixes-3.patch.1
deleted file mode 100644
index 5883211f9570..000000000000
--- a/external/libgpg-error/w32-build-fixes-3.patch.1
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru libgpg-error.orig/src/gpg-error.c libgpg-error/src/gpg-error.c
---- libgpg-error.orig/src/gpg-error.c 2016-12-02 22:55:32.000000000 +0100
-+++ libgpg-error/src/gpg-error.c 2017-09-13 22:25:10.040113800 +0200
-@@ -206,7 +206,7 @@
- static const char src_prefix[] = "GPG_ERR_SOURCE_";
- static const char code_prefix[] = "GPG_ERR_";
-
-- if (!strncasecmp (src_prefix, str, sizeof (src_prefix) - 1))
-+ if (!_strnicmp (src_prefix, str, sizeof (src_prefix) - 1))
- {
- gpg_err_source_t src;
-
-@@ -220,14 +220,14 @@
- const char *src_sym;
-
- src_sym = gpg_strsource_sym (src << GPG_ERR_SOURCE_SHIFT);
-- if (src_sym && !strcasecmp (str, src_sym + sizeof (src_prefix) - 1))
-+ if (src_sym && !_stricmp (str, src_sym + sizeof (src_prefix) - 1))
- {
- *err |= src << GPG_ERR_SOURCE_SHIFT;
- return 1;
- }
- }
- }
-- else if (!strncasecmp (code_prefix, str, sizeof (code_prefix) - 1))
-+ else if (!_strnicmp (code_prefix, str, sizeof (code_prefix) - 1))
- {
- gpg_err_code_t code;
-
-@@ -240,7 +240,7 @@
- {
- const char *code_sym = gpg_strerror_sym (code);
- if (code_sym
-- && !strcasecmp (str, code_sym + sizeof (code_prefix) - 1))
-+ && !_stricmp (str, code_sym + sizeof (code_prefix) - 1))
- {
- *err |= code;
- return 1;
-@@ -296,7 +296,7 @@
- for (src = 0; src < GPG_ERR_SOURCE_DIM; src++)
- {
- const char *src_str = gpg_strsource (src << GPG_ERR_SOURCE_SHIFT);
-- if (src_str && !strcasecmp (str, src_str))
-+ if (src_str && !_stricmp (str, src_str))
- {
- if (*have_source)
- return 0;
-@@ -310,7 +310,7 @@
- for (code = 0; code < GPG_ERR_CODE_DIM; code++)
- {
- const char *code_str = gpg_strerror (code);
-- if (code_str && !strcasecmp (str, code_str))
-+ if (code_str && !_stricmp (str, code_str))
- {
- if (*have_code)
- return 0;
-Nur in libgpg-error/src: gpg-error.c~.
diff --git a/external/libgpg-error/w32-build-fixes-5.patch
b/external/libgpg-error/w32-build-fixes-5.patch
index 4e04e47a31d8..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,36 +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
+--- 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
@@ -73,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>
@@ -132,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 *
