Control: tags 758944 + patch
Attached is a patch for wxPython 3.0 support. Using it, the package
builds and seems to work in my testing (though this isn't an application
I've used before). The patch should maintain 2.8 compatibility.
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 svn-workbench-1.6.8/debian/changelog svn-workbench-1.6.8/debian/changelog
--- svn-workbench-1.6.8/debian/changelog 2013-10-09 18:45:09.000000000 -0300
+++ svn-workbench-1.6.8/debian/changelog 2014-08-30 23:50:05.000000000 -0300
@@ -1,3 +1,11 @@
+svn-workbench (1.6.8-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #758944):
+ - New patch: wxpython3.0-compat.patch
+
+ -- Olly Betts <o...@survex.com> Sun, 31 Aug 2014 02:49:04 +0000
+
svn-workbench (1.6.8-2) unstable; urgency=low
* debian/patches
diff -Nru svn-workbench-1.6.8/debian/patches/series svn-workbench-1.6.8/debian/patches/series
--- svn-workbench-1.6.8/debian/patches/series 2013-10-09 18:43:36.000000000 -0300
+++ svn-workbench-1.6.8/debian/patches/series 2014-08-30 23:50:15.000000000 -0300
@@ -1,2 +1,3 @@
fix_Source_make_po_file.py_shebang.patch
force_wx2.8.patch
+wxpython3.0-compat.patch
diff -Nru svn-workbench-1.6.8/debian/patches/wxpython3.0-compat.patch svn-workbench-1.6.8/debian/patches/wxpython3.0-compat.patch
--- svn-workbench-1.6.8/debian/patches/wxpython3.0-compat.patch 1969-12-31 21:00:00.000000000 -0300
+++ svn-workbench-1.6.8/debian/patches/wxpython3.0-compat.patch 2014-08-30 23:52:15.000000000 -0300
@@ -0,0 +1,57 @@
+Description: Update for wxPython 3.0
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/758944
+Forwarded: no
+Last-Update: 2014-08-30
+
+--- svn-workbench-1.6.8.orig/Source/wb_diff_main.py
++++ svn-workbench-1.6.8/Source/wb_diff_main.py
+@@ -16,11 +16,10 @@ VERSION_STRING = "Uncontrolled"
+
+ import sys
+
+-# make sure that we get 2.6 and not an earlier version
+-# 2.8 is reported to work as well
++# make sure that we get at least 2.8 and not an earlier version
+ if not hasattr(sys, 'frozen'):
+ import wxversion
+- wxversion.select( ['2.8', '2.9'] )
++ wxversion.ensureMinimal('2.8')
+
+ def noTranslate(msg):
+ return msg
+--- svn-workbench-1.6.8.orig/Source/wb_main.py
++++ svn-workbench-1.6.8/Source/wb_main.py
+@@ -40,10 +40,10 @@ if stdout_filename is not None:
+ except EnvironmentError:
+ pass
+
+-# make sure that we get 2.8 and not an earlier version
++# make sure that we get at least 2.8 and not an earlier version
+ try:
+ import wxversion
+- wxversion.select( ['2.8'] )
++ wxversion.ensureMinimal('2.8')
+
+ except:
+ pass
+--- svn-workbench-1.6.8.orig/Source/wb_preferences_dialog.py
++++ svn-workbench-1.6.8/Source/wb_preferences_dialog.py
+@@ -154,7 +154,7 @@ class EditorPage(PagePanel):
+ os.path.dirname( filename ),
+ os.path.basename( filename ),
+ file_type,
+- wx.OPEN )
++ wx.FD_OPEN )
+
+ if file_dialog.ShowModal() == wx.ID_OK:
+ self.text_ctrl_editor.SetValue( file_dialog.GetPath() )
+@@ -278,7 +278,7 @@ class DiffToolPage(PagePanel):
+ os.path.dirname( filename ),
+ os.path.basename( filename ),
+ file_type,
+- wx.OPEN )
++ wx.FD_OPEN )
+
+ if file_dialog.ShowModal() == wx.ID_OK:
+ self.text_ctrl_diff_tool.SetValue( file_dialog.GetPath() )
