diff options
| author | sno <sno@pkgsrc.org> | 2009-10-25 17:19:44 +0000 |
|---|---|---|
| committer | sno <sno@pkgsrc.org> | 2009-10-25 17:19:44 +0000 |
| commit | e4d37509d5a4bdf35af6374eda02cb46637f49a4 (patch) | |
| tree | a3e3bd90c82cf29b362aa689fb3c44c419cb213a /textproc/libxml2 | |
| parent | 3228bdecf6cb5772695ddaeba5625d550539038c (diff) | |
| download | pkgsrc-e4d37509d5a4bdf35af6374eda02cb46637f49a4.tar.gz | |
Add patch to fix compiler error 'operands have incompatible types'
Diffstat (limited to 'textproc/libxml2')
| -rw-r--r-- | textproc/libxml2/distinfo | 3 | ||||
| -rw-r--r-- | textproc/libxml2/patches/patch-ah | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index 0e6a8c810da..de9d34bfbf2 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -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-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177 SHA1 (patch-ae) = b9176919edbf3582cb24aff53f7c4f291e2b78c8 SHA1 (patch-ag) = e3848c7871e4da90c2c190d35b5396998a2bb143 +SHA1 (patch-ah) = 5cdb10502f7d41cbe2570d2cbd1c46d6a25f0394 diff --git a/textproc/libxml2/patches/patch-ah b/textproc/libxml2/patches/patch-ah new file mode 100644 index 00000000000..cd11a82ce74 --- /dev/null +++ b/textproc/libxml2/patches/patch-ah @@ -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); + } |