[med-svn] r4029 - trunk/packages/insighttoolkit/trunk/debian/patches

Sat Sep 26 04:46:44 UTC 2009

Author: smr
Date: 2009-09-26 04:46:43 +0000 (Sat, 26 Sep 2009)
New Revision: 4029

Removed:
   trunk/packages/insighttoolkit/trunk/debian/patches/netlib-slatec-soname.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/pythonfiles-install.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/sharedforward.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/vnl-math-asm.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Remove patches applied upstream in 3.16.0.

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/netlib-slatec-soname.patch
===================================================================

--- trunk/packages/insighttoolkit/trunk/debian/patches/netlib-slatec-soname.patch	2009-09-26 04:26:14 UTC (rev 4028)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/netlib-slatec-soname.patch	2009-09-26 04:46:43 UTC (rev 4029)
@@ -1,15 +0,0 @@
-Fix applied on trunk, revision 1.8.
-
---- insighttoolkit-3.14.0.orig/Utilities/netlib/slatec/CMakeLists.txt
-+++ insighttoolkit-3.14.0/Utilities/netlib/slatec/CMakeLists.txt
-@@ -22,6 +22,10 @@
-   d_mod.c  
-  )
- 
-+IF(ITK_LIBRARY_PROPERTIES)
-+  SET_TARGET_PROPERTIES(itkNetlibSlatec PROPERTIES ${ITK_LIBRARY_PROPERTIES})
-+ENDIF(ITK_LIBRARY_PROPERTIES)
-+
- IF(ITK_USE_SYSTEM_VXL)
-   TARGET_LINK_LIBRARIES( itkNetlibSlatec netlib )
- ELSE(ITK_USE_SYSTEM_VXL)

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/pythonfiles-install.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/pythonfiles-install.patch	2009-09-26 04:26:14 UTC (rev 4028)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/pythonfiles-install.patch	2009-09-26 04:46:43 UTC (rev 4029)
@@ -1,19 +0,0 @@
-This FILE(INSTALL ...) command worked fine with cmake 2.4
-but cmake 2.6 complains about "COMPONENTS".  Removing it stops
-the complaint and the files are still properly installed.
-
-c.f. http://www.itk.org/pipermail/insight-users/2008-May/026024.html
-
-Applied on trunk: Committer: Steven Robbins <steve at sumost.ca>
-/cvsroot/Insight/Insight/Wrapping/CSwig/pythonfiles_install.cmake.in,v  <--  pythonfiles_install.cmake.in
-new revision: 1.7; previous revision: 1.6
-
-
---- insighttoolkit-3.6.0.orig/Wrapping/CSwig/pythonfiles_install.cmake.in
-+++ insighttoolkit-3.6.0/Wrapping/CSwig/pythonfiles_install.cmake.in
-@@ -10,5 +10,4 @@
- FILE(INSTALL
-   DESTINATION "@CMAKE_INSTALL_PREFIX@@ITK_INSTALL_LIB_DIR@"
-   TYPE FILE
--  COMPONENTS "RuntimeLibraries"
-   FILES ${ITK_PYTHON_FILES})

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2009-09-26 04:26:14 UTC (rev 4028)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2009-09-26 04:46:43 UTC (rev 4029)
@@ -1,7 +1,3 @@
-vnl-math-asm.patch
-sharedforward.patch
 gccxml-workaround.patch
 03_examples.patch
 tcl-install.patch
-pythonfiles-install.patch
-netlib-slatec-soname.patch

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/sharedforward.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/sharedforward.patch	2009-09-26 04:26:14 UTC (rev 4028)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/sharedforward.patch	2009-09-26 04:46:43 UTC (rev 4029)
@@ -1,20 +0,0 @@
-The SharedForward.h code configures for a number of different platforms;
-mainly by examining OS-specific symbols, such as __linux.  
-
-For SUN systems, however, the __sparc symbol is used, which defines a
-CPU, not an OS, and is also defined for linux on sparc.  Since the
-linux clause comes first, we just ensure that the system has not
-already been configured.
-
-
---- insighttoolkit-3.6.0.orig/Utilities/kwsys/SharedForward.h.in
-+++ insighttoolkit-3.6.0/Utilities/kwsys/SharedForward.h.in
-@@ -217,8 +217,8 @@
- #endif
- 
- /* SUN */
--#if defined(__sparc)
-+#if defined(__sparc) && !defined(KWSYS_SHARED_FORWARD_LDPATH)
- # define KWSYS_SHARED_FORWARD_LDD "ldd"
- # define KWSYS_SHARED_FORWARD_LDD_N 1
- # include <sys/isa_defs.h>

Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/vnl-math-asm.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/vnl-math-asm.patch	2009-09-26 04:26:14 UTC (rev 4028)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/vnl-math-asm.patch	2009-09-26 04:46:43 UTC (rev 4029)
@@ -1,36 +0,0 @@
-Reported on the Insight-developers mailing list.  Already known and
-fixed on trunk, to be released in version 3.16.
-
-Date: Wed, 22 Jul 2009 09:33:19 +0200
-From: Tom Vercauteren <tom.vercauteren at gmail.com>
-To: "Steve M. Robbins" <steve at sumost.ca>
-Subject: Re: [Insight-developers] ITK 3.14 cannot build with GCC on non-ix86
-
-Hi Steve,
-
-There was indeed a logic flaw in the ifdefs of vnl_math.h that would
-prevent ITK from building on non x86 and non ppc platforms. This
-problem should have been fixed (after the 3.14 release) with the
-following patch:
-http://www.itk.org/cgi-bin/viewcvs.cgi/Utilities/vxl/core/vnl/vnl_math.h?root=Insight&r1=1.13&r2=1.11&sortby=date
-
-You could try to back-port this patch on the 3.14 branch. Still, what
-I don't quite understand why the build is failing on ppc too there
-https://buildd.debian.org/~luk/status/package.php?p=insighttoolkit.
-
-Hope this helps,
-Tom
-
-
-
---- insighttoolkit-3.14.0.orig/Utilities/vxl/core/vnl/vnl_math.h
-+++ insighttoolkit-3.14.0/Utilities/vxl/core/vnl/vnl_math.h
-@@ -56,7 +56,7 @@
- #endif
- // Turn on fast impl when using GCC with the following exception:
- //   GCCXML, PPC, PPC64
--#if defined(__GNUC__) && (!defined(__GCCXML__)) && (!defined(__ppc__)) && (!defined(__ppc64__))
-+#if defined(__GNUC__) && (!defined(__GCCXML__)) && (defined(__i386__) || defined(__amd64__))
- # define GCC_USE_FAST_IMPL 1
- #else
- # define GCC_USE_FAST_IMPL 0


