download.lst | 4 ++-- external/expat/expat-winapi.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 8db9a329f534b8770404a72ea44f8ca2c630d7b1 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Feb 2 10:28:30 2026 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Feb 10 16:52:25 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/+/199038 Tested-by: Michael Stahl <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index ae7c14f89642..ca7860062507 100644 --- a/download.lst +++ b/download.lst @@ -97,8 +97,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 cbccbbb48339bd32159d11194fcd1d30744a3ef1 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Sep 25 09:53:15 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Feb 10 16:52:21 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/+/199037 Tested-by: allotropia jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index df919c0d589b..ae7c14f89642 100644 --- a/download.lst +++ b/download.lst @@ -97,8 +97,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 commit 1c331c670c507bb575cc2e91a4b1b2a4f032e019 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Sep 16 21:26:24 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Feb 10 16:52:16 2026 +0100 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 <[email protected]> Tested-by: Jenkins (cherry picked from commit 953f1da9270dc10d4aa7852a91e22e4483751aba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191055 Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit a6ab69bb6e0732c93523042353aac06f449346f5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199036 Reviewed-by: Michael Stahl <[email protected]> Tested-by: allotropia jenkins <[email protected]> diff --git a/download.lst b/download.lst index 8f6ebc4d0107..df919c0d589b 100644 --- a/download.lst +++ b/download.lst @@ -97,8 +97,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 commit a0e3062e01a0bf2b202f6d5918a6753e3ef484f5 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Mar 28 10:50:15 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Feb 10 16:52:13 2026 +0100 expat: upgrade to 2.7.1 Downloaded from https://github.com/libexpat/libexpat/releases/download/R_2_7_1/expat-2.7.1.tar.xz Change-Id: I10c3e609f1711afeceb5dad2ee871e305cccdf8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183447 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <[email protected]> (cherry picked from commit fcd451277298d84a051284c653c6f01d94f804bf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199035 Tested-by: Michael Stahl <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index 0bb0dcf6bcc1..8f6ebc4d0107 100644 --- a/download.lst +++ b/download.lst @@ -97,8 +97,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 := 25df13dd2819e85fb27a1ce0431772b7047d72af81ae78dc26b4c6e0805f48d1 -EXPAT_TARBALL := expat-2.7.0.tar.xz +EXPAT_SHA256SUM := 354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30 +EXPAT_TARBALL := expat-2.7.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
