From fccd80a7d35b9eefabcc384d5c9fe89d9545dd22 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Tue, 22 Sep 2015 16:23:21 +0800 Subject: Upstream post release cherry-picks --- ...ing-initialization-for-the-catalog-module.patch | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 debian/patches/0003-Revert-Missing-initialization-for-the-catalog-module.patch (limited to 'debian/patches/0003-Revert-Missing-initialization-for-the-catalog-module.patch') diff --git a/debian/patches/0003-Revert-Missing-initialization-for-the-catalog-module.patch b/debian/patches/0003-Revert-Missing-initialization-for-the-catalog-module.patch new file mode 100644 index 0000000..d04a773 --- /dev/null +++ b/debian/patches/0003-Revert-Missing-initialization-for-the-catalog-module.patch @@ -0,0 +1,25 @@ +From: Daniel Veillard +Date: Fri, 17 Oct 2014 17:13:41 +0800 +Subject: Revert "Missing initialization for the catalog module" + +This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7. +As this break xmlcatalog command +https://bugzilla.redhat.com/show_bug.cgi?id=1153753 +--- + parser.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/parser.c b/parser.c +index 1d93967..67c9dfd 100644 +--- a/parser.c ++++ b/parser.c +@@ -14830,9 +14830,6 @@ xmlInitParser(void) { + #ifdef LIBXML_XPATH_ENABLED + xmlXPathInit(); + #endif +-#ifdef LIBXML_CATALOG_ENABLED +- xmlInitializeCatalog(); +-#endif + xmlParserInitialized = 1; + #ifdef LIBXML_THREAD_ENABLED + } -- cgit v1.2.3