Control: tags 759048 + patch

With the attached patch, hachoir-wx builds.  When run, it seems to want
me to select a file, but I'm not sure I have a suitable input, so I
haven't really been able to usefully test it.

Please could you give it a more thorough workout, and upload if all is
well.

Cheers,
    Olly
diff -Nru hachoir-wx-0.3/debian/changelog hachoir-wx-0.3/debian/changelog
--- hachoir-wx-0.3/debian/changelog	2011-10-19 17:19:52.000000000 -0300
+++ hachoir-wx-0.3/debian/changelog	2014-09-06 21:33:12.000000000 -0300
@@ -1,3 +1,11 @@
+hachoir-wx (0.3-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for wxPython 3.0 (Closes: #759048):
+    - New patch: wxpython3.0.patch
+
+ -- Olly Betts <o...@survex.com>  Sun, 07 Sep 2014 00:31:31 +0000
+
 hachoir-wx (0.3-2) unstable; urgency=low
 
   [ Sandro Tosi ]
diff -Nru hachoir-wx-0.3/debian/control hachoir-wx-0.3/debian/control
--- hachoir-wx-0.3/debian/control	2011-10-19 14:49:11.000000000 -0300
+++ hachoir-wx-0.3/debian/control	2014-09-06 21:31:52.000000000 -0300
@@ -12,7 +12,7 @@
 
 Package: python-hachoir-wx
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-hachoir-parser (>= 1.2), python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, python-hachoir-parser (>= 1.2), python-wxgtk3.0
 Description: wxWidgets GUI for the hachoir binary parser
  hachoir-wx is a wxWidgets-based program that's meant to provide a
  (more) user-friendly interface to the facilities provided by the
diff -Nru hachoir-wx-0.3/debian/patches/series hachoir-wx-0.3/debian/patches/series
--- hachoir-wx-0.3/debian/patches/series	2011-02-15 18:13:27.000000000 -0300
+++ hachoir-wx-0.3/debian/patches/series	2014-09-06 21:32:03.000000000 -0300
@@ -1 +1,2 @@
 fix-project-url.patch
+wxpython3.0.patch
diff -Nru hachoir-wx-0.3/debian/patches/wxpython3.0.patch hachoir-wx-0.3/debian/patches/wxpython3.0.patch
--- hachoir-wx-0.3/debian/patches/wxpython3.0.patch	1969-12-31 21:00:00.000000000 -0300
+++ hachoir-wx-0.3/debian/patches/wxpython3.0.patch	2014-09-06 21:32:49.000000000 -0300
@@ -0,0 +1,27 @@
+Description: Update for wxPython 3.0
+ These changes retain compatibility with wxPython 2.8.
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/759048
+Forwarded: no
+Last-Update: 2014-09-06
+
+--- hachoir-wx-0.3.orig/hachoir_wx/dialogs.py
++++ hachoir-wx-0.3/hachoir_wx/dialogs.py
+@@ -4,7 +4,7 @@ import wx, os
+ from hachoir_core.i18n import _
+ 
+ def file_open_dialog():
+-    dialog_style = wx.OPEN | wx.FILE_MUST_EXIST
++    dialog_style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST
+ 
+     dialog = wx.FileDialog(
+         None, message = _('Open'),
+@@ -14,7 +14,7 @@ def file_open_dialog():
+     return dialog
+ 
+ def file_save_dialog(title):
+-    dialog_style = wx.SAVE
++    dialog_style = wx.FD_SAVE
+ 
+     dialog = wx.FileDialog(
+         None, message = title,

Reply via email to