Control: tags 725711 +patch
The attached patch is an updated version of the patch for migrating to
wxpython3.0, which I recently sent to #758204. This revised version
reenables used of wx.media, which is now packaged for wxpython3.0.
I've also done a little more testing, and fixed one crash I hit.
As before, I'm happy to NMU.
Cheers,
Olly
diff -Nru whyteboard-0.41.1/debian/changelog whyteboard-0.41.1/debian/changelog
--- whyteboard-0.41.1/debian/changelog 2011-08-17 03:22:12.000000000 +1200
+++ whyteboard-0.41.1/debian/changelog 2014-08-18 00:14:09.000000000 +1200
@@ -1,3 +1,13 @@
+whyteboard (0.41.1-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to depend on python-wxgtk3.0 rather than python-wxgtk2.8
+ (Closes: #758204):
+ + New patch: 01_wxpy3.0-compat.patch
+ * Add dependency on python-wxgtk-media3.0. (Closes: #725711)
+
+ -- Olly Betts <o...@survex.com> Mon, 18 Aug 2014 00:14:05 +1200
+
whyteboard (0.41.1-4) unstable; urgency=low
* Add python-setuptools to Build-Depends. (Closes: #634411)
diff -Nru whyteboard-0.41.1/debian/control whyteboard-0.41.1/debian/control
--- whyteboard-0.41.1/debian/control 2011-08-17 03:15:08.000000000 +1200
+++ whyteboard-0.41.1/debian/control 2014-08-17 23:28:01.000000000 +1200
@@ -12,7 +12,7 @@
Package: whyteboard
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk3.0, python-wxgtk-media3.0
Description: overlay painting and annotation application
Whyteboard is a free painting application for Linux, Windows and Mac. It is
suited towards creating visual presentations and for overlaying PDF images
diff -Nru whyteboard-0.41.1/debian/patches/01_wxpy3.0-compat.patch whyteboard-0.41.1/debian/patches/01_wxpy3.0-compat.patch
--- whyteboard-0.41.1/debian/patches/01_wxpy3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ whyteboard-0.41.1/debian/patches/01_wxpy3.0-compat.patch 2014-08-18 00:17:05.000000000 +1200
@@ -0,0 +1,107 @@
+Description: Fix to work with wxpython3.0
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: http://bugs.debian.org/725711
+Forwarded: no
+Last-Update: 2014-08-15
+
+--- a/whyteboard/gui/frame.py
++++ b/whyteboard/gui/frame.py
+@@ -264,7 +264,7 @@
+ _file = _file.replace(u":", u"-").replace(u"/", u"-")
+
+ name = file_dialog(self, _("Save Whyteboard As..."),
+- wx.SAVE | wx.OVERWRITE_PROMPT, wildcard, _dir, _file)
++ wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT, wildcard, _dir, _file)
+ if name:
+ if not os.path.splitext(name)[1]: # no file extension
+ name += u'.wtbd'
+@@ -290,7 +290,7 @@
+
+ _dir = self.util.config.get('last_opened_dir') or u""
+
+- filename = file_dialog(self, _("Open file..."), wx.OPEN, wildcard, _dir)
++ filename = file_dialog(self, _("Open file..."), wx.FD_OPEN, wildcard, _dir)
+ self.open_file(filename)
+
+
+@@ -330,7 +330,7 @@
+ if not self.util.im_location:
+ return
+ filename = file_dialog(self, _("Export data to..."),
+- wx.SAVE | wx.OVERWRITE_PROMPT, u"PDF (*.pdf)|*.pdf")
++ wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT, u"PDF (*.pdf)|*.pdf")
+
+ if filename:
+ ext = os.path.splitext(filename)[1]
+@@ -395,7 +395,7 @@
+ wildcard = _("Whyteboard Preference Files") + u" (*.pref)|*.pref"
+
+ filename = file_dialog(self, _("Export preferences to..."),
+- wx.SAVE | wx.OVERWRITE_PROMPT, wildcard)
++ wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT, wildcard)
+ if filename:
+ if not os.path.splitext(filename)[1]:
+ filename += u".pref"
+@@ -409,7 +409,7 @@
+ """
+ wildcard = _("Whyteboard Preference Files") + u" (*.pref)|*.pref"
+
+- filename = file_dialog(self, _("Import Preferences From..."), wx.OPEN,
++ filename = file_dialog(self, _("Import Preferences From..."), wx.FD_OPEN,
+ wildcard, get_home_dir())
+
+ if filename:
+@@ -454,7 +454,7 @@
+ u"BMP (*.bmp)|*.bmp|TIFF (*.tiff)|*.tiff")
+
+ dlg = wx.FileDialog(self, _("Export data to..."),
+- style=wx.SAVE | wx.OVERWRITE_PROMPT, wildcard=wildcard)
++ style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT, wildcard=wildcard)
+ if dlg.ShowModal() == wx.ID_OK:
+ filename = dlg.GetPath()
+ _name = os.path.splitext(filename)[1].replace(u".", u"")
+--- a/whyteboard/gui/panels.py
++++ b/whyteboard/gui/panels.py
+@@ -485,7 +485,7 @@
+ if self.directory:
+ _dir = self.directory
+
+- name = file_dialog(self, _("Choose a media file"), wx.OPEN, wildcard, _dir)
++ name = file_dialog(self, _("Choose a media file"), wx.FD_OPEN, wildcard, _dir)
+ if name:
+ self.do_load_file(name)
+
+@@ -1019,7 +1019,7 @@
+ dc.SelectObject(self.buffer)
+
+ gcdc = wx.GCDC(dc)
+- gcdc.SetBrush(wx.Brush(wx.Color(0, 0, 255, 50))) # light blue
++ gcdc.SetBrush(wx.Brush(wx.Colour(0, 0, 255, 50))) # light blue
+ gcdc.SetPen(wx.Pen((0, 0, 0), 1, wx.TRANSPARENT))
+ gcdc.DrawRectangle(0, 0, 150, 150)
+
+--- a/whyteboard/tools.py
++++ b/whyteboard/tools.py
+@@ -1785,7 +1785,7 @@
+ if (not replay and self.canvas.gui.util.config['bmp_select_transparent']
+ and meta.transparent):
+ dc = wx.GCDC(dc)
+- dc.SetBrush(wx.Brush(wx.Color(0, 0, 255, 50))) # light blue
++ dc.SetBrush(wx.Brush(wx.Colour(0, 0, 255, 50))) # light blue
+ dc.SetPen(wx.Pen(self.colour, self.thickness, wx.SOLID))
+ else:
+ dc.SetPen(wx.Pen(self.colour, self.thickness, wx.SHORT_DASH))
+--- a/whyteboard/gui/dialogs.py
++++ b/whyteboard/gui/dialogs.py
+@@ -1027,8 +1027,9 @@
+ self.list.SetStringItem(index, 2, str(shape.thickness))
+ self.list.SetStringItem(index, 3, str(shape.colour))
+ self.list.SetStringItem(index, 4, shape.properties())
+- self.list.Select(selection)
+- self.list.EnsureVisible(selection)
++ if selection != -1:
++ self.list.Select(selection)
++ self.list.EnsureVisible(selection)
+
+
+
diff -Nru whyteboard-0.41.1/debian/patches/series whyteboard-0.41.1/debian/patches/series
--- whyteboard-0.41.1/debian/patches/series 2011-02-09 21:36:32.000000000 +1300
+++ whyteboard-0.41.1/debian/patches/series 2014-08-17 23:26:33.000000000 +1200
@@ -1 +1,2 @@
00_setup_py
+01_wxpy3.0-compat.patch
