Control: tags 759045 + patch
I rebuilt congruity with the attached patch. This allows it to
be run, but it seems I can't get very far without an "EZX" file,
which I don't have.
Please could you test the patched package works as intended?
Cheers,
Olly
diff -Nru congruity-18/debian/changelog congruity-18/debian/changelog
--- congruity-18/debian/changelog 2014-04-23 21:32:11.000000000 -0300
+++ congruity-18/debian/changelog 2014-09-05 22:41:55.000000000 -0300
@@ -1,3 +1,11 @@
+congruity (18-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759045):
+ - New patch: wxpython3.0.patch
+
+ -- Olly Betts <o...@survex.com> Sat, 06 Sep 2014 00:56:45 +0000
+
congruity (18-1) unstable; urgency=medium
* New upstream release (Closes: #743050)
diff -Nru congruity-18/debian/control congruity-18/debian/control
--- congruity-18/debian/control 2014-04-23 21:31:06.000000000 -0300
+++ congruity-18/debian/control 2014-09-05 21:23:54.000000000 -0300
@@ -11,7 +11,7 @@
Depends: python, python (>= 2.5) | python-ctypes,
python-libconcord (>= 1.0),
python-suds,
- python-wxgtk2.8,
+ python-wxgtk3.0,
shared-mime-info,
${misc:Depends}
Description: graphical utility to configure Logitech Harmony remotes
diff -Nru congruity-18/debian/patches/series congruity-18/debian/patches/series
--- congruity-18/debian/patches/series 1969-12-31 21:00:00.000000000 -0300
+++ congruity-18/debian/patches/series 2014-09-05 22:34:59.000000000 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru congruity-18/debian/patches/wxpython3.0.patch congruity-18/debian/patches/wxpython3.0.patch
--- congruity-18/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.000000000 -0300
+++ congruity-18/debian/patches/wxpython3.0.patch 2014-09-05 22:42:59.000000000 -0300
@@ -0,0 +1,54 @@
+Description: Updates for wxPython 3.0
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/759045
+Forwarded: no
+Last-Update: 2014-09-05
+
+--- congruity-18.orig/congruity
++++ congruity-18/congruity
+@@ -33,11 +33,17 @@ import wx.lib.dialogs
+
+ version = "18"
+
++class MySimpleApp(wx.App):
++ def OnInit(self):
++ # Suppress WXDEBUG assertions, as happens by default with wx2.8.
++ self.SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
++ return True
++
+ try:
+ import libconcord
+ except:
+ str = traceback.format_exc()
+- app = wx.PySimpleApp()
++ app = MySimpleApp()
+ dlg = wx.MessageDialog(
+ None,
+ "Could not load libconcord; please ensure it, and the Python "
+@@ -53,7 +59,7 @@ try:
+ libconcord.update_configuration
+ except:
+ str = traceback.format_exc()
+- app = wx.PySimpleApp()
++ app = MySimpleApp()
+ dlg = wx.MessageDialog(
+ None,
+ "Could not load the correct version of libconcord; please ensure "
+@@ -224,6 +230,7 @@ class DecoratedContainer(wx.Panel):
+ wx.Panel.__init__(self, parent)
+
+ self.sizer = wx.GridBagSizer(5, 5)
++ self.sizer.SetCols(3)
+ self.sizer.AddGrowableCol(2)
+ self.SetSizer(self.sizer)
+
+@@ -1873,8 +1880,7 @@ def main(argv):
+ ezhex_filename = None
+ initial_exception = ("Command-line error", exception_message())
+
+- app = wx.PySimpleApp()
+- wx.InitAllImageHandlers()
++ app = MySimpleApp()
+
+ resources = Resources(appdir, no_web)
+ resources.LoadImages()
