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 67faecc0535023b600884375e042bfadf49a0ca5
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Mar 13 09:44:07 2025 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Mar 14 10:53:55 2025 +0100
libxslt: upgrade to 1.1.43
Downloaded from
https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.43.tar.xz
Change-Id: Iadab2934e3b1e8178a4912ef9a56c4a3c158c7ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182855
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182864
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 95dcf9b37e763d61ff08300820eed45216c0c6e1)
diff --git a/download.lst b/download.lst
index f7a1a609c1d5..349192e3cf15 100644
--- a/download.lst
+++ b/download.lst
@@ -357,8 +357,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 :=
85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb
-LIBXSLT_VERSION_MICRO := 42
+LIBXSLT_SHA256SUM :=
5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a
+LIBXSLT_VERSION_MICRO := 43
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 b11ee72bfe1a..6d34589ea71a 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.23))
+$(eval $(call
gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.24))
endif
endif # DISABLE_DYNLOADING
commit f8b1988ff1765652121b7a37bf5b6a1230e44c3c
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Jul 5 11:01:05 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Mar 14 10:53:30 2025 +0100
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 <xiscofa...@libreoffice.org>
Tested-by: Jenkins
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182863
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit d08fc71633e0c341718924db27576aeae2f3ea4c)
diff --git a/download.lst b/download.lst
index f77793c4456b..f7a1a609c1d5 100644
--- a/download.lst
+++ b/download.lst
@@ -357,8 +357,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 7d77ee70104e944588c371fd5c1453ccc9e63e0f
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Thu Jun 20 15:46:51 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Mar 14 10:53:19 2025 +0100
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/+/169288
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit dcaf9c147a1cfea268db49952171338555379794)
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 cf97e55159daee4f166bc9cd3ed77362390a28db
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Jun 20 12:22:55 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Mar 14 10:51:39 2025 +0100
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 <xiscofa...@libreoffice.org>
Tested-by: Jenkins
(cherry picked from commit 4eb9cde4db28616e0b0c9cd6825830ab7d2f3c96)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169147
(cherry picked from commit 63310b0eb7ef1c93118b0451366c895634330241)
diff --git a/download.lst b/download.lst
index 525883da9db9..f77793c4456b 100644
--- a/download.lst
+++ b/download.lst
@@ -357,8 +357,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 11c6dee8065e40339557932d2fdea7181917a805
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Jun 13 13:39:46 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Mar 14 10:51:20 2025 +0100
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 <xiscofa...@libreoffice.org>
(cherry picked from commit cdde0d59ac67cd9a26671822b02d04b07b2dd754)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168798
(cherry picked from commit 2260cb9b24563c39a416aecb54294cf0a18f7686)
diff --git a/download.lst b/download.lst
index 319022af8aac..525883da9db9 100644
--- a/download.lst
+++ b/download.lst
@@ -357,8 +357,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);
- }
-
