Bug#741490: ebook2cwgui: Please update to use wxwidgets3.0

[Olly Betts <olly@survex.com>]

Package: ebook2cwgui
Version: 0.1.2-1
Severity: normal
Tags: patch

Dear maintainer,

We're aiming to migrate the archive to using wxwidgets3.0 instead of
wxwidgets2.8.

I've built and done some testing of your package and it seems to work
as well as the package currently in unstable (the initial window size is
too small to show all the controls in both cases).

I used the attached patch - I think the wxStandardPaths fix will also
work with wx2.8, but I haven't actually tested that.

I'm happy to NMU this change if you wish me to - just let me know.

Cheers,
    Olly

diff -Nru ebook2cwgui-0.1.2/debian/changelog ebook2cwgui-0.1.2/debian/changelog
--- ebook2cwgui-0.1.2/debian/changelog	2013-02-28 23:04:22.000000000 +1300
+++ ebook2cwgui-0.1.2/debian/changelog	2014-03-13 12:22:25.000000000 +1300
@@ -1,3 +1,10 @@
+ebook2cwgui (0.1.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update to build with wxwidgets 3.0.
+
+ -- Olly Betts <olly@survex.com>  Thu, 13 Mar 2014 12:22:05 +1300
+
 ebook2cwgui (0.1.2-1) unstable; urgency=low
 
   * Initial release (Closes: #700496)
diff -Nru ebook2cwgui-0.1.2/debian/control ebook2cwgui-0.1.2/debian/control
--- ebook2cwgui-0.1.2/debian/control	2013-02-14 04:09:10.000000000 +1300
+++ ebook2cwgui-0.1.2/debian/control	2014-03-13 12:21:55.000000000 +1300
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
 Uploaders: Christoph Feenders <debian@echti.de>, Kamal Mostafa <kamal@whence.com>
-Build-Depends: debhelper (>= 9), libgcc1, libstdc++6, libwxbase2.8-dev, libwxgtk2.8-dev
+Build-Depends: debhelper (>= 9), libgcc1, libstdc++6, libwxgtk3.0-dev
 Standards-Version: 3.9.4
 Homepage: http://fkurz.net/ham/ebook2cw.html#gui
 #Vcs-Git: git://git.debian.org/collab-maint/ebook2cwgui.git
diff -Nru ebook2cwgui-0.1.2/debian/patches/series ebook2cwgui-0.1.2/debian/patches/series
--- ebook2cwgui-0.1.2/debian/patches/series	2013-02-28 23:00:40.000000000 +1300
+++ ebook2cwgui-0.1.2/debian/patches/series	2014-03-13 12:32:08.000000000 +1300
@@ -2,3 +2,4 @@
 makefile-respect-CXX-and-flags.patch
 makefile-install-icon.patch
 makefile-install-desktop-file.patch
+wx3.0-compat.patch
diff -Nru ebook2cwgui-0.1.2/debian/patches/wx3.0-compat.patch ebook2cwgui-0.1.2/debian/patches/wx3.0-compat.patch
--- ebook2cwgui-0.1.2/debian/patches/wx3.0-compat.patch	1970-01-01 12:00:00.000000000 +1200
+++ ebook2cwgui-0.1.2/debian/patches/wx3.0-compat.patch	2014-03-13 12:32:40.000000000 +1300
@@ -0,0 +1,16 @@
+Description: Fix to build with wxWidgets 3.0
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-03-13
+
+--- ebook2cwgui-0.1.2.orig/ebook2cwgui.cpp
++++ ebook2cwgui-0.1.2/ebook2cwgui.cpp
+@@ -679,8 +679,7 @@ wxString Ebook2cw::FindConfigFile () {
+ 	/* Otherwise where it "should" be; create if not there */
+ 
+ 	wxString dir;
+-	wxStandardPaths stdPaths;
+-	dir = stdPaths.GetUserConfigDir();
++	dir = wxStandardPaths::Get().GetUserConfigDir();
+ 
+ #ifdef __WXMSW__
+ 	if (!wxDirExists(dir + wxT("\\ebook2cw"))) {