pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/libxml2 Add patch to fix compiler error 'oper...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfe7140f83aa
branches:  trunk
changeset: 400716:dfe7140f83aa
user:      sno <sno%pkgsrc.org@localhost>
date:      Sun Oct 25 17:19:44 2009 +0000

description:
Add patch to fix compiler error 'operands have incompatible types'

diffstat:

 textproc/libxml2/distinfo         |   3 ++-
 textproc/libxml2/patches/patch-ah |  24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r cba516c33719 -r dfe7140f83aa textproc/libxml2/distinfo
--- a/textproc/libxml2/distinfo Sun Oct 25 17:15:44 2009 +0000
+++ b/textproc/libxml2/distinfo Sun Oct 25 17:19:44 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.73 2009/10/21 14:55:32 drochner Exp $
+$NetBSD: distinfo,v 1.74 2009/10/25 17:19:44 sno Exp $
 
 SHA1 (libxml2-2.7.6.tar.gz) = b0f6bf8408e759ac4b8b9650005ee8adea911e1d
 RMD160 (libxml2-2.7.6.tar.gz) = 849ded7b61f88e75ef0dacf0e5647ce8ad951261
@@ -9,3 +9,4 @@
 SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
 SHA1 (patch-ae) = b9176919edbf3582cb24aff53f7c4f291e2b78c8
 SHA1 (patch-ag) = e3848c7871e4da90c2c190d35b5396998a2bb143
+SHA1 (patch-ah) = 5cdb10502f7d41cbe2570d2cbd1c46d6a25f0394
diff -r cba516c33719 -r dfe7140f83aa textproc/libxml2/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/libxml2/patches/patch-ah Sun Oct 25 17:19:44 2009 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ah,v 1.5 2009/10/25 17:19:44 sno Exp $
+
+Fixes compiler error "operands have incompatible types"
+
+--- relaxng.c.orig     2009-10-25 19:02:59.621179988 +0100
++++ relaxng.c  2009-10-25 19:03:31.920058072 +0100
+@@ -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 ? (const xmlChar *)"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, (const xmlChar *)"noname");
+                 } else {
+                     VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
+                 }



Home | Main Index | Thread Index | Old Index