rpms/compat-wxPythonGTK2/devel compat-wxPython.spec, 1.6, 1.7 wxPython-python25.patch, 1.1, 1.2

[Tom Callaway (spot)]

Author: spot

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

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

more python25 fixes



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/compat-wxPython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- compat-wxPython.spec	18 Jan 2007 23:13:14 -0000	1.6
+++ compat-wxPython.spec	18 Jan 2007 23:48:50 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -67,6 +67,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Thu Jan 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-15
+- more python25 fixes
+
 * Thu Jan 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-14
 - fix for python25
 

wxPython-python25.patch:

Index: wxPython-python25.patch
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/wxPython-python25.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxPython-python25.patch	18 Jan 2007 23:13:14 -0000	1.1
+++ wxPython-python25.patch	18 Jan 2007 23:48:50 -0000	1.2
@@ -18,3 +18,69 @@
      target = wxString(tmpPtr, tmpSize);
  #endif // wxUSE_UNICODE
  
+--- wxPythonSrc-2.4.2.4/wxPython/src/gdi.i.BAD	2007-01-18 17:47:07.000000000 -0600
++++ wxPythonSrc-2.4.2.4/wxPython/src/gdi.i	2007-01-18 17:47:22.000000000 -0600
+@@ -164,7 +164,7 @@
+     wxBitmap* wxBitmapFromBits(PyObject* bits, int width, int height, int depth = 1 ) {
+         char* buf;
+         int   length;
+-        PyString_AsStringAndSize(bits, &buf, &length);
++        PyString_AsStringAndSize(bits, &buf, (Py_ssize_t *)&length);
+         return new wxBitmap(buf, width, height, depth);
+     }
+ 
+@@ -352,9 +352,9 @@
+         char* bitsbuf;
+         char* maskbuf = NULL;
+         int   length;
+-        PyString_AsStringAndSize(bits, &bitsbuf, &length);
++        PyString_AsStringAndSize(bits, &bitsbuf, (Py_ssize_t *)&length);
+         if (maskBits)
+-            PyString_AsStringAndSize(maskBits, &maskbuf, &length);
++            PyString_AsStringAndSize(maskBits, &maskbuf, (Py_ssize_t *)&length);
+         return new wxCursor(bitsbuf, width, height, hotSpotX, hotSpotY, maskbuf);
+     }
+ %}
+--- wxPythonSrc-2.4.2.4/wxPython/src/gtk/gdi.cpp.BAD	2007-01-18 17:45:50.000000000 -0600
++++ wxPythonSrc-2.4.2.4/wxPython/src/gtk/gdi.cpp	2007-01-18 17:46:19.000000000 -0600
+@@ -138,7 +138,7 @@
+     wxBitmap* wxBitmapFromBits(PyObject* bits, int width, int height, int depth = 1 ) {
+         char* buf;
+         int   length;
+-        PyString_AsStringAndSize(bits, &buf, &length);
++        PyString_AsStringAndSize(bits, &buf, (Py_ssize_t *)&length);
+         return new wxBitmap(buf, width, height, depth);
+     }
+ 
+@@ -194,9 +194,9 @@
+         char* bitsbuf;
+         char* maskbuf = NULL;
+         int   length;
+-        PyString_AsStringAndSize(bits, &bitsbuf, &length);
++        PyString_AsStringAndSize(bits, &bitsbuf, (Py_ssize_t *)&length);
+         if (maskBits)
+-            PyString_AsStringAndSize(maskBits, &maskbuf, &length);
++            PyString_AsStringAndSize(maskBits, &maskbuf, (Py_ssize_t *)&length);
+         return new wxCursor(bitsbuf, width, height, hotSpotX, hotSpotY, maskbuf);
+     }
+                                       // Alternate 'constructor'
+--- wxPythonSrc-2.4.2.4/wxPython/src/helpers.cpp.BAD	2007-01-18 17:38:46.000000000 -0600
++++ wxPythonSrc-2.4.2.4/wxPython/src/helpers.cpp	2007-01-18 17:39:11.000000000 -0600
+@@ -1652,7 +1652,7 @@
+     } else {
+         // It is a string, get pointers to it and transform to unicode
+         char* tmpPtr; int tmpSize;
+-        PyString_AsStringAndSize(source, &tmpPtr, &tmpSize);
++        PyString_AsStringAndSize(source, &tmpPtr, (Py_ssize_t *)&tmpSize);
+         target = new wxString(tmpPtr, *wxConvCurrent, tmpSize);
+     }
+ #else
+@@ -1698,7 +1698,7 @@
+     } else {
+         // It is a string, get pointers to it and transform to unicode
+         char* tmpPtr; int tmpSize;
+-        PyString_AsStringAndSize(source, &tmpPtr, &tmpSize);
++        PyString_AsStringAndSize(source, &tmpPtr, (Py_ssize_t *)&tmpSize);
+         target = wxString(tmpPtr, *wxConvCurrent, tmpSize);
+     }
+ #else