download.lst | 4 ++-- external/expat/expat-winapi.patch | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
New commits: commit 5d6150a97e06401597248ed455e760c02875b775 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Feb 2 10:28:30 2026 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Feb 10 14:06:36 2026 +0100 expat: upgrade to 2.7.4 Downloaded from https://github.com/libexpat/libexpat/releases/download/R_2_7_4/expat-2.7.4.tar.xz Change-Id: I7058df85bf0fbac6608b83967b635382859e4db6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198521 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 79631c2369df3dcd858abd725bb1c7fd1459652b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199030 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index a2c2ac284b1a..82f2d8414929 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 := 71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f -EXPAT_TARBALL := expat-2.7.3.tar.xz +EXPAT_SHA256SUM := 9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0 +EXPAT_TARBALL := expat-2.7.4.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 5cef970a2bf2..8abe65ae7cf1 100644 --- a/external/expat/expat-winapi.patch +++ b/external/expat/expat-winapi.patch @@ -1,11 +1,10 @@ --- 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,11 +88,6 @@ +@@ -88,10 +88,6 @@ # ifndef XML_BUILDING_EXPAT /* using Expat from an application */ --# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) \ -- && ! defined(__CYGWIN__) +-# if defined(_MSC_VER) && ! defined(__BEOS__) && ! defined(__CYGWIN__) -# define XMLIMPORT __declspec(dllimport) -# endif - commit a22b06827941fd802d371c798d608851cde8e95a Author: Xisco Fauli <[email protected]> AuthorDate: Thu Sep 25 09:53:15 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Feb 10 14:06:31 2026 +0100 expat: upgrade to 2.7.3 Downloaded from https://github.com/libexpat/libexpat/releases/download/R_2_7_3/expat-2.7.3.tar.xz Change-Id: I2141a3d2881e693867b23ca56a1d6a929f17c4fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191481 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 3bceab5b951aa45bc7ab1d86ebcfda8981d9693f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199029 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index 8e776d507107..a2c2ac284b1a 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 := 21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c -EXPAT_TARBALL := expat-2.7.2.tar.xz +EXPAT_SHA256SUM := 71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f +EXPAT_TARBALL := expat-2.7.3.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
