rpms/compat-wxGTK26/devel wxGTK-2.6.4-filename-491779.patch, NONE, 1.1 compat-wxGTK26.spec, 1.17, 1.18

[Michael Schwendt]

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701

Modified Files:
	compat-wxGTK26.spec 
Added Files:
	wxGTK-2.6.4-filename-491779.patch 
Log Message:
* Tue Mar 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.4-6
- ambiguity resolution for wxString operator[] usage in wx/filename.h
  (#491779)


wxGTK-2.6.4-filename-491779.patch:

--- NEW FILE wxGTK-2.6.4-filename-491779.patch ---
diff -Nur wxGTK-2.6.4-orig/include/wx/filename.h wxGTK-2.6.4/include/wx/filename.h
--- wxGTK-2.6.4-orig/include/wx/filename.h	2007-03-20 16:49:59.000000000 +0100
+++ wxGTK-2.6.4/include/wx/filename.h	2009-03-24 10:57:08.000000000 +0100
@@ -348,7 +348,7 @@
 
     // get the canonical path separator for this format
     static wxChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE)
-        { return GetPathSeparators(format)[0u]; }
+    { return GetPathSeparators(format)[int(0)]; }
 
     // is the char a path separator for this format?
     static bool IsPathSeparator(wxChar ch, wxPathFormat format = wxPATH_NATIVE);


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- compat-wxGTK26.spec	24 Feb 2009 08:39:54 -0000	1.17
+++ compat-wxGTK26.spec	24 Mar 2009 10:19:56 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           compat-wxGTK26
 Version:        2.6.4
-Release:        5
+Release:        6
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -16,6 +16,7 @@
 Patch5:         wxGTK-2.6.3-expat2.patch
 Patch6:         wxGTK-2.6.3-strconv.patch
 Patch7:         wxGTK-2.6.4-config-script.patch
+Patch8:         wxGTK-2.6.4-filename-491779.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -54,6 +55,7 @@
 %patch5 -p1 -b .expat2
 %patch6 -p1 -b .strconv
 %patch7 -p1 -b .config-script
+%patch8 -p1 -b .filename-491779
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' configure
 
@@ -165,6 +167,10 @@
 
 
 %changelog
+* Tue Mar 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.4-6
+- ambiguity resolution for wxString operator[] usage in wx/filename.h
+  (#491779)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild