dictionaries | 2 +- download.lst | 4 ++-- external/libgpg-error/ExternalPackage_libgpg-error.mk | 2 +- external/libgpg-error/w32-build-fixes-5.patch | 9 ++++++--- 4 files changed, 10 insertions(+), 7 deletions(-)
New commits: commit 9a7b5eba99c8fed7ec4c307d3ea1332a33057169 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Wed Apr 9 12:58:20 2025 +0200 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Mon Apr 14 11:35:38 2025 +0200 libgpg-error: upgrade to 1.53 Downloaded from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.53.tar.bz2 Change-Id: I29b4d5a52bd16ebcc1d0d866d1485c5e32264f81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183932 Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Tested-by: Jenkins (cherry picked from commit c45921ad85200ad22e36bae968e00e955b6d435e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183944 diff --git a/download.lst b/download.lst index e65209cfc451..9acb2f561fc9 100644 --- a/download.lst +++ b/download.lst @@ -394,8 +394,8 @@ LIBFFI_TARBALL := libffi-3.4.4.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBGPGERROR_SHA256SUM := be0f1b2db6b93eed55369cdf79f19f72750c8c7c39fc20b577e724545427e6b2 -LIBGPGERROR_TARBALL := libgpg-error-1.51.tar.bz2 +LIBGPGERROR_SHA256SUM := 6a0721b52027415f53abcbf63b5c37776a0f774d9126d560a3ce76c0eb42903f +LIBGPGERROR_TARBALL := libgpg-error-1.53.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 532e8bba2f4e..06a2da44bd36 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.38.0)) +$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.39.1)) else ifeq ($(OS),MACOSX) diff --git a/external/libgpg-error/w32-build-fixes-5.patch b/external/libgpg-error/w32-build-fixes-5.patch index 80d52f720e13..154cae3f8cd0 100644 --- a/external/libgpg-error/w32-build-fixes-5.patch +++ b/external/libgpg-error/w32-build-fixes-5.patch @@ -130,12 +130,15 @@ --- 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, +@@ -89,5 +89,7 @@ const char *dir, const char *name); -+ + +wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen); ++ + /* Query a string in the registry using a unified key representation. */ + char *gpgrt_w32_reg_get_string (const char *key); + --- 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 @@ commit a8a8adafd7c20a70d848337535080f9ecde31645 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Mon Apr 14 11:35:13 2025 +0200 Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org> CommitDate: Mon Apr 14 11:35:13 2025 +0200 Update git submodules * Update dictionaries from branch 'libreoffice-24-8' to 33f6d5faec5711c9b1968e0b3cc4991100e5a4a4 - Upgrade Mongolian dictionary to 2025.04.04 Downloaded from https://github.com/bataak/dict-mn/archive/refs/tags/2025.04.04.zip Change-Id: I9e34c8f42ab12bb80aea26c1a0731228294a8d4b Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/183807 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> Tested-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit 850c928eb0745dbe8c8886ab96cb99b80e760ce2) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/183809 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/dictionaries b/dictionaries index 96de37eb603d..33f6d5faec57 160000 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 96de37eb603d4e7d1f8a4161deed1dc2d9233c09 +Subproject commit 33f6d5faec5711c9b1968e0b3cc4991100e5a4a4