download.lst | 4 - external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 | 25 ++++++++++ external/libgpg-error/ExternalPackage_libgpg-error.mk | 2 external/libgpg-error/UnpackedTarball_libgpg-error.mk | 1 external/libgpg-error/w32-build-fixes-5.patch | 17 ++++-- 5 files changed, 40 insertions(+), 9 deletions(-)
New commits: commit fd325b76cb095b7bcd4c1fc21a80c00a9e015a74 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Dec 11 09:54:55 2025 +0100 Commit: Taichi Haradaguchi <[email protected]> CommitDate: Sun Dec 14 08:35:59 2025 +0100 libgpg-error: upgrade to 1.57 Downloaded from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.57.tar.bz2 Change-Id: I8da25b24f4cb444f0a28b50add598f95c2a3df4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195432 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 55df70eca02366e10e36611a09857ea484a870a8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195590 Reviewed-by: Taichi Haradaguchi <[email protected]> diff --git a/download.lst b/download.lst index 3c93aed46061..d67457201fbd 100644 --- a/download.lst +++ b/download.lst @@ -430,8 +430,8 @@ LIBFFI_TARBALL := libffi-3.5.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBGPGERROR_SHA256SUM := 82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0 -LIBGPGERROR_TARBALL := libgpg-error-1.56.tar.bz2 +LIBGPGERROR_SHA256SUM := ab807c81fbd2b8e1d6e3377383be802147c08818f87a82e87f85e5939c939def +LIBGPGERROR_TARBALL := libgpg-error-1.57.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 b/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 new file mode 100644 index 000000000000..f1e73f3eff4d --- /dev/null +++ b/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 @@ -0,0 +1,25 @@ +From 421e101cf9760a4bc4f296d12ce25a7c3fe5b7b2 Mon Sep 17 00:00:00 2001 +From: Werner Koch <[email protected]> +Date: Fri, 12 Dec 2025 11:34:00 +0100 +Subject: [PATCH] w32: Fix a syntax error in a non-DLL build + +* src/w32-utils.c (_gpgrt_w32__init_utils): Fix syntax error. +--- + src/w32-utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/w32-utils.c b/src/w32-utils.c +index d8f4896..5cf4fbd 100644 +--- a/src/w32-utils.c ++++ b/src/w32-utils.c +@@ -159,6 +159,6 @@ w32_utils_init (void) + void + _gpgrt_w32__init_utils (void) + { +- w32_utils_init (). ++ w32_utils_init (); + } + #endif +-- +2.39.5 + diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk index 64ab28477b63..d978c0665a63 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.40.0)) +$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.41.0)) else ifeq ($(OS),MACOSX) diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk index 3345819e24c4..67d290672487 100644 --- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk +++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \ external/libgpg-error/clang-cl.patch \ external/libgpg-error/undeclared-environ-macOS.patch \ external/libgpg-error/0001-const-up-handle_metacmd.cmds-array.patch.1 \ + external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/w32-build-fixes-5.patch b/external/libgpg-error/w32-build-fixes-5.patch index 154cae3f8cd0..ba917c3bf899 100644 --- a/external/libgpg-error/w32-build-fixes-5.patch +++ b/external/libgpg-error/w32-build-fixes-5.patch @@ -74,26 +74,31 @@ # define S_IWGRP S_IWUSR --- 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 @@ +@@ -214,9 +214,9 @@ # libgpg_error_la_DEPENDENCIES = \ # $(srcdir)/gpg-error.vers --libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" +-libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \ +- -DSYSCONFDIR=\"$(sysconfdir)\" -libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD) -+libgpg_error_la_CPPFLAGS = -DLOCALEDIR=$(localelidir) ++libgpg_error_la_CPPFLAGS = -DLOCALEDIR=$(localelidir) \ ++ -DSYSCONFDIR=$(sysconfdir) +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 2023-08-30 14:44:01.102310369 +0900 +++ src/Makefile.in~ 2023-08-30 15:54:38.371855157 +0900 -@@ -662,8 +662,8 @@ +@@ -681,10 +681,10 @@ # libgpg_error_la_DEPENDENCIES = \ # $(srcdir)/gpg-error.vers --libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" +-libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \ +- -DSYSCONFDIR=\"$(sysconfdir)\" ++libgpg_error_la_CPPFLAGS = -DLOCALEDIR=$(localedir) \ ++ -DSYSCONFDIR=$(sysconfdir) + -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)\" \
