rpms/compat-wxGTK26/devel wxGTK-2.6.3-expat2.patch,1.1,1.2

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Tue Aug 28 10:21:11 UTC 2007


Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17607

Modified Files:
	wxGTK-2.6.3-expat2.patch 
Log Message:
expat2 returns at least unsigned long, not just unsigned

wxGTK-2.6.3-expat2.patch:

Index: wxGTK-2.6.3-expat2.patch
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/wxGTK-2.6.3-expat2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxGTK-2.6.3-expat2.patch	28 Aug 2007 09:58:52 -0000	1.1
+++ wxGTK-2.6.3-expat2.patch	28 Aug 2007 10:21:08 -0000	1.2
@@ -1,12 +1,15 @@
 diff -Nur wxGTK-2.6.3-orig/src/xml/xml.cpp wxGTK-2.6.3/src/xml/xml.cpp
 --- wxGTK-2.6.3-orig/src/xml/xml.cpp	2006-03-22 00:42:05.000000000 +0100
-+++ wxGTK-2.6.3/src/xml/xml.cpp	2007-08-28 11:57:10.000000000 +0200
-@@ -559,7 +559,7 @@
++++ wxGTK-2.6.3/src/xml/xml.cpp	2007-08-28 12:20:28.000000000 +0200
+@@ -559,9 +559,9 @@
          {
              wxString error(XML_ErrorString(XML_GetErrorCode(parser)),
                             *wxConvCurrent);
 -            wxLogError(_("XML parsing error: '%s' at line %d"),
-+            wxLogError(_("XML parsing error: '%s' at line %u"),
++            wxLogError(_("XML parsing error: '%s' at line %lu"),
                         error.c_str(),
-                        XML_GetCurrentLineNumber(parser));
+-                       XML_GetCurrentLineNumber(parser));
++                       (long unsigned int)XML_GetCurrentLineNumber(parser));
              ok = false;
+             break;
+         }




More information about the fedora-extras-commits mailing list