diff options
author | Daniel Engberg <diizzy@FreeBSD.org> | 2022-03-25 17:51:30 +0100 |
---|---|---|
committer | Daniel Engberg <diizzy@FreeBSD.org> | 2022-03-25 18:14:39 +0100 |
commit | a13ec21cd733f67a9fc0dc00ab45268bdc236246 (patch) | |
tree | fe360ea54d1db8b085f918e44e04f79271dff395 /textproc/libxml2/files/patch-git-02-13ad8736d294536da4cbcd70a96b0a2fbf47070c | |
parent | lang/crystal: fix broken base SSL usage (diff) |
textproc/libxml2: Update to 2.9.13 and migrate to CMake
Depend on ICU and (lib)readline to follow other distros
Changelog: https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.9.13
I'd like to thank both tcberner and mandree for reviewing,
suggesting improvements and helping out in general. I'd also like
thank antoine for doing exp-runs.
PR: 262288
Reviewed by: tcberner, mandree
Approved by: desktop (tcberner)
Differential Revision: https://reviews.freebsd.org/D34338
Exp-run by: antoine
Diffstat (limited to 'textproc/libxml2/files/patch-git-02-13ad8736d294536da4cbcd70a96b0a2fbf47070c')
-rw-r--r-- | textproc/libxml2/files/patch-git-02-13ad8736d294536da4cbcd70a96b0a2fbf47070c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/textproc/libxml2/files/patch-git-02-13ad8736d294536da4cbcd70a96b0a2fbf47070c b/textproc/libxml2/files/patch-git-02-13ad8736d294536da4cbcd70a96b0a2fbf47070c deleted file mode 100644 index 3bf47b75b3cc..000000000000 --- a/textproc/libxml2/files/patch-git-02-13ad8736d294536da4cbcd70a96b0a2fbf47070c +++ /dev/null @@ -1,46 +0,0 @@ -From 13ad8736d294536da4cbcd70a96b0a2fbf47070c Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Tue, 25 May 2021 10:55:25 +0200 -Subject: [PATCH] Fix regression in xmlNodeDumpOutputInternal - -Commit 85b1792e could cause additional whitespace if xmlNodeDump was -called with a non-zero starting level. ---- - xmlsave.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/xmlsave.c b/xmlsave.c -index aedbd5e7..489505f4 100644 ---- xmlsave.c -+++ xmlsave.c -@@ -890,6 +890,13 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) { - break; - - case XML_ELEMENT_NODE: -+ if ((cur != root) && (ctxt->format == 1) && -+ (xmlIndentTreeOutput)) -+ xmlOutputBufferWrite(buf, ctxt->indent_size * -+ (ctxt->level > ctxt->indent_nr ? -+ ctxt->indent_nr : ctxt->level), -+ ctxt->indent); -+ - /* - * Some users like lxml are known to pass nodes with a corrupted - * tree structure. Fall back to a recursive call to handle this -@@ -900,13 +907,6 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) { - break; - } - -- if ((ctxt->level > 0) && (ctxt->format == 1) && -- (xmlIndentTreeOutput)) -- xmlOutputBufferWrite(buf, ctxt->indent_size * -- (ctxt->level > ctxt->indent_nr ? -- ctxt->indent_nr : ctxt->level), -- ctxt->indent); -- - xmlOutputBufferWrite(buf, 1, "<"); - if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) { - xmlOutputBufferWriteString(buf, (const char *)cur->ns->prefix); --- -GitLab - |