rpms/compat-wxPythonGTK2/devel wxPython-python25.patch, NONE, 1.1 compat-wxPython.spec, 1.5, 1.6

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	compat-wxPython.spec 
Added Files:
	wxPython-python25.patch 
Log Message:

Fix for python 2.5


wxPython-python25.patch:

--- NEW FILE wxPython-python25.patch ---
--- wxPythonSrc-2.4.2.4/wxPython/src/helpers.cpp.BAD	2007-01-18 17:07:45.000000000 -0600
+++ wxPythonSrc-2.4.2.4/wxPython/src/helpers.cpp	2007-01-18 17:08:15.000000000 -0600
@@ -1657,7 +1657,7 @@
     }
 #else
     char* tmpPtr; int tmpSize;
-    if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) {
+    if (PyString_AsStringAndSize(source, &tmpPtr, (Py_ssize_t *)&tmpSize) == -1) {
         PyErr_SetString(PyExc_TypeError, "Unable to convert string");
         return NULL;
     }
@@ -1703,7 +1703,7 @@
     }
 #else
     char* tmpPtr; int tmpSize;
-    PyString_AsStringAndSize(source, &tmpPtr, &tmpSize);
+    PyString_AsStringAndSize(source, &tmpPtr, (Py_ssize_t *)&tmpSize);
     target = wxString(tmpPtr, tmpSize);
 #endif // wxUSE_UNICODE
 


Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/compat-wxPython.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compat-wxPython.spec	6 Jan 2007 03:32:04 -0000	1.5
+++ compat-wxPython.spec	18 Jan 2007 23:13:14 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -12,7 +12,7 @@
 Source0:        http://dl.sf.net/wxpython/wxPythonSrc-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		compat-wxPython-2.4.2.4-fixpango.patch
-
+Patch1:		wxPython-python25.patch
 BuildRequires:  compat-wxGTK2-devel >= 2.4.2, compat-wxGTK2-gl, pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  python-devel, mesa-libGLU-devel
@@ -30,6 +30,7 @@
 %prep
 %setup -q -n wxPythonSrc-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Just build the wxPython part, not all of wxWindows which we already have
@@ -66,6 +67,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Thu Jan 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-14
+- fix for python25
+
 * Fri Jan  5 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-13
 - rebuild for new python