Control: tags 761414 + patch
I've attached a patch which updates vtk to work with wxPython 3.0. It
uses named parameters so should maintain compatibility with wxPython
2.8 too.
This fixes the test script in this bug, and fixes the start-up problems
with invesalius.
It would be great to get this uploaded promptly - it's a simple change
and this bug is blocking fixes for at least one other package in the
wxpython3.0 transition, and I suspect others we have not got to yet.
If you'd like me to NMU, I have the build I've just done and would be
happy to sign and upload it.
Cheers,
Olly
diff -Nru vtk-5.8.0/debian/changelog vtk-5.8.0/debian/changelog
--- vtk-5.8.0/debian/changelog 2014-06-25 08:00:48.000000000 -0300
+++ vtk-5.8.0/debian/changelog 2014-09-13 14:54:00.000000000 -0300
@@ -1,3 +1,11 @@
+vtk (5.8.0-17.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #761414):
+ - New patch: wxpython3.0.patch
+
+ -- Olly Betts <[email protected]> Sat, 13 Sep 2014 17:45:52 +0000
+
vtk (5.8.0-17.3) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru vtk-5.8.0/debian/patches/series vtk-5.8.0/debian/patches/series
--- vtk-5.8.0/debian/patches/series 2014-06-25 05:38:31.000000000 -0300
+++ vtk-5.8.0/debian/patches/series 2014-09-13 14:55:32.000000000 -0300
@@ -5,3 +5,4 @@
libav10.patch
java15.patch
multiarch-libpq.patch
+wxpython3.0.patch
diff -Nru vtk-5.8.0/debian/patches/wxpython3.0.patch vtk-5.8.0/debian/patches/wxpython3.0.patch
--- vtk-5.8.0/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.000000000 -0300
+++ vtk-5.8.0/debian/patches/wxpython3.0.patch 2014-09-13 14:52:35.000000000 -0300
@@ -0,0 +1,79 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Bug-Debian: https://bugs.debian.org/761414
+Forwarded: no
+Last-Update: 2014-09-13
+
+--- vtk-5.10.1.orig/Wrapping/Python/vtk/wx/wxVTKRenderWindow.py
++++ vtk-5.10.1/Wrapping/Python/vtk/wx/wxVTKRenderWindow.py
+@@ -19,7 +19,7 @@ Creation:
+
+ wxVTKRenderWindow(parent, ID, stereo=0, [wx keywords]):
+
+-You should create a wx.PySimpleApp() or some other wx**App
++You should create a wx.App(False) or some other wx.App subclass
+ before creating the window.
+
+ ----------------------------------------
+@@ -190,10 +190,12 @@ class wxVTKRenderWindow(baseClass):
+ # initialize the wx.Window
+ if baseClass.__name__ == 'GLCanvas':
+ # Set the doublebuffer attribute of the GL canvas.
+- baseClass.__init__(self, parent, ID, position, size, style,
++ baseClass.__init__(self, parent, ID, pos=position, size=size,
++ style=style,
+ attribList=[wx.glcanvas.WX_GL_DOUBLEBUFFER])
+ else:
+- baseClass.__init__(self, parent, ID, position, size, style)
++ baseClass.__init__(self, parent, ID, pos=position, size=size,
++ style=style)
+
+ # create the RenderWindow and initialize it
+ self._RenderWindow = vtk.vtkRenderWindow()
+@@ -735,7 +737,7 @@ def wxVTKRenderWindowConeExample():
+ """Like it says, just a simple example.
+ """
+ # every wx app needs an app
+- app = wx.PySimpleApp()
++ app = wx.App(False)
+
+ # create the widget
+ frame = wx.Frame(None, -1, "wxVTKRenderWindow", size=(400,400))
+--- vtk-5.10.1.orig/Wrapping/Python/vtk/wx/wxVTKRenderWindowInteractor.py
++++ vtk-5.10.1/Wrapping/Python/vtk/wx/wxVTKRenderWindowInteractor.py
+@@ -21,8 +21,8 @@ Creation:
+
+ wxVTKRenderWindowInteractor(parent, ID, stereo=0, [wx keywords]):
+
+- You should create a wx.PySimpleApp() or some other wx**App before
+- creating the window.
++ You should create a wx.App(False) or some other wx.App subclass
++ before creating the window.
+
+ Behaviour:
+
+@@ -171,11 +171,12 @@ class wxVTKRenderWindowInteractor(baseCl
+ attribList.append(wx.glcanvas.WX_GL_STEREO)
+
+ try:
+- baseClass.__init__(self, parent, ID, position, size, style,
+- attribList=attribList)
++ baseClass.__init__(self, parent, ID, pos=position, size=size,
++ style=style, attribList=attribList)
+ except wx.PyAssertionError:
+ # visual couldn't be allocated, so we go back to default
+- baseClass.__init__(self, parent, ID, position, size, style)
++ baseClass.__init__(self, parent, ID, pos=position, size=size,
++ style=style)
+ if stereo:
+ # and make sure everyone knows that the stereo
+ # visual wasn't set.
+@@ -666,7 +667,7 @@ def wxVTKRenderWindowInteractorConeExamp
+ """Like it says, just a simple example
+ """
+ # every wx app needs an app
+- app = wx.PySimpleApp()
++ app = wx.App(False)
+
+ # create the top-level frame, sizer and wxVTKRWI
+ frame = wx.Frame(None, -1, "wxVTKRenderWindowInteractor", size=(400,400))
--
debian-science-maintainers mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
