Updated patch for building on amd64 with python-2.5, closing bug #254387

(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64)

3 files changed, 68 insertions, 3 deletions

diff --git a/dev-python/pyfltk/ChangeLog b/dev-python/pyfltk/ChangeLog
index a91f2ff2e516..65a593ad509c 100644
--- a/dev-python/pyfltk/ChangeLog
+++ b/dev-python/pyfltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyfltk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.7 2009/01/09 23:35:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.8 2009/01/10 12:42:26 bicatali Exp $
+
+  10 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/pyfltk-1.1.3-python25.patch, pyfltk-1.1.3.ebuild:
+  Updated patch for building on amd64 with python-2.5, closing bug #254387
 
 *pyfltk-1.1.3 (09 Jan 2009)
 
diff --git a/dev-python/pyfltk/files/pyfltk-1.1.3-python25.patch b/dev-python/pyfltk/files/pyfltk-1.1.3-python25.patch
new file mode 100644
index 000000000000..32bafdea5b87
--- /dev/null
+++ b/dev-python/pyfltk/files/pyfltk-1.1.3-python25.patch
@@ -0,0 +1,61 @@
+diff -Nur swig.orig/Fl_Bitmap.i swig/Fl_Bitmap.i
+--- swig.orig/Fl_Bitmap.i	2008-10-22 10:58:49.000000000 +0100
++++ swig/Fl_Bitmap.i	2009-01-10 12:37:38.000000000 +0000
+@@ -13,7 +13,7 @@
+ 
+ %typemap(in) const uchar *bits {
+     /* Check if the input support the buffer protocol */
+-    int size_buffer;
++    Py_ssize_t size_buffer;
+     const void * buffer;
+     int failure = PyObject_AsReadBuffer($input,&buffer,&size_buffer);
+     if (!failure) {
+diff -Nur swig.orig/fl_draw.i swig/fl_draw.i
+--- swig.orig/fl_draw.i	2008-10-22 10:58:49.000000000 +0100
++++ swig/fl_draw.i	2009-01-10 12:37:38.000000000 +0000
+@@ -9,7 +9,7 @@
+ 
+ %typemap(in) const uchar * {
+        /* Check if the input support the buffer protocol */
+-       int size_buffer;
++       Py_ssize_t size_buffer;
+        const void * buffer;
+        int failure = PyObject_AsReadBuffer($input,&buffer,&size_buffer);
+        if (!failure) {
+diff -Nur swig.orig/Fl_Gl_Window.i swig/Fl_Gl_Window.i
+--- swig.orig/Fl_Gl_Window.i	2008-10-22 10:58:49.000000000 +0100
++++ swig/Fl_Gl_Window.i	2009-01-10 12:37:38.000000000 +0000
+@@ -59,7 +59,8 @@
+ void Fl_Gl_Window::drawPixels(PyObject *rgb_py) {
+ 
+     char *rgb;
+-    int len, i, height=self->h(), halfheight=self->h()/2, rowsize=self->w()*3;
++    Py_ssize_t len;
++    int i, height=self->h(), halfheight=self->h()/2, rowsize=self->w()*3;
+     char *row0, *row1;
+ 
+     char tmp[rowsize];
+diff -Nur swig.orig/Fl_Image.i swig/Fl_Image.i
+--- swig.orig/Fl_Image.i	2008-10-22 10:58:49.000000000 +0100
++++ swig/Fl_Image.i	2009-01-10 12:37:38.000000000 +0000
+@@ -23,7 +23,7 @@
+ 
+ %typemap(in) const uchar *bits {
+     /* Check if the input support the buffer protocol */
+-  int size_buffer;
++  Py_ssize_t size_buffer;
+   const void * buffer;
+   int failure = PyObject_AsReadBuffer($input,&buffer,&size_buffer);
+   if (!failure) {
+diff -Nur swig.orig/gl.i swig/gl.i
+--- swig.orig/gl.i	2008-10-22 10:58:49.000000000 +0100
++++ swig/gl.i	2009-01-10 12:37:38.000000000 +0000
+@@ -49,7 +49,7 @@
+ 
+ %typemap(in) const uchar * {
+     /* Check if the input support the buffer protocol */
+-  int size_buffer;
++  Py_ssize_t size_buffer;
+   const void * buffer;
+   int failure = PyObject_AsReadBuffer($input,&buffer,&size_buffer);
+   if (!failure) {
diff --git a/dev-python/pyfltk/pyfltk-1.1.3.ebuild b/dev-python/pyfltk/pyfltk-1.1.3.ebuild
index d7cee4bb277d..421dba1a8aea 100644
--- a/dev-python/pyfltk/pyfltk-1.1.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.3.ebuild,v 1.1 2009/01/09 23:35:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.3.ebuild,v 1.2 2009/01/10 12:42:26 bicatali Exp $
 
 EAPI=2
 
@@ -29,7 +29,7 @@ DOCS="CHANGES"
 
 src_prepare() {
 	distutils_python_version
-	[[ "${PYVER}" != 2.4 ]] && epatch "${FILESDIR}"/${PN}-1.1.2-python25.patch
+	[[ "${PYVER}" != 2.4 ]] && epatch "${FILESDIR}"/${P}-python25.patch
 	rm -f python/fltk*
 	# move docs because the swig stuff will remove them
 	use doc && cp -r fltk fltk.docs