From 7db8f365fd869557bf7354916f5ee0dd45e7b88e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Thu, 17 Dec 2009 16:45:19 +0000
Subject: xmlsec1_2_14: #i107747#: track upstream bug id for this patch

---
 libxml2/libxml2-badcasts.patch    | 20 --------------------
 libxml2/libxml2-gnome599717.patch | 20 ++++++++++++++++++++
 libxml2/makefile.mk               |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 libxml2/libxml2-badcasts.patch
 create mode 100644 libxml2/libxml2-gnome599717.patch

diff --git a/libxml2/libxml2-badcasts.patch b/libxml2/libxml2-badcasts.patch
deleted file mode 100644
index cc6617d0e699..000000000000
--- a/libxml2/libxml2-badcasts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/libxml2-2.7.6/relaxng.c	2009-12-17 11:53:12.000000000 +0000
-+++ misc/build/libxml2-2.7.6/relaxng.c	2009-12-17 16:30:43.000000000 +0000
-@@ -5369,7 +5369,7 @@
-     } else {
-         xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
-                    "expecting name, anyName, nsName or choice : got %s\n",
--                   (node == NULL ? "nothing" : node->name), NULL);
-+                   (node == NULL ? BAD_CAST "nothing" : node->name), NULL);
-         return (NULL);
-     }
-     if (ret != def) {
-@@ -9459,7 +9459,7 @@
-             ctxt->states = NULL;
-             if (found == 0) {
-                 if (cur == NULL) {
--                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
-+                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, BAD_CAST "noname");
-                 } else {
-                     VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
-                 }
diff --git a/libxml2/libxml2-gnome599717.patch b/libxml2/libxml2-gnome599717.patch
new file mode 100644
index 000000000000..cc6617d0e699
--- /dev/null
+++ b/libxml2/libxml2-gnome599717.patch
@@ -0,0 +1,20 @@
+--- misc/libxml2-2.7.6/relaxng.c	2009-12-17 11:53:12.000000000 +0000
++++ misc/build/libxml2-2.7.6/relaxng.c	2009-12-17 16:30:43.000000000 +0000
+@@ -5369,7 +5369,7 @@
+     } else {
+         xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
+                    "expecting name, anyName, nsName or choice : got %s\n",
+-                   (node == NULL ? "nothing" : node->name), NULL);
++                   (node == NULL ? BAD_CAST "nothing" : node->name), NULL);
+         return (NULL);
+     }
+     if (ret != def) {
+@@ -9459,7 +9459,7 @@
+             ctxt->states = NULL;
+             if (found == 0) {
+                 if (cur == NULL) {
+-                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
++                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, BAD_CAST "noname");
+                 } else {
+                     VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
+                 }
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index abe051c210b1..43d3e02f8bf8 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -51,7 +51,7 @@ LIBXML2VERSION=2.7.6
 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
 PATCH_FILES=libxml2-configure.patch \
             libxml2-mingw.patch \
-            libxml2-badcasts.patch
+            libxml2-gnome599717.patch
 
 # This is only for UNX environment now
 
-- 
cgit