r44259 - in /packages/kwwidgets/trunk/debian/patches: series vtk58pythonwrapping.patch

[malat-guest at users.alioth.debian.org]

Author: malat-guest
Date: Wed Dec 28 12:26:06 2011
New Revision: 44259

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44259
Log:
Disable python code

Modified:
    packages/kwwidgets/trunk/debian/patches/series
    packages/kwwidgets/trunk/debian/patches/vtk58pythonwrapping.patch

Modified: packages/kwwidgets/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/series?rev=44259&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/series (original)
+++ packages/kwwidgets/trunk/debian/patches/series Wed Dec 28 12:26:06 2011
@@ -1,3 +1,3 @@
 50_all_patches.diff
+fixtest.patch
 vtk58pythonwrapping.patch
-fixtest.patch

Modified: packages/kwwidgets/trunk/debian/patches/vtk58pythonwrapping.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/vtk58pythonwrapping.patch?rev=44259&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/vtk58pythonwrapping.patch (original)
+++ packages/kwwidgets/trunk/debian/patches/vtk58pythonwrapping.patch Wed Dec 28 12:26:06 2011
@@ -1,7 +1,8 @@
-diff -ru kwwidgets-1.0.0~cvs20100930/Wrapping/Python/KWWidgetsPythonExtraInit.cxx old/Wrapping/Python/KWWidgetsPythonExtraInit.cxx
---- kwwidgets-1.0.0~cvs20100930/Wrapping/Python/KWWidgetsPythonExtraInit.cxx	2006-08-24 16:36:24.000000000 +0200
-+++ old/Wrapping/Python/KWWidgetsPythonExtraInit.cxx	2011-12-09 12:37:26.000000000 +0100
-@@ -87,7 +87,7 @@
+Index: kwwidgets-1.0.0~cvs20100930/Wrapping/Python/KWWidgetsPythonExtraInit.cxx
+===================================================================
+--- kwwidgets-1.0.0~cvs20100930.orig/Wrapping/Python/KWWidgetsPythonExtraInit.cxx	2011-12-28 11:47:50.000000000 +0000
++++ kwwidgets-1.0.0~cvs20100930/Wrapping/Python/KWWidgetsPythonExtraInit.cxx	2011-12-28 12:14:55.000000000 +0000
+@@ -87,7 +88,7 @@
  #endif /* defined(_WIN32) */
  
  // change the old "init" function into a pre-init function
@@ -10,7 +11,73 @@
  #define initKWWidgetsPython preInitKWWidgetsPython
  
  // include the original init file
-@@ -563,7 +563,11 @@
+@@ -102,6 +103,7 @@
+ //----------------------------------------------------------------------------
+ static PyObject *PyvtkKWObject_Script(PyObject *self, PyObject *args)
+ {
++#if (VTK_MAJOR_VERSION < 5) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION < 8 )
+   char          *input;
+   const char    *output;
+   vtkKWObject   *op;
+@@ -176,11 +178,15 @@
+     Py_DECREF(args);
+     }
+ 
++#else
++  // VTK 5.8 and above
++#endif
+   return NULL;
+ }
+ 
+ static PyObject *PyvtkKWApplication_Script(PyObject *self, PyObject *args)
+ {
++#if (VTK_MAJOR_VERSION < 5) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION < 8 )
+   char          *input;
+   const char    *output;
+   vtkKWApplication *op;
+@@ -254,12 +260,15 @@
+     Py_DECREF(args);
+     }
+ 
++#else
++#endif
+   return NULL;
+ }
+ 
+ static PyObject *PyvtkKWApplication_EvaluateBooleanExpression(PyObject *self,
+                                                               PyObject *args)
+ {
++#if (VTK_MAJOR_VERSION < 5) || (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION < 8)
+   char          *input;
+   long          output;
+   vtkKWApplication *op;
+@@ -325,6 +334,8 @@
+     Py_DECREF(args);
+     }
+ 
++#else
++#endif
+   return NULL;
+ }
+ 
+@@ -424,6 +435,7 @@
+ 
+ static PyObject *PyvtkKWApplication_Start(PyObject *self, PyObject *args)
+ {
++#if (VTK_MAJOR_VERSION < 5) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION < 8 )
+   /* handle signature with no arguments */
+   {
+   vtkKWApplication *op;
+@@ -507,6 +519,8 @@
+       }
+     }
+   }
++#else
++#endif
+   return NULL;
+ }
+ 
+@@ -563,7 +577,11 @@
  #endif /* defined(_WIN32) && !defined(__CYGWIN__) */
  {
    // call init function from KWWidgetsPythonInit.cxx