liblangtag/UnpackedTarball_langtag.mk | 4 ++++ liblangtag/liblangtag-0.4.0-xmlDocCopyNode.patch | 11 +++++++++++ 2 files changed, 15 insertions(+)
New commits: commit 08ac75fce3cffc0457455b56d6bf8ead285a0dde Author: Stephan Bergmann <[email protected]> Date: Thu Nov 22 18:56:58 2012 +0100 Use xmlDocCopyNode to merge nodes into different docs in liblangtag ...otherwise, at least an --enable-dbgutil --without-system-libxml build will issue warnings at soffice.bin exit, as liblangtag merged together docs with xmlCopyNode (instead of xmlDocCopyNode) and xmlAddChild, and libxml2's debugXML.c xmlCtxtCheckName then stumbles over the merged-in nodes whose strings do not belong to the dict of the doc they got merged into. Change-Id: I5d7889670b897cbeb9ca8a555d8f2d770a8ee692 diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk index f8adaa8..94e6b1b 100644 --- a/liblangtag/UnpackedTarball_langtag.mk +++ b/liblangtag/UnpackedTarball_langtag.mk @@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,langtag)) $(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ + liblangtag/liblangtag-0.4.0-xmlDocCopyNode.patch \ +)) + ifeq ($(OS),MACOSX) $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ liblangtag/liblangtag-0.4.0-mac.patch \ diff --git a/liblangtag/liblangtag-0.4.0-xmlDocCopyNode.patch b/liblangtag/liblangtag-0.4.0-xmlDocCopyNode.patch new file mode 100644 index 0000000..44b28d8 --- /dev/null +++ b/liblangtag/liblangtag-0.4.0-xmlDocCopyNode.patch @@ -0,0 +1,11 @@ +--- misc/liblangtag-0.4.0/liblangtag/lt-xml.c ++++ misc/build/liblangtag-0.4.0/liblangtag/lt-xml.c +@@ -292,7 +292,7 @@ _lt_xml_merge_keys(lt_xml_t *xml, + } + n = xmlXPathNodeSetGetLength(xobj->nodesetval); + for (i = 0; i < n; i++) { +- xmlNodePtr p = xmlCopyNode(xmlXPathNodeSetItem(xobj->nodesetval, i), 1); ++ xmlNodePtr p = xmlDocCopyNode(xmlXPathNodeSetItem(xobj->nodesetval, i), doc1, 1); + + xmlAddChild(parent_node, p); + } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
