sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libxml2: add patch to work around biber issue

Browse Source 
Fixes https://github.com/termux/termux-packages/issues/5638.
This commit is contained in:
Henrik Grimler 2020-11-17 22:26:42 +01:00
parent 358db8a65a
commit f574eaf996
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/libxml2/build.sh
View File

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.xmlsoft.org
TERMUX_PKG_DESCRIPTION="Library for parsing XML documents" TERMUX_PKG_DESCRIPTION="Library for parsing XML documents"
TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_VERSION=2.9.10 TERMUX_PKG_VERSION=2.9.10
TERMUX_PKG_REVISION=3 TERMUX_PKG_REVISION=4
TERMUX_PKG_SRCURL=ftp://xmlsoft.org/libxml2/libxml2-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=ftp://xmlsoft.org/libxml2/libxml2-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f TERMUX_PKG_SHA256=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python"

63
packages/libxml2/revert-Make-xmlFreeNodeList-non-recursive.patch Normal file
View File

@ -0,0 +1,63 @@
This is a revert of
https://github.com/GNOME/libxml2/commit/0762c9b69ba01628f72eada1c64ff3d361fb5716
This fixes perl-xml-libxslt test suite
https://bugzilla.suse.com/show_bug.cgi?id=1157450
diff --git a/tree.c b/tree.c
index 08b1a50..f2b1457 100644
--- a/tree.c
+++ b/tree.c
@@ -3664,9 +3664,7 @@ xmlNextElementSibling(xmlNodePtr node) {
void
xmlFreeNodeList(xmlNodePtr cur) {
xmlNodePtr next;
- xmlNodePtr parent;
xmlDictPtr dict = NULL;
- size_t depth = 0;
if (cur == NULL) return;
if (cur->type == XML_NAMESPACE_DECL) {
@@ -3682,21 +3680,16 @@ xmlFreeNodeList(xmlNodePtr cur) {
return;
}
if (cur->doc != NULL) dict = cur->doc->dict;
- while (1) {
- while ((cur->children != NULL) &&
- (cur->type != XML_DTD_NODE) &&
- (cur->type != XML_ENTITY_REF_NODE)) {
- cur = cur->children;
- depth += 1;
- }
-
+ while (cur != NULL) {
next = cur->next;
- parent = cur->parent;
if (cur->type != XML_DTD_NODE) {
if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
xmlDeregisterNodeDefaultValue(cur);
+ if ((cur->children != NULL) &&
+ (cur->type != XML_ENTITY_REF_NODE))
+ xmlFreeNodeList(cur->children);
if (((cur->type == XML_ELEMENT_NODE) ||
(cur->type == XML_XINCLUDE_START) ||
(cur->type == XML_XINCLUDE_END)) &&
@@ -3727,15 +3720,6 @@ xmlFreeNodeList(xmlNodePtr cur) {
DICT_FREE(cur->name)
xmlFree(cur);
}
-
- if (next != NULL) {
- cur = next;
- } else {
- if ((depth == 0) || (parent == NULL))
- break;
- depth -= 1;
- cur = parent;
- cur->children = NULL;
- }
+ cur = next;
}
}