Control: tags 759059 + patch
The attached patch updates the dependencies for wxPython 3.0.
The issue of the missing icon icons/crystal/32/tray_icon.xpm really
ought to be resolved more satisfactorily though - here's the explanation
from "do-not-set-bad-icon.patch":
The code tries to load an icon from 'icons/crystal/32/tray_icon.xpm'
(relative to self.media_dir) - I can find no trace of such a file in
the source tree!
.
It then tries to set this invalid icon. With wxPython 2.8 these
issues get quietly ignored, but wxPython 3.0 reports them. As a
simple workaround I've just added a check that the icon is valid
before setting it, so now you get a messagebox about the icon file
not being found and then the app starts.
.
Obviously it would be better to track down the expected icon and
add it to the package, or find a suitable substitute.
Cheers,
Olly
diff -Nru salutatoi-0.4.1/debian/changelog salutatoi-0.4.1/debian/changelog
--- salutatoi-0.4.1/debian/changelog 2014-03-12 15:13:04.000000000 -0300
+++ salutatoi-0.4.1/debian/changelog 2014-09-09 19:00:58.000000000 -0300
@@ -1,3 +1,11 @@
+salutatoi (0.4.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759059):
+ + New patch do-not-set-bad-icon.patch to allow wix to start up.
+
+ -- Olly Betts <o...@survex.com> Tue, 09 Sep 2014 22:00:34 +0000
+
salutatoi (0.4.1-2) unstable; urgency=medium
* Update Jp's manual page (jp.1).
diff -Nru salutatoi-0.4.1/debian/control salutatoi-0.4.1/debian/control
--- salutatoi-0.4.1/debian/control 2014-03-12 15:13:04.000000000 -0300
+++ salutatoi-0.4.1/debian/control 2014-09-09 18:16:31.000000000 -0300
@@ -39,7 +39,7 @@
Package: sat-xmpp-wix
Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
- sat-xmpp-core (= ${source:Version}), python-wxgtk2.8
+ sat-xmpp-core (= ${source:Version}), python-wxgtk3.0
Description: Salut à Toi XMPP-based communication and sharing tool (desktop interface)
Salut à Toi (French for "hello you") is a multi-frontends, multi-purposes
communication tool, based on the XMPP standard. It features:
diff -Nru salutatoi-0.4.1/debian/patches/do-not-set-bad-icon.patch salutatoi-0.4.1/debian/patches/do-not-set-bad-icon.patch
--- salutatoi-0.4.1/debian/patches/do-not-set-bad-icon.patch 1969-12-31 21:00:00.000000000 -0300
+++ salutatoi-0.4.1/debian/patches/do-not-set-bad-icon.patch 2014-09-09 19:00:27.000000000 -0300
@@ -0,0 +1,30 @@
+Description: Avoid setting a bad icon
+ The code tries to load an icon from 'icons/crystal/32/tray_icon.xpm'
+ (relative to self.media_dir) - I can find no trace of such a file in
+ the source tree!
+ .
+ It then tries to set this invalid icon. With wxPython 2.8 these
+ issues get quietly ignored, but wxPython 3.0 reports them. As a
+ simple workaround I've just added a check that the icon is valid
+ before setting it, so now you get a messagebox about the icon file
+ not being found and then the app starts.
+ .
+ Obviously it would be better to track down the expected icon and
+ add it to the package, or find a suitable substitute.
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/759059
+Forwarded: no
+Last-Update: 2014-09-09
+
+--- salutatoi-0.4.1.orig/frontends/src/wix/main_window.py
++++ salutatoi-0.4.1/frontends/src/wix/main_window.py
+@@ -84,7 +84,8 @@ class MainWindow(wx.Frame, QuickApp):
+ #tray icon
+ ticon = wx.Icon(os.path.join(self.media_dir, 'icons/crystal/32/tray_icon.xpm'), wx.BITMAP_TYPE_XPM)
+ self.tray_icon = wx.TaskBarIcon()
+- self.tray_icon.SetIcon(ticon, _("Wix jabber client"))
++ if ticon.IsOk():
++ self.tray_icon.SetIcon(ticon, _("Wix jabber client"))
+ wx.EVT_TASKBAR_LEFT_UP(self.tray_icon, self.onTrayClick)
+
+
diff -Nru salutatoi-0.4.1/debian/patches/series salutatoi-0.4.1/debian/patches/series
--- salutatoi-0.4.1/debian/patches/series 2014-03-12 15:13:04.000000000 -0300
+++ salutatoi-0.4.1/debian/patches/series 2014-09-09 18:53:24.000000000 -0300
@@ -1,3 +1,4 @@
0001-Search-.mo-files-in-default-system-locale-dir.patch
0002-Set-PYTHONPATH-in-sat.sh.patch
0003-jp-updated-main-loop-to-gobject-3.patch
+do-not-set-bad-icon.patch
