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 4 files changed, 3 insertions(+), 29 deletions(-)
New commits: commit 404b1c61257d305f60a11ceac03d2fa7ace173c5 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Dec 15 10:03:16 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Dec 15 13:55:35 2025 +0100 libgpg-error: upgrade to 1.58 Downloaded from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.58.tar.bz2 Change-Id: Ia42fed5c4f9a7f4d88b2d74d8c3b6bc4397fdf20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195631 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 6895234b23fa3a1d3c393d2fbc424e230ec147b1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195656 diff --git a/download.lst b/download.lst index d67457201fbd..8394c54e7b6d 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 := ab807c81fbd2b8e1d6e3377383be802147c08818f87a82e87f85e5939c939def -LIBGPGERROR_TARBALL := libgpg-error-1.57.tar.bz2 +LIBGPGERROR_SHA256SUM := f943aea9a830a8bd938e5124b579efaece24a3225ff4c3d27611a80ce1260c27 +LIBGPGERROR_TARBALL := libgpg-error-1.58.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 deleted file mode 100644 index f1e73f3eff4d..000000000000 --- a/external/libgpg-error/0001-w32-Fix-a-syntax-error-in-a-non-DLL-build.patch.1 +++ /dev/null @@ -1,25 +0,0 @@ -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 d978c0665a63..dd571ff61b76 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.41.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.1)) else ifeq ($(OS),MACOSX) diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk index 67d290672487..3345819e24c4 100644 --- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk +++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk @@ -27,7 +27,6 @@ $(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:
