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

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 74 insertions, 8 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/Manifest b/dev-python/pyfltk/Manifest
index 2e3fee51e389..aec79abc08fd 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX pyfltk-1.1.2-python25.patch 1196 RMD160 3ec496ef68d1395018729159d6c122a93c6f5c3f SHA1 d3ea33ce311e345d63e306682ed2311f77d0774a SHA256 3d5d1efce1186e13aa3d3857d8405bff2ebcf1961bd28b2d384206faa558a288
+AUX pyfltk-1.1.3-python25.patch 2237 RMD160 ccdc385194034605702a9eff7918604b4f3b0778 SHA1 3d9c4bb3ca5cfcbc657ae689b38d08745a95ee68 SHA256 9da747d8495a745a806b5677f483b678f06a489bece367c0843e7c2e588c5764
 DIST pyFltk-1.1.2.tar.gz 810018 RMD160 1967f75b6d3c8dc946caf5a6b2d8ad17893167fb SHA1 b1b696404681e1c8dbc73686ac0567b54dec4d37 SHA256 a52f78a18b1b6d5d2cff6ca836846b0ca2561dd07dc0ed9f4bf25eed632fa9ca
 DIST pyFltk-1.1.3.tar.gz 862106 RMD160 0f5d430b48e487c7a52eb946bfa076ba84a304ad SHA1 cc581b5a2a432579a7c4434cddb7c50293152d07 SHA256 9ce2a8112ad7ead6c4d2bc15b66573becb6f6f0ed9a150dc84bd2c5ad6a2208d
 DIST pyfltkmanual.pdf 206137 RMD160 ea55c11127e41e3617ff86fe44ef3097f6fe4ad9 SHA1 672003a9d44b285a79a7172b2e498047da7c74fd SHA256 17a4806e6a0f75f0b458ceca1cfa6d8738cee2f1fb2d092aa5bd83882f9dd122
 EBUILD pyfltk-1.1.2.ebuild 1316 RMD160 a8851935195d4bd7af504ba7ed76345f0063d189 SHA1 8bb42f0bade3767b8a4f6009943d2b46e858ceb5 SHA256 08e249498b1689f354065e24dadb2a8b7e97eaaa7a5f322a87ac045ce7ce254a
-EBUILD pyfltk-1.1.3.ebuild 1324 RMD160 d37eb4e6927b7bac043d3d1dcb4a172a33f07d2e SHA1 824f42f2a25a64f887213e9e64030db7a33ced88 SHA256 ff0c266d2f43dba133c4762931f6b3537565e9003128274c7d4c92eb62f57648
-MISC ChangeLog 1121 RMD160 dda6835b2ac2f5c6e829ee5c72bfab16936a0f3c SHA1 9534898fa252cd2eeb5721def2e6604b8f2e4b33 SHA256 a0c6b1100313c45435bb58badeadc2c75463152479ecf1aba268421273903cc5
+EBUILD pyfltk-1.1.3.ebuild 1317 RMD160 4e849e9474b492a34fa1baf1ba3ecf7030d8364a SHA1 a2e1c2373c61480a31b4476ae95d861bc152717c SHA256 ce45b5694b1094a1f441d6311a1e1a6b2d887208a482ee5351c09952c593abb0
+MISC ChangeLog 1311 RMD160 cc101f059fd92ee5f965793bd4c1a5bb95cb41fe SHA1 af6047c3be8544cca1918b659d58111b3eaa953f SHA256 540c73ecb71a5ca81b39dcf08b1ae1ecc8147008c133af50b2adba11f98e3247
 MISC metadata.xml 366 RMD160 cbd50a23e840b5440edb6f6d10a12920e629bb90 SHA1 4cd72c6c215a44f9d58fab5fafea709c4449f88c SHA256 33c14f0672891df32de325f73ca9d69e535c6167536b69a6a49fc242f9052d4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkln3zQACgkQ1ycZbhPLE2Dz9QCgkLltq82VpQf5jii//+rnxr7P
-x74AmgNgumQIsmNXS76LLbUPJnT7RQHz
-=AEOA
+iEYEARECAAYFAklol7sACgkQ1ycZbhPLE2BLYACdHiWH/P/5srU0+JyNu5OsTlWm
+3pEAoJ4JzTBY7DbLUOEY1X/9Umpot6j/
+=HCh+
 -----END PGP SIGNATURE-----
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