[csw-devel] SF.net SVN: gar:[9196] csw/mgar/pkg/libxml2/trunk

[bdwalton at users.sourceforge.net]

Revision: 9196
          http://gar.svn.sourceforge.net/gar/?rev=9196&view=rev
Author:   bdwalton
Date:     2010-03-16 02:06:56 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
libxml2: drop patch that was accepted upstream

Modified Paths:
--------------
    csw/mgar/pkg/libxml2/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch

Modified: csw/mgar/pkg/libxml2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxml2/trunk/Makefile	2010-03-16 02:02:00 UTC (rev 9195)
+++ csw/mgar/pkg/libxml2/trunk/Makefile	2010-03-16 02:06:56 UTC (rev 9196)
@@ -10,7 +10,6 @@
 MASTER_SITES = ftp://xmlsoft.org/libxml2/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = ld-symbol-handling-fixup.patch
-PATCHFILES += 0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Deleted: csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch	2010-03-16 02:02:00 UTC (rev 9195)
+++ csw/mgar/pkg/libxml2/trunk/files/0001-relaxng.c-cast-to-allow-compilation-with-sun-studio-.patch	2010-03-16 02:06:56 UTC (rev 9196)
@@ -1,47 +0,0 @@
-From f2cee2dd783b6c71ea3d98ab9701b9b397753f0a Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at artsci.utoronto.ca>
-Date: Sat, 5 Dec 2009 13:32:49 -0500
-Subject: [PATCH] relaxng.c: cast to allow compilation with sun studio 11
-
-Sun Studio 11 was failing to compile relaxng.c due to a type mismatch
-in a ternary operator used to provide an argument to xmlRngPErr.  It
-seems that sos11 cc is more pedantic about this part of the C99
-standard.  GCC issues a warning but doesn't fail by default.
-
-After casting the string literal "nothing" to (const xmlChar *) sos11
-cc is happy.  GCC no longer issues a warning either.
-
-Another warning was cleaned up with an identical cast.
-
-Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
----
- relaxng.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/relaxng.c b/relaxng.c
-index 075fc4a..6dbc499 100644
---- a/relaxng.c
-+++ b/relaxng.c
-@@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
-     } 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 +9460,8 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt,
-             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);
-                 }
--- 
-1.6.5.3
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.