download.lst | 4
external/libxml2/0001-ofz-70675-XML_ERR_FATAL-not-ending-parse.patch.0 | 47
----------
external/libxml2/UnpackedTarball_libxml2.mk | 1
3 files changed, 2 insertions(+), 50 deletions(-)
New commits:
commit d500848976b6244048684a9972322b582559910a
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Sep 18 15:54:25 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Sep 18 22:28:46 2024 +0200
libxml2: upgrade to 2.13.4
* 0001-ofz-70675-XML_ERR_FATAL-not-ending-parse.patch.0
is no longer needed. fixed upstream
Downloaded from
https://download-fallback.gnome.org/sources/libxml2/2.13/libxml2-2.13.4.tar.xz
Change-Id: I7d39940ad5b197b302c57110e147aef7d2b911d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173621
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 58080ac9239a..e5ebd3f3077d 100644
--- a/download.lst
+++ b/download.lst
@@ -459,8 +459,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.5.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBXML_SHA256SUM :=
0805d7c180cf09caad71666c7a458a74f041561a532902454da5047d83948138
-LIBXML_VERSION_MICRO := 3
+LIBXML_SHA256SUM :=
65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650
+LIBXML_VERSION_MICRO := 4
LIBXML_TARBALL := libxml2-2.13.$(LIBXML_VERSION_MICRO).tar.xz
# three static lines
# so that git cherry-pick
diff --git
a/external/libxml2/0001-ofz-70675-XML_ERR_FATAL-not-ending-parse.patch.0
b/external/libxml2/0001-ofz-70675-XML_ERR_FATAL-not-ending-parse.patch.0
deleted file mode 100644
index a7529e766b6e..000000000000
--- a/external/libxml2/0001-ofz-70675-XML_ERR_FATAL-not-ending-parse.patch.0
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3ef06fcb9ae55295a9df29b564ea9302809e12a7 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnho...@aevum.de>
-Date: Mon, 5 Aug 2024 14:58:37 +0200
-Subject: [PATCH] parser: Fix error handling after reaching limit
-
-Mark document as non-wellformed and stop parser even if error limit was
-reached.
-
-Regressed in abd74186.
-
-parser: Report at least one fatal error
----
- parserInternals.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/parserInternals.c b/parserInternals.c
-index 7700de39..eb13be7e 100644
---- parserInternals.c
-+++ parserInternals.c
-@@ -327,11 +327,13 @@ xmlCtxtVErr(xmlParserCtxtPtr ctxt, xmlNodePtr node,
xmlErrorDomain domain,
-
- if (level == XML_ERR_WARNING) {
- if (ctxt->nbWarnings >= XML_MAX_ERRORS)
-- return;
-+ goto done;
- ctxt->nbWarnings += 1;
- } else {
-- if (ctxt->nbErrors >= XML_MAX_ERRORS)
-- return;
-+ /* Report at least one fatal error. */
-+ if ((ctxt->nbErrors >= XML_MAX_ERRORS) &&
-+ ((level < XML_ERR_FATAL) || (ctxt->wellFormed == 0)))
-+ goto done;
- ctxt->nbErrors += 1;
- }
-
-@@ -382,6 +384,7 @@ xmlCtxtVErr(xmlParserCtxtPtr ctxt, xmlNodePtr node,
xmlErrorDomain domain,
- return;
- }
-
-+done:
- if (level >= XML_ERR_ERROR)
- ctxt->errNo = code;
- if (level == XML_ERR_FATAL) {
---
-2.45.1
-
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk
b/external/libxml2/UnpackedTarball_libxml2.mk
index de79de7c401b..489fb007572b 100644
--- a/external/libxml2/UnpackedTarball_libxml2.mk
+++ b/external/libxml2/UnpackedTarball_libxml2.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\
$(if $(filter
SOLARIS,$(OS)),external/libxml2/libxml2-global-symbols.patch) \
external/libxml2/libxml2-vc10.patch \
external/libxml2/libxml2-XMLCALL-redefine.patch.0 \
- external/libxml2/0001-ofz-70675-XML_ERR_FATAL-not-ending-parse.patch.0 \
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
$(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \
external/libxml2/libxml2-icu-sym.patch.0, \
