download.lst | 4 ++-- external/libxslt/ExternalPackage_libxslt.mk | 2 +- external/libxslt/UnpackedTarball_libxslt.mk | 1 - external/libxslt/libxslt-1.1.26-memdump.patch | 10 ---------- 4 files changed, 3 insertions(+), 14 deletions(-)
New commits: commit 7d588c5fd139084f34bbbee543a7f45e384a8203 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jul 5 11:01:05 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Oct 16 16:07:34 2025 +0200 libxslt: upgrade to 1.1.42 Downloaded from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.42.tar.xz Change-Id: I77de8a0922c5271161640eae5c92b425c5be82c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170011 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 355e553505a250f137b8bfc714b13084b83f0465) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192502 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index f1054c08f554..84d40d16eee9 100644 --- a/download.lst +++ b/download.lst @@ -533,8 +533,8 @@ LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBXSLT_SHA256SUM := 3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda -LIBXSLT_VERSION_MICRO := 41 +LIBXSLT_SHA256SUM := 85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb +LIBXSLT_VERSION_MICRO := 42 LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick diff --git a/external/libxslt/ExternalPackage_libxslt.mk b/external/libxslt/ExternalPackage_libxslt.mk index 42b2004728e5..b11ee72bfe1a 100644 --- a/external/libxslt/ExternalPackage_libxslt.mk +++ b/external/libxslt/ExternalPackage_libxslt.mk @@ -25,7 +25,7 @@ $(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.dl endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.$(LIBXSLT_VERSION_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.22)) +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.23)) endif endif # DISABLE_DYNLOADING commit c3465fcbf91d6361d4ecfdaf8352e1e25b4a438c Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Jun 20 15:46:51 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Oct 16 16:07:30 2025 +0200 Fix build ...after 4eb9cde4db28616e0b0c9cd6825830ab7d2f3c96 "libxslt: uprade to 1.1.41", > external/libxslt/ExternalPackage_libxslt.mk:28: *** file workdir_for_build/UnpackedTarball/libxslt/libexslt/.libs/libexslt.so.0.8.21 does not exist in the tarball. Stop. at least during an Emscripten cross-build Change-Id: I7fcde7f8708fba68d5d9b751420e402c5da41f3d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169280 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins (cherry picked from commit 9288a75f716972bb5d65031c624cb22ea4cb8ee8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192501 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/libxslt/ExternalPackage_libxslt.mk b/external/libxslt/ExternalPackage_libxslt.mk index c1a8ee1217f1..42b2004728e5 100644 --- a/external/libxslt/ExternalPackage_libxslt.mk +++ b/external/libxslt/ExternalPackage_libxslt.mk @@ -25,7 +25,7 @@ $(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.dl endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.$(LIBXSLT_VERSION_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.21)) +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.22)) endif endif # DISABLE_DYNLOADING commit d9e8a0c22d20ce733045fcf344e5b9c5c02a9dc7 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Jun 20 12:22:55 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Oct 16 16:07:26 2025 +0200 libxslt: uprade to 1.1.41 Downloaded from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.41.tar.xz Change-Id: Ib06a013d85cc47a901fbe55a880f3ad6a5edcea8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169265 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 4eb9cde4db28616e0b0c9cd6825830ab7d2f3c96) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192500 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/download.lst b/download.lst index cc28af02f2e9..f1054c08f554 100644 --- a/download.lst +++ b/download.lst @@ -533,8 +533,8 @@ LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBXSLT_SHA256SUM := 194715db023035f65fb566402f2ad2b5eab4c29d541f511305c40b29b1f48d13 -LIBXSLT_VERSION_MICRO := 40 +LIBXSLT_SHA256SUM := 3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda +LIBXSLT_VERSION_MICRO := 41 LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick commit 030a7e7db518dffbe331af258a3e99a9e46fb697 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Jun 13 13:39:46 2024 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Oct 16 16:07:21 2025 +0200 libxslt: upgrade to 1.1.40 Downloaded from https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.40.tar.xz * libxslt-1.1.26-memdump.patch is no longer needed Change-Id: I72829ce590d7fd73a1364139bf3c373d6cd4d1b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168782 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit cdde0d59ac67cd9a26671822b02d04b07b2dd754) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192499 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index 302fc083e0ff..cc28af02f2e9 100644 --- a/download.lst +++ b/download.lst @@ -533,8 +533,8 @@ LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBXSLT_SHA256SUM := 2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0 -LIBXSLT_VERSION_MICRO := 39 +LIBXSLT_SHA256SUM := 194715db023035f65fb566402f2ad2b5eab4c29d541f511305c40b29b1f48d13 +LIBXSLT_VERSION_MICRO := 40 LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick diff --git a/external/libxslt/UnpackedTarball_libxslt.mk b/external/libxslt/UnpackedTarball_libxslt.mk index 7d39cb1e3478..edfb266f2f17 100644 --- a/external/libxslt/UnpackedTarball_libxslt.mk +++ b/external/libxslt/UnpackedTarball_libxslt.mk @@ -19,7 +19,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\ $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED),\ external/libxslt/libxslt-msvc-sym.patch.2, \ external/libxslt/libxslt-msvc.patch.2) \ - external/libxslt/libxslt-1.1.26-memdump.patch \ external/libxslt/rpath.patch.0 \ )) diff --git a/external/libxslt/libxslt-1.1.26-memdump.patch b/external/libxslt/libxslt-1.1.26-memdump.patch deleted file mode 100644 index 28724f749a38..000000000000 --- a/external/libxslt/libxslt-1.1.26-memdump.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/libxslt-1.1.26/xsltproc/xsltproc.c 2009-08-23 14:53:33.000000000 +0200 -+++ misc/build/libxslt-1.1.26/xsltproc/xsltproc.c 2013-01-18 14:16:12.202767222 +0100 -@@ -877,7 +877,6 @@ - xsltFreeSecurityPrefs(sec); - xsltCleanupGlobals(); - xmlCleanupParser(); -- xmlMemoryDump(); - return(errorno); - } -
