[med-svn] r17140 - trunk/packages/treeviewx/trunk/debian/patches

[Charles Plessy]

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

Added:
   trunk/packages/treeviewx/trunk/debian/patches/svg.patch
Modified:
   trunk/packages/treeviewx/trunk/debian/patches/series
Log:
Update configure.in to match what it must have said when configure was generated.


Modified: trunk/packages/treeviewx/trunk/debian/patches/series
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/series	2014-06-11 22:43:34 UTC (rev 17139)
+++ trunk/packages/treeviewx/trunk/debian/patches/series	2014-06-11 22:44:34 UTC (rev 17140)
@@ -2,3 +2,4 @@
 70_choose_tree.patch
 fix_loading_crash.patch
 wx3.0-compat.patch
+svg.patch

Added: trunk/packages/treeviewx/trunk/debian/patches/svg.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/svg.patch	                        (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/svg.patch	2014-06-11 22:44:34 UTC (rev 17140)
@@ -0,0 +1,39 @@
+Author: Olly Betts <olly at survex.com>
+Description: Update configure.in to match what it must have said when configure was generated.
+ 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.
+Forwarded: no
+--- 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)