Package: mayavi2
Version: 4.4.3-2
Severity: important

Dear Maintainer,

the new package pysph is using mayave as a backend for the
visualisation. Unfortunately there is a tiny problem, which
makes the visualisation of pysph unusable. The function 
wxVTKRenderWindowInteractor requires changes of void_p
on p_void. Please consider applying the corresponding changes.

I have integrated them into the patch wxpy3.0-compat.patch 
because it modifies also wxVTKRenderWindowInteractor.py. But
if you think that one need to have a separate patch for that,
let`s do it.

Patch is attached.

Thank you

Anton
diff -Nru mayavi2-4.4.3/debian/patches/wxpy3.0-compat.patch mayavi2-4.4.3/debian/patches/wxpy3.0-compat.patch
--- mayavi2-4.4.3/debian/patches/wxpy3.0-compat.patch	2015-10-17 00:26:30.000000000 +0200
+++ mayavi2-4.4.3/debian/patches/wxpy3.0-compat.patch	2016-01-25 18:23:55.000000000 +0100
@@ -6,26 +6,26 @@
 Forwarded: no
 Last-Update: 2014-09-20
 
-Index: mayavi2-4.3.1/tvtk/pyface/ui/wx/init.py
+Index: mayavi2-4.4.3/tvtk/pyface/ui/wx/init.py
 ===================================================================
---- mayavi2-4.3.1.orig/tvtk/pyface/ui/wx/init.py
-+++ mayavi2-4.3.1/tvtk/pyface/ui/wx/init.py
+--- mayavi2-4.4.3.orig/tvtk/pyface/ui/wx/init.py
++++ mayavi2-4.4.3/tvtk/pyface/ui/wx/init.py
 @@ -22,10 +22,6 @@ if wx.VERSION < (2, 6):
  _app = wx.GetApp()
  
  if _app is None:
 -    _app = wx.PySimpleApp()
-+    _app = wx.App(False)
 -
 -    # Before we can load any images we have to initialize wxPython's image
 -    # handlers.
 -    wx.InitAllImageHandlers()
++    _app = wx.App(False)
  
  #### EOF ######################################################################
-Index: mayavi2-4.3.1/tvtk/util/wx_gradient_editor.py
+Index: mayavi2-4.4.3/tvtk/util/wx_gradient_editor.py
 ===================================================================
---- mayavi2-4.3.1.orig/tvtk/util/wx_gradient_editor.py
-+++ mayavi2-4.3.1/tvtk/util/wx_gradient_editor.py
+--- mayavi2-4.4.3.orig/tvtk/util/wx_gradient_editor.py
++++ mayavi2-4.4.3/tvtk/util/wx_gradient_editor.py
 @@ -392,7 +392,7 @@ class wxGradientEditorWidget(wx.Panel, G
          (lookuptable) ``*.grad`` (gradient table for use with this program), 
          and ``*.jpg`` (image of the gradient)
@@ -53,10 +53,10 @@
      editor = wxGradientEditor(table,
                                on_color_table_changed,
                                colors=['rgb', 'a', 'h', 's', 'v'],
-Index: mayavi2-4.3.1/docs/source/mayavi/auto/wx_embedding.py
+Index: mayavi2-4.4.3/docs/source/mayavi/auto/wx_embedding.py
 ===================================================================
---- mayavi2-4.3.1.orig/docs/source/mayavi/auto/wx_embedding.py
-+++ mayavi2-4.3.1/docs/source/mayavi/auto/wx_embedding.py
+--- mayavi2-4.4.3.orig/docs/source/mayavi/auto/wx_embedding.py
++++ mayavi2-4.4.3/docs/source/mayavi/auto/wx_embedding.py
 @@ -60,7 +60,7 @@ class MainWindow(wx.Frame):
                          kind='subpanel').control
          self.Show(True)
@@ -66,10 +66,10 @@
  frame = MainWindow(None, wx.ID_ANY)
  app.MainLoop()
  
-Index: mayavi2-4.3.1/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
+Index: mayavi2-4.4.3/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
 ===================================================================
---- mayavi2-4.3.1.orig/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
-+++ mayavi2-4.3.1/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
+--- mayavi2-4.4.3.orig/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
++++ mayavi2-4.4.3/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
 @@ -80,6 +80,6 @@ class MainWindow(wx.Frame):
          self.Show(True)
  
@@ -78,10 +78,10 @@
 +    app = wx.App(False)
      frame = MainWindow(None, wx.ID_ANY)
      app.MainLoop()
-Index: mayavi2-4.3.1/examples/mayavi/interactive/wx_embedding.py
+Index: mayavi2-4.4.3/examples/mayavi/interactive/wx_embedding.py
 ===================================================================
---- mayavi2-4.3.1.orig/examples/mayavi/interactive/wx_embedding.py
-+++ mayavi2-4.3.1/examples/mayavi/interactive/wx_embedding.py
+--- mayavi2-4.4.3.orig/examples/mayavi/interactive/wx_embedding.py
++++ mayavi2-4.4.3/examples/mayavi/interactive/wx_embedding.py
 @@ -60,7 +60,7 @@ class MainWindow(wx.Frame):
                          kind='subpanel').control
          self.Show(True)
@@ -91,10 +91,10 @@
  frame = MainWindow(None, wx.ID_ANY)
  app.MainLoop()
  
-Index: mayavi2-4.3.1/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
+Index: mayavi2-4.4.3/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
 ===================================================================
---- mayavi2-4.3.1.orig/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
-+++ mayavi2-4.3.1/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
+--- mayavi2-4.4.3.orig/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
++++ mayavi2-4.4.3/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
 @@ -80,6 +80,6 @@ class MainWindow(wx.Frame):
          self.Show(True)
  
@@ -103,10 +103,10 @@
 +    app = wx.App(False)
      frame = MainWindow(None, wx.ID_ANY)
      app.MainLoop()
-Index: mayavi2-4.3.1/tvtk/pyface/ui/wx/wxVTKRenderWindowInteractor.py
+Index: mayavi2-4.4.3/tvtk/pyface/ui/wx/wxVTKRenderWindowInteractor.py
 ===================================================================
---- mayavi2-4.3.1.orig/tvtk/pyface/ui/wx/wxVTKRenderWindowInteractor.py
-+++ mayavi2-4.3.1/tvtk/pyface/ui/wx/wxVTKRenderWindowInteractor.py
+--- mayavi2-4.4.3.orig/tvtk/pyface/ui/wx/wxVTKRenderWindowInteractor.py
++++ mayavi2-4.4.3/tvtk/pyface/ui/wx/wxVTKRenderWindowInteractor.py
 @@ -21,7 +21,7 @@ Creation:
  
   wxVTKRenderWindowInteractor(parent, ID, stereo=0, [wx keywords]):
@@ -116,6 +116,15 @@
   creating the window.
  
  Behaviour:
+@@ -365,7 +365,7 @@ class wxVTKRenderWindowInteractor(baseCl
+ 
+                 # we now have 0xdeadbeef
+                 # VTK wants it as: _deadbeef_void_p (pre-SWIG-1.3 style)
+-                d = '_%s_%s\0' % (d[2:], 'void_p')
++                d = '_%s_%s\0' % (d[2:], 'p_void')
+ 
+         return d
+ 
 @@ -695,7 +695,7 @@ def wxVTKRenderWindowInteractorConeExamp
      """Like it says, just a simple example
      """

Reply via email to