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

[Steven Michael Robbins]

Author: smr
Date: 2010-05-08 01:51:30 +0000 (Sat, 08 May 2010)
New Revision: 4788

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/hppa-complex-long-double.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
New patch hppa-complex-long-double.patch to fix hppa link error.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2010-05-07 13:16:02 UTC (rev 4787)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2010-05-08 01:51:30 UTC (rev 4788)
@@ -1,3 +1,11 @@
+insighttoolkit (3.18.0-3) unstable; urgency=low
+
+  * patches/hppa-complex-long-double.patch: New (thanks, Denis
+    Barbier). Remove conditional that prevented building long double
+    datastructures on HPPA.  Closes: #558998.
+
+ -- Steve M. Robbins <smr at debian.org>  Fri, 07 May 2010 20:51:01 -0500
+
 insighttoolkit (3.18.0-2) unstable; urgency=low
 
   * control.in: Remove version restriction (>= 1.6) from default-jdk.

Added: trunk/packages/insighttoolkit/trunk/debian/patches/hppa-complex-long-double.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/hppa-complex-long-double.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/hppa-complex-long-double.patch	2010-05-08 01:51:30 UTC (rev 4788)
@@ -0,0 +1,46 @@
+Description: Avoid undefined reference to `void_vnl_c_vector_inf_norm...'
+ link error on HPPA.  This patch reverts upstream change
+ http://vxl.svn.sourceforge.net/viewvc/vxl?view=rev&revision=11383
+Author: Denis Barbier <bouzim at gmail.com>
+Bug: 558998
+Forwarded: not yet
+
+
+--- insighttoolkit-3.18.0.orig/Utilities/vxl/core/vnl/Templates/vnl_c_vector+long_double_complex-.cxx
++++ insighttoolkit-3.18.0/Utilities/vxl/core/vnl/Templates/vnl_c_vector+long_double_complex-.cxx
+@@ -1,6 +1,4 @@
+ #include <vnl/vnl_complex.h>
+ #include <vnl/vnl_c_vector.txx>
+ 
+-#ifndef __hppa // bug in HP assembler?
+ VNL_C_VECTOR_INSTANTIATE_unordered(vcl_complex<long double>);
+-#endif
+--- insighttoolkit-3.18.0.orig/Utilities/vxl/core/vnl/Templates/vnl_det+vcl_complex+long_double--.cxx
++++ insighttoolkit-3.18.0/Utilities/vxl/core/vnl/Templates/vnl_det+vcl_complex+long_double--.cxx
+@@ -1,6 +1,4 @@
+ #include <vcl_complex.h>
+ #include <vnl/vnl_det.txx>
+ 
+-#ifndef __hppa // bug in HP assembler?
+ VNL_DET_INSTANTIATE(vcl_complex<long double>);
+-#endif
+--- insighttoolkit-3.18.0.orig/Utilities/vxl/core/vnl/vnl_copy.cxx
++++ insighttoolkit-3.18.0/Utilities/vxl/core/vnl/vnl_copy.cxx
+@@ -38,9 +38,7 @@
+ VNL_COPY_INSTANTIATE0(float, double);
+ VNL_COPY_INSTANTIATE0(double, float);
+ VNL_COPY_INSTANTIATE0(double, long double);
+-#ifndef __hppa // assembler bug on HP?
+ VNL_COPY_INSTANTIATE0(long double, double);
+-#endif
+ 
+ #define macro(S, D) \
+ VCL_DEFINE_SPECIALIZATION \
+@@ -68,7 +66,5 @@
+ 
+ VNL_COPY_INSTANTIATE_twoway(float, double);
+ VNL_COPY_INSTANTIATE_twoway(vcl_complex<float>, vcl_complex<double>);
+-#ifndef __hppa // assembler bug on HP?
+ VNL_COPY_INSTANTIATE_twoway(double, long double);
+ VNL_COPY_INSTANTIATE_twoway(vcl_complex<double>, vcl_complex<long double>);
+-#endif

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-05-07 13:16:02 UTC (rev 4787)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2010-05-08 01:51:30 UTC (rev 4788)
@@ -1,3 +1,4 @@
+hppa-complex-long-double.patch
 gccxml-workaround.patch
 03_examples.patch
 tcl-install.patch