| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Thu, 23 Oct 2014 12:11:24 -0700 | |
| changeset 2166 | 7f088f5637d1 |
| permissions | -rw-r--r-- |
|
2166
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: upstream |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: will be part of next version |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001 |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
From: Daniel Veillard <[email protected]> |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
Date: Fri, 17 Oct 2014 17:13:41 +0800 |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
Subject: Revert "Missing initialization for the catalog module" |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
|
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7. |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
As this break xmlcatalog command |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
https://bugzilla.redhat.com/show_bug.cgi?id=1153753 |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
|
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
diff --git a/parser.c b/parser.c |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
index 1d93967..67c9dfd 100644 |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
--- a/parser.c |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+++ b/parser.c |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
|
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
#ifdef LIBXML_XPATH_ENABLED |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
xmlXPathInit(); |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
#endif |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
-#ifdef LIBXML_CATALOG_ENABLED |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
- xmlInitializeCatalog(); |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
-#endif |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
xmlParserInitialized = 1; |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
#ifdef LIBXML_THREAD_ENABLED |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
} |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
-- |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
cgit v0.10.1 |
|
7f088f5637d1
19875486 Upgrade libxml2 to version 2.9.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |