[Python-modules-commits] r8429 - in packages/pyfltk/trunk/debian (3 files)

dktrkranz-guest at users.alioth.debian.org dktrkranz-guest at users.alioth.debian.org
Tue May 12 19:41:22 UTC 2009


    Date: Tuesday, May 12, 2009 @ 19:41:21
  Author: dktrkranz-guest
Revision: 8429

Remove patches applied upstream

Modified:
  packages/pyfltk/trunk/debian/changelog
  packages/pyfltk/trunk/debian/patches/series
Deleted:
  packages/pyfltk/trunk/debian/patches/Py_ssize_t

Modified: packages/pyfltk/trunk/debian/changelog
===================================================================
--- packages/pyfltk/trunk/debian/changelog	2009-05-12 19:33:47 UTC (rev 8428)
+++ packages/pyfltk/trunk/debian/changelog	2009-05-12 19:41:21 UTC (rev 8429)
@@ -4,9 +4,11 @@
   * Refresh patches for new upstream release:
     - debian/patches/no_docs
     - debian/patches/force_opengl_support
+  * Remove patches applied upstream:
+    - debian/patches/Py_ssize_t
   * Add Provides: ${python:Provides} field.
 
- -- Luca Falavigna <dktrkranz at ubuntu.com>  Tue, 12 May 2009 21:34:43 +0200
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Tue, 12 May 2009 21:35:26 +0200
 
 pyfltk (1.1.3-1) unstable; urgency=low
 

Deleted: packages/pyfltk/trunk/debian/patches/Py_ssize_t
===================================================================
--- packages/pyfltk/trunk/debian/patches/Py_ssize_t	2009-05-12 19:33:47 UTC (rev 8428)
+++ packages/pyfltk/trunk/debian/patches/Py_ssize_t	2009-05-12 19:41:21 UTC (rev 8429)
@@ -1,70 +0,0 @@
-Make some variables be Py_ssize_t instead of int, fix FTBFS on 64bit systems.
-
-Index: pyfltk-1.1.3/python/fltk_wrap.cpp
-===================================================================
---- pyfltk-1.1.3.orig/python/fltk_wrap.cpp	2008-10-27 10:15:29.000000000 +0100
-+++ pyfltk-1.1.3/python/fltk_wrap.cpp	2009-03-11 09:17:46.000000000 +0100
-@@ -5138,7 +5138,8 @@
- SWIGINTERN void Fl_Gl_Window_drawPixels(Fl_Gl_Window *self,PyObject *rgb_py){
- 
-     char *rgb;
--    int len, i, height=self->h(), halfheight=self->h()/2, rowsize=self->w()*3;
-+    int i, height=self->h(), halfheight=self->h()/2, rowsize=self->w()*3;
-+    Py_ssize_t len;
-     char *row0, *row1;
- 
-     char tmp[rowsize];
-@@ -39856,7 +39857,7 @@
-   arg1 = obj0;
-   {
-     /* Check if the input support the buffer protocol */
--    int size_buffer;
-+    Py_ssize_t size_buffer;
-     const void * buffer;
-     int failure = PyObject_AsReadBuffer(obj1,&buffer,&size_buffer);
-     if (!failure) {
-@@ -40509,7 +40510,7 @@
-   arg1 = obj0;
-   {
-     /* Check if the input support the buffer protocol */
--    int size_buffer;
-+    Py_ssize_t size_buffer;
-     const void * buffer;
-     int failure = PyObject_AsReadBuffer(obj1,&buffer,&size_buffer);
-     if (!failure) {
-@@ -55536,7 +55537,7 @@
-   if(!PyArg_UnpackTuple(args,(char *)"fl_draw_image",5,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
-   {
-     /* Check if the input support the buffer protocol */
--    int size_buffer;
-+    Py_ssize_t size_buffer;
-     const void * buffer;
-     int failure = PyObject_AsReadBuffer(obj0,&buffer,&size_buffer);
-     if (!failure) {
-@@ -55644,7 +55645,7 @@
-   if(!PyArg_UnpackTuple(args,(char *)"fl_draw_image_mono",5,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
-   {
-     /* Check if the input support the buffer protocol */
--    int size_buffer;
-+    Py_ssize_t size_buffer;
-     const void * buffer;
-     int failure = PyObject_AsReadBuffer(obj0,&buffer,&size_buffer);
-     if (!failure) {
-@@ -59783,7 +59784,7 @@
-   arg3 = static_cast< int >(val3);
-   {
-     /* Check if the input support the buffer protocol */
--    int size_buffer;
-+    Py_ssize_t size_buffer;
-     const void * buffer;
-     int failure = PyObject_AsReadBuffer(obj3,&buffer,&size_buffer);
-     if (!failure) {
-@@ -63120,7 +63121,7 @@
-   if(!PyArg_UnpackTuple(args,(char *)"gl_draw_image",5,7,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
-   {
-     /* Check if the input support the buffer protocol */
--    int size_buffer;
-+    Py_ssize_t size_buffer;
-     const void * buffer;
-     int failure = PyObject_AsReadBuffer(obj0,&buffer,&size_buffer);
-     if (!failure) {

Modified: packages/pyfltk/trunk/debian/patches/series
===================================================================
--- packages/pyfltk/trunk/debian/patches/series	2009-05-12 19:33:47 UTC (rev 8428)
+++ packages/pyfltk/trunk/debian/patches/series	2009-05-12 19:41:21 UTC (rev 8429)
@@ -1,3 +1,2 @@
 no_docs
 force_opengl_support
-Py_ssize_t




More information about the Python-modules-commits mailing list