Package: kiki
Version: 0.5.6-8
Severity: important
Tags: patch sid jessie
User: freewx-ma...@lists.alioth.debian.org
Usertags: wxpy3.0
Control: block 755757 by -1
We're aiming to migrate the archive to using wxpython3.0 instead of
wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released.
I've rebuilt kiki with the attached patch and it seems to work.
I'm happy to NMU these changes.
Cheers,
Olly
diff -Nru kiki-0.5.6/debian/changelog kiki-0.5.6/debian/changelog
--- kiki-0.5.6/debian/changelog 2011-11-25 18:26:28.000000000 +1300
+++ kiki-0.5.6/debian/changelog 2014-08-21 00:00:14.000000000 +1200
@@ -1,3 +1,11 @@
+kiki (0.5.6-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxPython 3.0:
+ + New patch: 04_wxpy3.0-compat.patch
+
+ -- Olly Betts <o...@survex.com> Wed, 20 Aug 2014 23:59:42 +1200
+
kiki (0.5.6-8) unstable; urgency=low
* debian/patch:
diff -Nru kiki-0.5.6/debian/control kiki-0.5.6/debian/control
--- kiki-0.5.6/debian/control 2011-11-19 06:54:49.000000000 +1300
+++ kiki-0.5.6/debian/control 2014-08-18 23:40:14.000000000 +1200
@@ -11,7 +11,7 @@
Package: kiki
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk3.0
XB-Python-Version: ${python:Versions}
Description: tool for python regular expression testing
A free environment for regular expression testing (ferret). It allows
diff -Nru kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch
--- kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch 2014-08-20 23:59:21.000000000 +1200
@@ -0,0 +1,27 @@
+Description: Updates for wxPython 3.0
+ Allow wxPython 3.0 to be used.
+ Avoid deprecation warning (wx.InitAllImageHandlers() is a no-op under wxPython
+ 2.8, so removing it remains compatible with wxPython 2.8).
+Author: Olly Betts <o...@survex.com>
+Forwarded: no
+Last-Update: 2014-08-20
+
+--- a/kiki.py
++++ b/kiki.py
+@@ -23,7 +23,7 @@
+ """
+
+ import wxversion
+-wxversion.select('2.8')
++wxversion.ensureMinimal('2.8')
+
+ import wx
+ import wx.html
+@@ -705,7 +705,6 @@
+ global settings
+ settings = Settings(dirname=".kiki", filename="kikicfg.py", debugfile="kikidebug")
+ Kiki = wx.PySimpleApp()
+- wx.InitAllImageHandlers()
+ mw = MyFrameWithEvents(None, -1, "")
+ mw.icon()
+ Kiki.SetTopWindow(mw)
diff -Nru kiki-0.5.6/debian/patches/series kiki-0.5.6/debian/patches/series
--- kiki-0.5.6/debian/patches/series 2011-11-25 18:11:40.000000000 +1300
+++ kiki-0.5.6/debian/patches/series 2014-08-20 23:55:39.000000000 +1200
@@ -1,3 +1,4 @@
01_path_changes.diff
02_remove_wx.NotebookSizer.diff
03_setup.py.diff
+04_wxpy3.0-compat.patch
