[med-svn] r19426 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2015-06-29 02:38:20 +0000 (Mon, 29 Jun 2015)
New Revision: 19426

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/vcl-dunno-about-this-gcc.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Upstream patch to build VXL with GCC 5.



Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2015-06-28 19:45:20 UTC (rev 19425)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2015-06-29 02:38:20 UTC (rev 19426)
@@ -1,3 +1,10 @@
+insighttoolkit4 (4.7.2-2) unstable; urgency=medium
+
+  * patches/vcl-dunno-about-this-gcc.patch: New.  Upstream patch to build
+    VCL with GCC 5.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 28 Jun 2015 16:07:00 -0500
+
 insighttoolkit4 (4.7.2-1) unstable; urgency=medium
 
   * New upstream.

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2015-06-28 19:45:20 UTC (rev 19425)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2015-06-29 02:38:20 UTC (rev 19426)
@@ -2,3 +2,4 @@
 bsd-hdf5.patch
 0005-make-gdcm-helper-library-static.patch
 0003_correct_bsplinecontrolpointimagefunction_pointtype.patch
+vcl-dunno-about-this-gcc.patch

Added: trunk/packages/insighttoolkit/trunk/debian/patches/vcl-dunno-about-this-gcc.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/vcl-dunno-about-this-gcc.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/vcl-dunno-about-this-gcc.patch	2015-06-29 02:38:20 UTC (rev 19426)
@@ -0,0 +1,58 @@
+From: Alexander Hewer <hewer at coli.uni-saarland.de>
+Date: Tue, 5 May 2015 08:45:33 +0000 (+0200)
+Subject: COMP: fixed error "Dunno about this gcc" for gcc 5.1
+X-Git-Tag: v4.8rc01~104^2
+X-Git-Url: http://itk.org/gitweb?p=ITK.git;a=commitdiff_plain;h=7f54e864;hp=8d58556089399c11d51795d46d6b17c355af95dc
+
+COMP: fixed error "Dunno about this gcc" for gcc 5.1
+
+Change-Id: I52f692b3e3e1aa01327cb6e184541526d2c824df
+---
+
+diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx b/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
+index 898ea3d..2d2d232 100644
+--- a/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
++++ b/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
+@@ -101,6 +101,15 @@ int test_preprocessor_main(int /*argc*/,char* /*argv*/[])
+   ++minor_count;
+ #endif
+ 
++#ifdef VCL_GCC_5
++  ++major_count;
++#endif
++#ifdef VCL_GCC_50
++  ++minor_count;
++#endif
++#ifdef VCL_GCC_51
++  ++minor_count;
++#endif
+ 
+ #ifdef VCL_VC
+   ++compiler_count;
+diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
+index bad40b0..c6bcf84 100644
+--- a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
++++ b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
+@@ -126,6 +126,13 @@
+ #  else
+ #   define VCL_GCC_40
+ #  endif
++# elif (__GNUC__==5)
++#  define VCL_GCC_5
++#  if (__GNUC_MINOR__ > 0 )
++#   define VCL_GCC_51
++#  else
++#   define VCL_GCC_50
++#  endif
+ # else
+ #  error "Dunno about this gcc"
+ # endif
+@@ -245,7 +252,7 @@
+ 
+ // This *needs* to come after vcl_config_headers.h
+ #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+-# if defined(VCL_GCC_3) || defined(VCL_GCC_4)
++# if defined(VCL_GCC_3) || defined(VCL_GCC_4) || defined(VCL_GCC_5)
+ #  define GNU_LIBSTDCXX_V3 1
+ # elif !defined(GNU_LIBSTDCXX_V3) && defined(VCL_GCC_295) && VCL_CXX_HAS_HEADER_ISTREAM
+ // One difference between v2 and v3 is that the former has