Package: treeviewx
Version: 0.5.1+20100823-2
Severity: important
Tags: patch sid jessie
User: freewx-ma...@lists.alioth.debian.org
Usertags: wx3.0
Control: block 748169 by -1
Dear maintainer,
We're aiming to migrate the archive to using wxwidgets3.0 instead of
wxwidgets2.8, and intend to drop wxwidgets2.8 before jessie is released.
I've rebuilt your package using the attached patch. I haven't tried
to run it though - a specialist package like this is much better tested
by someone who actually uses it (I don't have any suitable data, and
I'd have little idea what to do with it even if I did!)
One thing I should probably explain about the patch as my change may
seem odd otherwise - upstream's configure.in says "USE_SVG=0" but the
generated configure says "USE_SVG=1", so I've simply updated
configure.in to match what it must have said when configure was
generated.
I'm happy to NMU this change if you wish me to - just let me know.
Cheers,
Olly
diff -Nru treeviewx-0.5.1+20100823/debian/changelog treeviewx-0.5.1+20100823/debian/changelog
--- treeviewx-0.5.1+20100823/debian/changelog 2012-08-03 00:43:20.000000000 +1200
+++ treeviewx-0.5.1+20100823/debian/changelog 2014-06-12 01:03:38.000000000 +1200
@@ -1,3 +1,10 @@
+treeviewx (0.5.1+20100823-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxWidgets 3.0 (new patch: wx3.0-compat.patch).
+
+ -- Olly Betts <o...@survex.com> Thu, 12 Jun 2014 01:03:35 +1200
+
treeviewx (0.5.1+20100823-2) unstable; urgency=low
* debian/watch: Fixed after Google code redirector stopped working
diff -Nru treeviewx-0.5.1+20100823/debian/control treeviewx-0.5.1+20100823/debian/control
--- treeviewx-0.5.1+20100823/debian/control 2012-08-03 00:43:05.000000000 +1200
+++ treeviewx-0.5.1+20100823/debian/control 2014-06-12 00:57:14.000000000 +1200
@@ -5,7 +5,7 @@
DM-Upload-Allowed: yes
Uploaders: Charles Plessy <ple...@debian.org>,
Andreas Tille <ti...@debian.org>
-Build-Depends: debhelper (>= 9), libwxgtk2.8-dev
+Build-Depends: debhelper (>= 9), libwxgtk3.0-dev, dh-autoreconf
Standards-Version: 3.9.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/treeviewx/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/treeviewx/trunk/
diff -Nru treeviewx-0.5.1+20100823/debian/patches/series treeviewx-0.5.1+20100823/debian/patches/series
--- treeviewx-0.5.1+20100823/debian/patches/series 2012-08-03 00:16:12.000000000 +1200
+++ treeviewx-0.5.1+20100823/debian/patches/series 2014-06-12 00:30:12.000000000 +1200
@@ -1,3 +1,4 @@
60_LGPLtoGPL.patch
70_choose_tree.patch
fix_loading_crash.patch
+wx3.0-compat.patch
diff -Nru treeviewx-0.5.1+20100823/debian/patches/wx3.0-compat.patch treeviewx-0.5.1+20100823/debian/patches/wx3.0-compat.patch
--- treeviewx-0.5.1+20100823/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ treeviewx-0.5.1+20100823/debian/patches/wx3.0-compat.patch 2014-06-12 01:11:54.000000000 +1200
@@ -0,0 +1,97 @@
+--- a/configure.in
++++ b/configure.in
+@@ -54,7 +54,7 @@
+ # The reason for this is wxGTK RPMs from wxWidgets.org
+ # do not have the required SVG library (which is a contribution)
+ AC_MSG_CHECKING(whether we will use SVG)
+-USE_SVG=0
++USE_SVG=1
+ WX_SVG_LIB=
+ if test "$USE_SVG" = 0 ; then
+ AC_MSG_RESULT(no)
+@@ -66,7 +66,9 @@
+ case "$wx_version" in
+ 2.4.*) WX_SVG_LIB=[`$WX_CONFIG --basename`_dcsvg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`]
+ ;;
+- *) WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`]
++ 2.*) WX_SVG_LIB=[`$WX_CONFIG --basename`_svg-`echo ${wx_version} | sed -e "s:\.[0-9]\{1,\}$::"`]
++ ;;
++ *) WX_SVG_LIB=
+ ;;
+ esac
+
+@@ -76,7 +78,7 @@
+
+ if test "$USE_SVG" = 1 ; then
+ CXXFLAGS="$CXXFLAGS -DUSE_SVG"
+- LIBS="$LIBS -l$WX_SVG_LIB"
++ test -n "$WX_SVG_LIB" && LIBS="$LIBS -l$WX_SVG_LIB"
+ fi
+
+ AC_OUTPUT(Makefile ncl-2.0/Makefile ncl-2.0/src/Makefile TreeLib/Makefile tv.spec)
+--- a/tv.cpp
++++ b/tv.cpp
+@@ -162,9 +162,9 @@
+ {
+ // Optional command line argument is name of file to open
+ #if wxUSE_UNICODE
+- wchar_t *InputFile = NULL;
++ const wchar_t *InputFile = NULL;
+ #else
+- char *InputFile = NULL;
++ const char *InputFile = NULL;
+ #endif
+ // Read input/output files
+ if (argc > 1)
+--- a/tview.cpp
++++ b/tview.cpp
+@@ -63,9 +63,13 @@
+ #ifdef __WXMSW__
+ #else
+ #ifdef USE_SVG
++#if wxMAJOR_VERSION >= 3
++ #include <wx/dcsvg.h>
++#else
+ #include <wx/svg/dcsvg.h>
+ #endif
+ #endif
++#endif
+
+ // GUI interface
+ #include "tv.h"
+@@ -187,7 +191,7 @@
+ wxFrame *f = GetMainFrame();
+ wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""), pictureFileName,
+ wxT("Enhanced metafile (*.emf)|*.emf"),
+- wxSAVE|wxOVERWRITE_PROMPT);
++ wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+
+ if (dialog.ShowModal() == wxID_OK)
+ {
+@@ -207,7 +211,7 @@
+ #endif
+ wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""), pictureFileName,
+ wxT("SVG vector picture files (*.svg)|*.svg"),
+- wxSAVE|wxOVERWRITE_PROMPT);
++ wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+
+ if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
+ {
+@@ -362,7 +366,7 @@
+
+ // Clear the canvas in case we're in single-window mode,
+ // and the canvas stays.
+-#if (wxMINOR_VERSION > 4) // from 2.5 Clear is deprecated
++#if (wxMAJOR_VERSION >= 3 || wxMINOR_VERSION > 4) // from 2.5 Clear is deprecated
+ canvas->ClearBackground();
+ #else
+ canvas->Clear();
+@@ -687,7 +691,7 @@
+ wxFontData data;
+ data.SetInitialFont (LeafFont);
+
+-#ifdef __WXMAC__
++#if wxMAJOR_VERSION >= 3 || defined __WXMAC__
+ wxFontDialog dialog((wxWindow *)GetFrame(), data);
+ #else
+ wxFontDialog dialog((wxWindow *)GetMainFrame(), &data);
diff -Nru treeviewx-0.5.1+20100823/debian/rules treeviewx-0.5.1+20100823/debian/rules
--- treeviewx-0.5.1+20100823/debian/rules 2012-08-03 00:01:48.000000000 +1200
+++ treeviewx-0.5.1+20100823/debian/rules 2014-06-12 00:57:36.000000000 +1200
@@ -5,7 +5,7 @@
#export DH_VERBOSE=1
%:
- dh $@
+ dh $@ --with autoreconf
#Installation is simply a matter of copying the files, without extensions
override_dh_install:
