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

[Gert Wollny]

Author: gert-guest
Date: 2015-12-03 22:13:27 +0000 (Thu, 03 Dec 2015)
New Revision: 20624

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Enable use of system double-conversion 

  * Add patch to relace nonfunctional find_package call
    by a simple search 
  * Update d/control and d/rules accordingly



Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2015-12-03 14:06:11 UTC (rev 20623)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2015-12-03 22:13:27 UTC (rev 20624)
@@ -1,3 +1,10 @@
+insighttoolkit4 (4.8.2-2) UNRELEASED; urgency=medium
+
+  * d/rules, d/control: Enable use of system double-conversion
+    Closes: #733629 
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Wed, 02 Dec 2015 15:45:56 +0100
+
 insighttoolkit4 (4.8.2-1) unstable; urgency=medium
 
   * New upstream 

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2015-12-03 14:06:11 UTC (rev 20623)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2015-12-03 22:13:27 UTC (rev 20624)
@@ -10,6 +10,7 @@
 	swig3.0,
 	castxml,
 	zlib1g-dev (>= 1.2.2), 
+	libdouble-conversion-dev, 
 	libpng12-dev, 
 	libtiff-dev,
 	libfftw3-dev,
@@ -46,7 +47,7 @@
 Package: libinsighttoolkit4-dev
 Section: libdevel
 Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit4.8 (= ${binary:Version}), libgdcm2-dev, libdcmtk2-dev, libhdf5-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit4.8 (= ${binary:Version}), libgdcm2-dev, libdcmtk2-dev, libhdf5-dev, libdouble-conversion-dev
 Recommends: libfftw3-dev, uuid-dev
 Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev
 Replaces: libinsighttoolkit-dev

Added: trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch	2015-12-03 22:13:27 UTC (rev 20624)
@@ -0,0 +1,35 @@
+Description: Inject a simple approch to find libdouble-conversion
+ The original code searches for libdouble-conversion by using 
+ find_package, but no according cmake module exists. Required 
+ for #733629
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Forwarded: No 
+
+diff -ru InsightToolkit-4.8.2.orig/Modules/ThirdParty/DoubleConversion/CMakeLists.txt InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/CMakeLists.txt
+--- InsightToolkit-4.8.2.orig/Modules/ThirdParty/DoubleConversion/CMakeLists.txt	2015-11-12 17:21:07.000000000 +0100
++++ InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/CMakeLists.txt	2015-12-03 22:00:01.771653734 +0100
+@@ -7,11 +7,19 @@
+ mark_as_advanced(ITK_USE_SYSTEM_DOUBLECONVERSION)
+ 
+ if(ITK_USE_SYSTEM_DOUBLECONVERSION)
+-  find_package(double-conversion NO_MODULE)
+-  set(ITKDoubleConversion_SYSTEM_INCLUDE_DIRS
+-    ${double-conversion_INCLUDE_DIRS})
+-  set(ITKDoubleConversion_LIBRARIES
+-    "${double-conversion_LIBRARIES}")
++  find_library(double-conversion_LIBRARIES double-conversion)
++  find_path(double-conversion_INCLUDE_DIRS double-conversion.h
++    PATH_SUFFIXES double-conversion
++    )
++
++  if (double-conversion_LIBRARIES AND double-conversion_INCLUDE_DIRS)
++    set(ITKDoubleConversion_SYSTEM_INCLUDE_DIRS
++      ${double-conversion_INCLUDE_DIRS})
++    set(ITKDoubleConversion_LIBRARIES
++      "${double-conversion_LIBRARIES}")
++  else()
++    MESSAGE(ERROR "double-conversion system library not found")
++  endif()
+ else()
+   set(ITKDoubleConversion_INCLUDE_DIRS
+     ${ITKDoubleConversion_SOURCE_DIR}/src/double-conversion

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2015-12-03 14:06:11 UTC (rev 20623)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2015-12-03 22:13:27 UTC (rev 20624)
@@ -1,2 +1,3 @@
 nrrdio-linking.patch
 bsd-hdf5.patch
+itk-4.8.2-find-doubleconversion.patch

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2015-12-03 14:06:11 UTC (rev 20623)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2015-12-03 22:13:27 UTC (rev 20624)
@@ -28,7 +28,7 @@
 	-DITK_USE_FFTWF:BOOL=$(ENABLE_FFTW) \
 	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
 	-DITK_USE_SYSTEM_DCMTK:BOOL=ON \
-	-DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=OFF \
+	-DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=ON \
 	-DITK_USE_SYSTEM_FFTW:BOOL=$(ENABLE_FFTW) \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
 	-DITK_USE_SYSTEM_HDF5:BOOL=ON \