[med-svn] r17139 - in trunk/packages/treeviewx/trunk/debian: . patches

[Charles Plessy]

Author: plessy
Date: 2014-06-11 22:43:34 +0000 (Wed, 11 Jun 2014)
New Revision: 17139

Added:
   trunk/packages/treeviewx/trunk/debian/patches/wx3.0-compat.patch
Modified:
   trunk/packages/treeviewx/trunk/debian/changelog
   trunk/packages/treeviewx/trunk/debian/control
   trunk/packages/treeviewx/trunk/debian/patches/series
Log:
Build on wxwidgets3.0.

Closes: #751255
Thanks: Olly Betts <olly at survex.com>



Modified: trunk/packages/treeviewx/trunk/debian/changelog
===================================================================
--- trunk/packages/treeviewx/trunk/debian/changelog	2014-06-11 21:39:10 UTC (rev 17138)
+++ trunk/packages/treeviewx/trunk/debian/changelog	2014-06-11 22:43:34 UTC (rev 17139)
@@ -4,6 +4,8 @@
   * Conforms with Policy 3.9.5.
   * Build with dh_autoreconf. 
   * Removed mailcap entry file, redundant with FreeDesktope menu file.
+  * Build on wxwidgets3.0.
+    Closes: #751255, thanks to Olly Betts <olly at survex.com>.
 
  -- Charles Plessy <plessy at debian.org>  Sun, 20 Oct 2013 11:25:10 +0900
 

Modified: trunk/packages/treeviewx/trunk/debian/control
===================================================================
--- trunk/packages/treeviewx/trunk/debian/control	2014-06-11 21:39:10 UTC (rev 17138)
+++ trunk/packages/treeviewx/trunk/debian/control	2014-06-11 22:43:34 UTC (rev 17139)
@@ -6,7 +6,7 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               libwxgtk2.8-dev
+               libwxgtk3.0-dev
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/treeviewx/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/treeviewx/trunk/

Modified: trunk/packages/treeviewx/trunk/debian/patches/series
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/series	2014-06-11 21:39:10 UTC (rev 17138)
+++ trunk/packages/treeviewx/trunk/debian/patches/series	2014-06-11 22:43:34 UTC (rev 17139)
@@ -1,3 +1,4 @@
 60_LGPLtoGPL.patch
 70_choose_tree.patch
 fix_loading_crash.patch
+wx3.0-compat.patch

Added: trunk/packages/treeviewx/trunk/debian/patches/wx3.0-compat.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/wx3.0-compat.patch	                        (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/wx3.0-compat.patch	2014-06-11 22:43:34 UTC (rev 17139)
@@ -0,0 +1,70 @@
+Description: Build with wxwidgets3.0
+Author: Olly Betts <olly at survex.com>
+Bug-Debian: https://bugs.debian.org/751255
+Forwarded: no
+--- 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);