Control: tags 758947 + patch
I've done some simple testing of Editra with wxPython 3.0, and it seems to
work.
I used the attached patch, which updates the dependencies, and also some
constants to the newer names - wx.SAVE, etc are still supported as aliases
for the newer names in wxPython 3.0, but wx.FD_SAVE, etc also work with
wxPython 2.8 and wxSAVE, etc have been removed from the C++ API, so these
updates should help with compatibility in the future.
I'm happy to NMU - just let me know. If I don't hear back, I'll do so
in a couple of weeks so there's time for users test this more thoroughly
before the freeze.
Cheers,
Olly
diff -Nru editra-0.7.20+dfsg.1/debian/changelog editra-0.7.20+dfsg.1/debian/changelog
--- editra-0.7.20+dfsg.1/debian/changelog 2014-08-18 23:44:19.000000000 -0300
+++ editra-0.7.20+dfsg.1/debian/changelog 2014-08-30 21:51:40.000000000 -0300
@@ -1,3 +1,12 @@
+editra (0.7.20+dfsg.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to depend on python-wxgtk3.0 rather than python-wxgtk2.8
+ (Closes: #758947):
+ + New patch: wxpython3.0.patch
+
+ -- Olly Betts <[email protected]> Sun, 31 Aug 2014 00:50:20 +0000
+
editra (0.7.20+dfsg.1-2) unstable; urgency=medium
* Update Standards-Version field in d/control.
diff -Nru editra-0.7.20+dfsg.1/debian/control editra-0.7.20+dfsg.1/debian/control
--- editra-0.7.20+dfsg.1/debian/control 2014-08-18 23:44:19.000000000 -0300
+++ editra-0.7.20+dfsg.1/debian/control 2014-08-30 21:52:27.000000000 -0300
@@ -6,7 +6,7 @@
python-all,
python (>= 2.6),
python-setuptools,
- python-wxgtk2.8
+ python-wxgtk3.0
Standards-Version: 3.9.5
X-Python-Version: >= 2.6
Homepage: http://editra.org
@@ -17,7 +17,7 @@
Architecture: all
Depends: ${misc:Depends},
python,
- python-wxgtk2.8,
+ python-wxgtk3.0,
Description: simple multi-platform text editor
Editra is a multi-platform text editor with an implementation that
focuses on creating an easy to use interface and features that aid
diff -Nru editra-0.7.20+dfsg.1/debian/patches/series editra-0.7.20+dfsg.1/debian/patches/series
--- editra-0.7.20+dfsg.1/debian/patches/series 1969-12-31 21:00:00.000000000 -0300
+++ editra-0.7.20+dfsg.1/debian/patches/series 2014-08-30 21:52:46.000000000 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru editra-0.7.20+dfsg.1/debian/patches/wxpython3.0.patch editra-0.7.20+dfsg.1/debian/patches/wxpython3.0.patch
--- editra-0.7.20+dfsg.1/debian/patches/wxpython3.0.patch 1969-12-31 21:00:00.000000000 -0300
+++ editra-0.7.20+dfsg.1/debian/patches/wxpython3.0.patch 2014-08-30 21:53:39.000000000 -0300
@@ -0,0 +1,44 @@
+Description: Updates for better wxPython 3.0 compatibility
+Author: Olly Betts <[email protected]>
+Bug-Debian: https://bugs.debian.org/758947
+Forwarded: no
+Last-Update: 2014-08-30
+
+--- editra-0.7.20+dfsg.1.orig/src/ed_main.py
++++ editra-0.7.20+dfsg.1/src/ed_main.py
+@@ -432,7 +432,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
+
+ dlg = wx.FileDialog(self, _("Editra: Open"), fdir, "",
+ ''.join(syntax.GenFileFilters()),
+- wx.OPEN | wx.MULTIPLE | wx.CHANGE_DIR)
++ wx.FD_OPEN | wx.FD_MULTIPLE | wx.FD_CHANGE_DIR)
+ dlg.SetFilterIndex(_PGET('FFILTER', 'int', 0))
+
+ if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
+@@ -680,7 +680,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
+ os.path.dirname(sdir),
+ title.lstrip(u"*"),
+ u''.join(syntax.GenFileFilters()),
+- wx.SAVE | wx.OVERWRITE_PROMPT)
++ wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
+
+ if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
+ path = dlg.GetPath()
+@@ -713,7 +713,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
+ dlg = wx.FileDialog(self, _("Where to Save Profile?"), \
+ CONFIG['PROFILE_DIR'], "default.ppb", \
+ _("Profile") + " (*.ppb)|*.ppb",
+- wx.SAVE | wx.OVERWRITE_PROMPT)
++ wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
+
+ if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
+ profiler.TheProfile.Write(dlg.GetPath())
+@@ -732,7 +732,7 @@ class MainWindow(wx.Frame, viewmgr.Persp
+ if evt.Id == ID_LOAD_PROFILE:
+ dlg = wx.FileDialog(self, _("Load a Custom Profile"),
+ CONFIG['PROFILE_DIR'], "default.ppb",
+- _("Profile") + " (*.ppb)|*.ppb", wx.OPEN)
++ _("Profile") + " (*.ppb)|*.ppb", wx.FD_OPEN)
+
+ if ebmlib.LockCall(self._mlock, dlg.ShowModal) == wx.ID_OK:
+ profiler.TheProfile.Load(dlg.GetPath())
