download.lst
| 4 -
external/libxml2/0001-parser-Fix-custom-SAX-parsers-without-cdataBlock-han.patch.1
| 37 ----------
external/libxml2/UnpackedTarball_libxml2.mk
| 1
external/libxml2/deprecated.patch.0
| 12 +--
4 files changed, 7 insertions(+), 47 deletions(-)
New commits:
commit dd6c9587497760ab981ca4906810e1cea547231d
Author: Xisco Fauli <[email protected]>
AuthorDate: Tue Jun 17 11:17:03 2025 +0200
Commit: Christian Lohmaier <[email protected]>
CommitDate: Fri Jun 27 13:01:20 2025 +0200
libxml2: upgrade to 2.14.4
* 0001-parser-Fix-custom-SAX-parsers-without-cdataBlock-han.patch.1
has been fixed upstream
Downloaded from
https://download.gnome.org/sources/libxml2/2.14/libxml2-2.14.4.tar.xz
Change-Id: Icd9ab0d96e8d9299716a16a967c424a565264d68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186609
Reviewed-by: Xisco Fauli <[email protected]>
Tested-by: Jenkins
Signed-off-by: Xisco Fauli <[email protected]>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186641
Reviewed-by: Christian Lohmaier <[email protected]>
diff --git a/download.lst b/download.lst
index 54d7e27d0581..c431f72a7d10 100644
--- a/download.lst
+++ b/download.lst
@@ -459,8 +459,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.6.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBXML_SHA256SUM :=
6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833
-LIBXML_VERSION_MICRO := 3
+LIBXML_SHA256SUM :=
24175ec30a97cfa86bdf9befb7ccf4613f8f4b2713c5103e0dd0bc9c711a2773
+LIBXML_VERSION_MICRO := 4
LIBXML_TARBALL := libxml2-2.14.$(LIBXML_VERSION_MICRO).tar.xz
# three static lines
# so that git cherry-pick
diff --git
a/external/libxml2/0001-parser-Fix-custom-SAX-parsers-without-cdataBlock-han.patch.1
b/external/libxml2/0001-parser-Fix-custom-SAX-parsers-without-cdataBlock-han.patch.1
deleted file mode 100644
index 5df7ad6726b7..000000000000
---
a/external/libxml2/0001-parser-Fix-custom-SAX-parsers-without-cdataBlock-han.patch.1
+++ /dev/null
@@ -1,37 +0,0 @@
-From 30375877d981be8ede8620b13c6928342d929b58 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <[email protected]>
-Date: Tue, 3 Jun 2025 15:50:54 +0200
-Subject: [PATCH] parser: Fix custom SAX parsers without cdataBlock handler
-
-Use characters handler if cdataBlock handler is NULL.
-
-Regressed with 57e4bbd8. Should fix #934.
----
- parser.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/parser.c b/parser.c
-index e6598413..c96c3bec 100644
---- a/parser.c
-+++ b/parser.c
-@@ -9502,12 +9502,11 @@ xmlParseCDSect(xmlParserCtxt *ctxt) {
- * OK the buffer is to be consumed as cdata.
- */
- if ((ctxt->sax != NULL) && (!ctxt->disableSAX)) {
-- if (ctxt->options & XML_PARSE_NOCDATA) {
-- if (ctxt->sax->characters != NULL)
-- ctxt->sax->characters(ctxt->userData, buf, len);
-- } else {
-- if (ctxt->sax->cdataBlock != NULL)
-- ctxt->sax->cdataBlock(ctxt->userData, buf, len);
-+ if ((ctxt->sax->cdataBlock != NULL) &&
-+ ((ctxt->options & XML_PARSE_NOCDATA) == 0)) {
-+ ctxt->sax->cdataBlock(ctxt->userData, buf, len);
-+ } else if (ctxt->sax->characters != NULL) {
-+ ctxt->sax->characters(ctxt->userData, buf, len);
- }
- }
-
---
-2.39.5
-
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk
b/external/libxml2/UnpackedTarball_libxml2.mk
index 6d63717d7875..223577f7c037 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
external/libxml2/libxml2-XMLCALL-redefine.patch.0 \
external/libxml2/makefile.msvc-entry-point.patch.0 \
external/libxml2/deprecated.patch.0 \
-
external/libxml2/0001-parser-Fix-custom-SAX-parsers-without-cdataBlock-han.patch.1
\
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
$(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \
external/libxml2/libxml2-icu-sym.patch.0, \
diff --git a/external/libxml2/deprecated.patch.0
b/external/libxml2/deprecated.patch.0
index 40f5e2392ca0..0fddc62679b4 100644
--- a/external/libxml2/deprecated.patch.0
+++ b/external/libxml2/deprecated.patch.0
@@ -10,7 +10,7 @@
XMLPUBVAR double xmlXPathPINF;
--- include/libxml/parser.h 2025-05-13 16:42:31.000000000 +0200
+++ include/libxml/parser.h 2025-06-03 14:00:37.833979131 +0200
-@@ -268,20 +268,20 @@
+@@ -268,7 +268,7 @@
/* Number of current input streams */
int inputNr;
/* Max number of input streams */
@@ -18,12 +18,10 @@
+ int inputMax;
/* stack of inputs */
xmlParserInputPtr *inputTab;
-
- /* Node analysis stack only used for DOM building */
-
+
+@@ -277,11 +277,11 @@
/* Current parsed Node */
-- xmlNodePtr node XML_DEPRECATED_MEMBER;
-+ xmlNodePtr node;
+ xmlNodePtr node;
/* Depth of the parsing stack */
- int nodeNr XML_DEPRECATED_MEMBER;
+ int nodeNr;
@@ -32,7 +30,7 @@
/* array of nodes */
- xmlNodePtr *nodeTab XML_DEPRECATED_MEMBER;
+ xmlNodePtr *nodeTab;
-
+
/* Whether node info should be kept */
int record_info;
@@ -374,7 +374,7 @@
