download.lst | 4 ++-- external/expat/expat-winapi.patch | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-)
New commits: commit c5005923f103123a089ce24103cbe7b6d4627bac Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Tue Sep 16 21:26:24 2025 +0200 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Wed Sep 17 18:23:27 2025 +0200 expat: upgrade to 2.7.2 Downloaded from https://github.com/libexpat/libexpat/releases/download/R_2_7_2/expat-2.7.2.tar.xz Change-Id: Icf4b730291dfecc039024360b36c2fe8adb247fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191047 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 953f1da9270dc10d4aa7852a91e22e4483751aba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191054 Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/download.lst b/download.lst index c3d72f7e1631..b31d6f9e085a 100644 --- a/download.lst +++ b/download.lst @@ -111,8 +111,8 @@ ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -EXPAT_SHA256SUM := 354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30 -EXPAT_TARBALL := expat-2.7.1.tar.xz +EXPAT_SHA256SUM := 21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c +EXPAT_TARBALL := expat-2.7.2.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/expat/expat-winapi.patch b/external/expat/expat-winapi.patch index fed65644a732..5cef970a2bf2 100644 --- a/external/expat/expat-winapi.patch +++ b/external/expat/expat-winapi.patch @@ -1,15 +1,16 @@ --- misc/expat-2.5.0/lib/expat_external.h 2022-10-25 01:32:54.000000000 +0900 +++ misc/build/expat-2.5.0/lib/expat_external.h 2022-10-30 23:09:47.339459134 +0900 -@@ -88,10 +88,6 @@ - # ifndef XML_BUILDING_EXPAT +@@ -88,11 +88,6 @@ + # ifndef XML_BUILDING_EXPAT /* using Expat from an application */ --# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__) --# define XMLIMPORT __declspec(dllimport) --# endif +-# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) \ +- && ! defined(__CYGWIN__) +-# define XMLIMPORT __declspec(dllimport) +-# endif - - # endif - #endif /* not defined XML_STATIC */ + # endif + # endif /* not defined XML_STATIC */ --- misc/expat-2.5.0/lib/xmlparse.c 2022-10-26 00:09:08.000000000 +0900 +++ misc/build/expat-2.5.0/lib/xmlparse.c 2022-10-30 23:09:01.843006341 +0900