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

[Andreas Tille]

Author: tille
Date: 2014-08-10 17:23:26 +0000 (Sun, 10 Aug 2014)
New Revision: 17675

Added:
   trunk/packages/treeviewx/trunk/debian/patches/wxstring-maxlen.patch
Modified:
   trunk/packages/treeviewx/trunk/debian/changelog
   trunk/packages/treeviewx/trunk/debian/patches/series
Log:
Patch from Martin Stegh?\195?\182fer enabled successfully viewing the provided examples


Modified: trunk/packages/treeviewx/trunk/debian/changelog
===================================================================
--- trunk/packages/treeviewx/trunk/debian/changelog	2014-08-10 17:22:15 UTC (rev 17674)
+++ trunk/packages/treeviewx/trunk/debian/changelog	2014-08-10 17:23:26 UTC (rev 17675)
@@ -1,14 +1,16 @@
-treeviewx (0.5.1+20100823-3) UNRELEASED; urgency=low
+treeviewx (0.5.1+20100823-3) unstable; urgency=low
 
   * Normalised debian/control and updated VCS URLs with ‘config-model-edit’.
   * 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>.
+  * Build on wxwidgets3.0 (thanks to Olly Betts <olly at survex.com>)
+    Further patch (wxstring-maxlen.patch) by Martin Steghöfer to avoid
+    assertion failures
+    Closes: #751255
   * Added keywords to the Desktop meny entry. 
 
- -- Charles Plessy <plessy at debian.org>  Sun, 20 Oct 2013 11:25:10 +0900
+ -- Charles Plessy <plessy at debian.org>  Sun, 10 Aug 2014 19:09:59 +0200
 
 treeviewx (0.5.1+20100823-2) unstable; urgency=low
 

Modified: trunk/packages/treeviewx/trunk/debian/patches/series
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/series	2014-08-10 17:22:15 UTC (rev 17674)
+++ trunk/packages/treeviewx/trunk/debian/patches/series	2014-08-10 17:23:26 UTC (rev 17675)
@@ -4,3 +4,4 @@
 wx3.0-compat.patch
 svg.patch
 treeview-xpm-not-xbm.patch
+wxstring-maxlen.patch

Added: trunk/packages/treeviewx/trunk/debian/patches/wxstring-maxlen.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/wxstring-maxlen.patch	                        (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/wxstring-maxlen.patch	2014-08-10 17:23:26 UTC (rev 17675)
@@ -0,0 +1,48 @@
+Description: Remove wxSTRING_MAXLEN (removed in wx3.0) and incomp. definition.
+ The definition wxSTRING_MAXLEN was removed from the public API of wxWidgets.
+ Its meaning was basically "take all the string", whenever a string length was
+ expected. The missing definition didn't raise a compilation error because
+ TreeLib's treedrawer.h contained a fall-back definition, which is however
+ incompatible with the original definition of wxWidgets and therefore is
+ interpreted by wxWidgets as a number representing the real string length.
+ This patch gets rid of the dangerous fall-back definition and of all of its
+ uses by using alternative wxString constructors that achieve the same
+ behavior.
+Author: Martin Steghöfer <martin at steghoefer.eu>
+Last-Update: Sun, 10 Aug 2014 14:06:42 +0200
+Bug-Debian: http://bugs.debian.org/751255
+
+--- tv-0.5.orig/TreeLib/treedrawer.cpp
++++ tv-0.5/TreeLib/treedrawer.cpp
+@@ -245,7 +245,7 @@
+ 	// error in gcc, which is probably a gcc bug
+ 	{
+ 		wxCoord w, h, descent;
+-		wxString s (formatedString.c_str(), wxSTRING_MAXLEN);
++		wxString s (formatedString.c_str());
+ 		pt.x += dc->GetCharWidth();
+ 		pt.y -= dc->GetCharHeight()/2;
+ 		dc->DrawText (s, (int)pt.x, (int)pt.y);
+@@ -566,7 +566,7 @@
+ 
+ #if USE_WXWINDOWS
+         wxCoord w, h;
+-        wxString s (buf, wxSTRING_MAXLEN);
++        wxString s (buf);
+         dc->GetTextExtent (s, &w, &h);
+         int x = (int)pt2.x;
+         int y = (int)pt2.y;
+--- tv-0.5.orig/TreeLib/treedrawer.h
++++ tv-0.5/TreeLib/treedrawer.h
+@@ -52,11 +52,6 @@
+ #elif USE_WXWINDOWS
+ 	#define USE_PORT 0
+    	#include "wx/wx.h"
+-	#ifdef wxSTRING_MAXLEN
+-	#else
+-		#define wxSTRING_MAXLEN 255
+-	#endif
+-
+ #else
+ 	#define USE_PORT 1
+ #endif