[med-svn] r21337 - trunk/packages/insighttoolkit/trunk/debian/patches
Gert Wollny
gert-guest at moszumanska.debian.org
Sun Jan 31 12:41:44 UTC 2016
Author: gert-guest
Date: 2016-01-31 12:41:43 +0000 (Sun, 31 Jan 2016)
New Revision: 21337
Removed:
trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch
trunk/packages/insighttoolkit/trunk/debian/patches/itk_vxl_gcc6.patch
Modified:
trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Prepare new upstream
Deleted: 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 2016-01-31 12:40:18 UTC (rev 21336)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch 2016-01-31 12:41:43 UTC (rev 21337)
@@ -1,113 +0,0 @@
-Description: Clean up use of double-conversion library
- The original code searches for libdouble-conversion by using
- find_package, but no according cmake module exists. Required
- for #733629
- In addition this patch removes the double-conversion header
- files from the public interface and ensures that the ITK version
- is not build.
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Forwarded: Yes
-
-diff -ru InsightToolkit-4.8.2.old/Modules/Core/Common/include/itkNumberToString.h InsightToolkit-4.8.2/Modules/Core/Common/include/itkNumberToString.h
---- InsightToolkit-4.8.2.old/Modules/Core/Common/include/itkNumberToString.h 2015-12-03 23:30:51.699038707 +0100
-+++ InsightToolkit-4.8.2/Modules/Core/Common/include/itkNumberToString.h 2015-12-03 23:58:47.699157097 +0100
-@@ -18,7 +18,6 @@
- #ifndef itkNumberToString_h
- #define itkNumberToString_h
-
--#include "double-conversion.h"
- #include "itkMacro.h"
- #include <string>
-
-@@ -43,15 +42,10 @@
- class NumberToString
- {
- public:
-- NumberToString() :
-- m_DoubleToStringConverter(double_conversion::DoubleToStringConverter::EcmaScriptConverter())
-- {
-- }
- std::string operator() (TValue val);
-
- private:
- NumberToString & operator=(const NumberToString &); // not defined
-- const double_conversion::DoubleToStringConverter &m_DoubleToStringConverter;
- };
-
- // declaration of specialization
-diff -ru InsightToolkit-4.8.2.old/Modules/Core/Common/src/itkNumberToString.cxx InsightToolkit-4.8.2/Modules/Core/Common/src/itkNumberToString.cxx
---- InsightToolkit-4.8.2.old/Modules/Core/Common/src/itkNumberToString.cxx 2015-12-03 23:30:51.705038707 +0100
-+++ InsightToolkit-4.8.2/Modules/Core/Common/src/itkNumberToString.cxx 2015-12-03 23:36:52.962064226 +0100
-@@ -17,6 +17,7 @@
- *=========================================================================*/
- #include "itkNumberToString.h"
- #include "itkNumericTraits.h"
-+#include "double-conversion.h"
-
- #include <sstream>
-
-@@ -27,9 +28,11 @@
- std::string NumberToString<double>::operator() (double val)
- {
- char buf[256];
-+ const double_conversion::DoubleToStringConverter& converter =
-+ double_conversion::DoubleToStringConverter::EcmaScriptConverter();
- double_conversion::StringBuilder builder(buf,sizeof(buf));
- builder.Reset();
-- if(!m_DoubleToStringConverter.ToShortest(val,&builder))
-+ if(!converter.ToShortest(val,&builder))
- {
- itkGenericExceptionMacro(<< "Conversion failed for " << val);
- }
-@@ -40,9 +43,12 @@
- std::string NumberToString<float>::operator() (float val)
- {
- char buf[256];
-+ const double_conversion::DoubleToStringConverter& converter =
-+ double_conversion::DoubleToStringConverter::EcmaScriptConverter();
-+
- double_conversion::StringBuilder builder(buf,sizeof(buf));
- builder.Reset();
-- if(!m_DoubleToStringConverter.ToShortestSingle(val,&builder))
-+ if(!converter.ToShortestSingle(val,&builder))
- {
- itkGenericExceptionMacro(<< "Conversion failed for " << val);
- }
-Only in InsightToolkit-4.8.2/Modules/Core/Common/src: itkNumberToString.cxx~
-diff -ru InsightToolkit-4.8.2.old/Modules/ThirdParty/DoubleConversion/CMakeLists.txt InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/CMakeLists.txt
---- InsightToolkit-4.8.2.old/Modules/ThirdParty/DoubleConversion/CMakeLists.txt 2015-12-03 23:30:51.870038719 +0100
-+++ InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/CMakeLists.txt 2015-12-03 23:37:22.369066303 +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
-diff -ru InsightToolkit-4.8.2.old/Modules/ThirdParty/DoubleConversion/src/CMakeLists.txt InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/src/CMakeLists.txt
---- InsightToolkit-4.8.2.old/Modules/ThirdParty/DoubleConversion/src/CMakeLists.txt 2015-12-03 23:30:51.870038719 +0100
-+++ InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/src/CMakeLists.txt 2015-12-04 00:11:24.311210542 +0100
-@@ -1 +1,4 @@
--add_subdirectory(double-conversion)
-+if(NOT ITK_USE_SYSTEM_DOUBLECONVERSION)
-+ add_subdirectory(double-conversion)
-+endif()
-+
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/itk_vxl_gcc6.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk_vxl_gcc6.patch 2016-01-31 12:40:18 UTC (rev 21336)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk_vxl_gcc6.patch 2016-01-31 12:41:43 UTC (rev 21337)
@@ -1,61 +0,0 @@
-From 7633bd09c95f6bac6e861f7d965f0965b0e6f328 Mon Sep 17 00:00:00 2001
-From: Martin Michlmayr <tbm at hpe.com>
-Date: Wed, 20 Jan 2016 13:43:36 -0800
-Subject: [PATCH 1/1] COMP: fixed error "Dunno about this gcc" for gcc 6
-
----
- Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx | 10 ++++++++++
- Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h | 9 ++++++++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-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 2d2d232..f473897 100644
---- a/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
-+++ b/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
-@@ -111,6 +111,16 @@ int test_preprocessor_main(int /*argc*/,char* /*argv*/[])
- ++minor_count;
- #endif
-
-+#ifdef VCL_GCC_6
-+ ++major_count;
-+#endif
-+#ifdef VCL_GCC_60
-+ ++minor_count;
-+#endif
-+#ifdef VCL_GCC_61
-+ ++minor_count;
-+#endif
-+
- #ifdef VCL_VC
- ++compiler_count;
- #endif
-diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-index c6bcf84..f7b4fdb 100644
---- a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-+++ b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-@@ -133,6 +133,13 @@
- # else
- # define VCL_GCC_50
- # endif
-+# elif (__GNUC__==6)
-+# define VCL_GCC_6
-+# if (__GNUC_MINOR__ > 0 )
-+# define VCL_GCC_61
-+# else
-+# define VCL_GCC_60
-+# endif
- # else
- # error "Dunno about this gcc"
- # endif
-@@ -252,7 +259,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) || defined(VCL_GCC_5)
-+# if defined(VCL_GCC_3) || defined(VCL_GCC_4) || defined(VCL_GCC_5) || defined(VCL_GCC_6)
- # 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
---
-1.9.1
-
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2016-01-31 12:40:18 UTC (rev 21336)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2016-01-31 12:41:43 UTC (rev 21337)
@@ -1,4 +1,2 @@
nrrdio-linking.patch
bsd-hdf5.patch
-#itk-4.8.2-find-doubleconversion.patch
-itk_vxl_gcc6.patch
More information about the debian-med-commit
mailing list