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

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

Author: malat-guest
Date: Fri Dec  9 11:46:18 2011
New Revision: 44110

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44110
Log:
Start working with VTK 5.8.0

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

Modified: packages/kwwidgets/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/changelog?rev=44110&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/changelog (original)
+++ packages/kwwidgets/trunk/debian/changelog Fri Dec  9 11:46:18 2011
@@ -4,6 +4,7 @@
   * Remove dot wrapper. Not required anymore since doxygen 1.7.4
   * Export graphics as SVG, reducing package size by factor of 3.
   * Standards-Version: 3.9.2. No changes needed
+  * Fix compilation with VTK 5.8.0
 
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 22 Nov 2011 19:31:26 +0100
 

Modified: packages/kwwidgets/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/series?rev=44110&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/series (original)
+++ packages/kwwidgets/trunk/debian/patches/series Fri Dec  9 11:46:18 2011
@@ -1,1 +1,2 @@
 50_all_patches.diff
+vtk58pythonwrapping.patch

Added: packages/kwwidgets/trunk/debian/patches/vtk58pythonwrapping.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/vtk58pythonwrapping.patch?rev=44110&op=file
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/vtk58pythonwrapping.patch (added)
+++ packages/kwwidgets/trunk/debian/patches/vtk58pythonwrapping.patch Fri Dec  9 11:46:18 2011
@@ -1,0 +1,24 @@
+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 @@
+ #endif /* defined(_WIN32) */
+ 
+ // change the old "init" function into a pre-init function
+-#define initlibKWWidgetsPython preInitKWWidgetsPython
++#define initlibKWWidgetsPython preInitlibKWWidgetsPython
+ #define initKWWidgetsPython preInitKWWidgetsPython
+ 
+ // include the original init file
+@@ -563,7 +563,11 @@
+ #endif /* defined(_WIN32) && !defined(__CYGWIN__) */
+ {
+   // call init function from KWWidgetsPythonInit.cxx
++#if defined(_WIN32) && !defined(__CYGWIN__)
+   preInitKWWidgetsPython();
++#else
++  preInitlibKWWidgetsPython();
++#endif
+ 
+   // add extra items to module, on top of basic wrapping
+   PyObject *dict = PyImport_GetModuleDict();