[med-svn] [Git][med-team/insighttoolkit][master] Remove patch obsoleted by upstream 4.13.2 according to d59aeb374ac3521c2150a248113a208b60126742
Steven Robbins
gitlab at salsa.debian.org
Sat Aug 8 20:32:50 BST 2020
Steven Robbins pushed to branch master at Debian Med / insighttoolkit
Commits:
dff22e39 by Steve Robbins at 2020-08-08T14:29:43-05:00
Remove patch obsoleted by upstream 4.13.2 according to d59aeb374ac3521c2150a248113a208b60126742
- - - - -
2 changed files:
- − debian/patches/fix_python_tests.diff
- debian/patches/series
Changes:
=====================================
debian/patches/fix_python_tests.diff deleted
=====================================
@@ -1,255 +0,0 @@
-From 74436278d330b8a9925df37f3c4e1fd9c4e92a04 Mon Sep 17 00:00:00 2001
-From: Matt McCormick <matt.mccormick at kitware.com>
-Date: Sun, 04 Mar 2018 18:13:39 -0500
-Subject: [PATCH] BUG: Wrap long long instead of long
-
-Make ITK_WRAP_unsigned_long_long and ITK_WRAP_signed_long_long CMake
-options. Deprecate and hide ITK_WRAP_unsigned_long and
-ITK_WRAP_signed_long. This ensures that the wrapped integer is 64 bits
-on both Windows and Unix-like systems. This also helps with
-compatibility for IO formats that uses 64 bit integers more consistently
-since ITK 4.13.0.
-
-Change-Id: I7bef27ef3a4f056cf016a5b1571d5f620c29901a
----
-
-diff --git a/Modules/Core/Common/wrapping/itkSimpleDataObjectDecorator.wrap b/Modules/Core/Common/wrapping/itkSimpleDataObjectDecorator.wrap
-index c301e9e..d8a09a2 100644
---- a/Modules/Core/Common/wrapping/itkSimpleDataObjectDecorator.wrap
-+++ b/Modules/Core/Common/wrapping/itkSimpleDataObjectDecorator.wrap
-@@ -2,19 +2,19 @@
- itk_wrap_template("${ITKM_D}" "${ITKT_D}")
- itk_wrap_template("${ITKM_F}" "${ITKT_F}")
- itk_wrap_template("${ITKM_UL}" "${ITKT_UL}")
-+ itk_wrap_template("${ITKM_ULL}" "${ITKT_ULL}")
- itk_wrap_template("${ITKM_US}" "${ITKT_US}")
- itk_wrap_template("${ITKM_UC}" "${ITKT_UC}")
- itk_wrap_template("${ITKM_SL}" "${ITKT_SL}")
-+ itk_wrap_template("${ITKM_SLL}" "${ITKT_SLL}")
- itk_wrap_template("${ITKM_SS}" "${ITKT_SS}")
- itk_wrap_template("${ITKM_SC}" "${ITKT_SC}")
- itk_wrap_template("${ITKM_B}" "${ITKT_B}")
- itk_wrap_template("${ITKM_AD}" "${ITKT_AD}")
- itk_wrap_template("${ITKM_AF}" "${ITKT_AF}")
-- if(WIN32 AND ITK_USE_64BITS_IDS)
-- itk_wrap_template("${ITKM_AULL}" "${ITKT_AULL}")
-- else()
-- itk_wrap_template("${ITKM_AUL}" "${ITKT_AUL}")
-- endif()
-+ # For ImageToHistogramFilter
-+ itk_wrap_template("${ITKM_AULL}" "${ITKT_AULL}")
-+ itk_wrap_template("${ITKM_AUL}" "${ITKT_AUL}")
- # non scalar types
- foreach(t ${WRAP_ITK_VECTOR})
- foreach(d ${ITK_WRAP_VECTOR_COMPONENTS})
-diff --git a/Modules/Core/Common/wrapping/vnl_c_vector.wrap b/Modules/Core/Common/wrapping/vnl_c_vector.wrap
-index 661a927..fac4fe7 100644
---- a/Modules/Core/Common/wrapping/vnl_c_vector.wrap
-+++ b/Modules/Core/Common/wrapping/vnl_c_vector.wrap
-@@ -9,11 +9,13 @@
- itk_wrap_template("${ITKM_F}" "${ITKT_F}")
- itk_wrap_template("${ITKM_SI}" "${ITKT_SI}")
- itk_wrap_template("${ITKM_SL}" "${ITKT_SL}")
-+ itk_wrap_template("${ITKM_SLL}" "${ITKT_SLL}")
- itk_wrap_template("${ITKM_LD}" "${ITKT_LD}")
- itk_wrap_template("${ITKM_SC}" "${ITKT_SC}")
- itk_wrap_template("${ITKM_UC}" "un${ITKT_SC}")
- itk_wrap_template("${ITKM_UI}" "un${ITKT_SI}")
- itk_wrap_template("${ITKM_UL}" "un${ITKT_SL}")
-+ itk_wrap_template("${ITKM_ULL}" "un${ITKT_SLL}")
- foreach(t ${WRAP_ITK_COMPLEX_REAL})
- itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
- endforeach()
-diff --git a/Modules/Core/Common/wrapping/vnl_matrix.wrap b/Modules/Core/Common/wrapping/vnl_matrix.wrap
-index 7c59a17..6443cc3 100644
---- a/Modules/Core/Common/wrapping/vnl_matrix.wrap
-+++ b/Modules/Core/Common/wrapping/vnl_matrix.wrap
-@@ -10,11 +10,13 @@
- itk_wrap_template("${ITKM_F}" "${ITKT_F}")
- itk_wrap_template("${ITKM_SI}" "${ITKT_SI}")
- itk_wrap_template("${ITKM_SL}" "${ITKT_SL}")
-+ itk_wrap_template("${ITKM_SLL}" "${ITKT_SLL}")
- itk_wrap_template("${ITKM_LD}" "${ITKT_LD}")
- itk_wrap_template("${ITKM_SC}" "${ITKT_SC}")
- itk_wrap_template("${ITKM_UC}" "un${ITKT_SC}")
- itk_wrap_template("${ITKM_UI}" "un${ITKT_SI}")
- itk_wrap_template("${ITKM_UL}" "un${ITKT_SL}")
-+ itk_wrap_template("${ITKM_ULL}" "un${ITKT_SLL}")
- itk_wrap_template("${ITKM_SS}" "${ITKT_SS}")
- itk_wrap_template("${ITKM_US}" "${ITKT_US}")
- foreach(t ${WRAP_ITK_COMPLEX_REAL})
-diff --git a/Modules/Core/Common/wrapping/vnl_vector.wrap b/Modules/Core/Common/wrapping/vnl_vector.wrap
-index c301843..f23486f 100644
---- a/Modules/Core/Common/wrapping/vnl_vector.wrap
-+++ b/Modules/Core/Common/wrapping/vnl_vector.wrap
-@@ -6,7 +6,7 @@
- itk_wrap_include("vnl/vnl_vector.h")
-
- itk_wrap_class("vnl_vector" EXPLICIT_SPECIALIZATION)
-- UNIQUE(vector_types "D;F;SI;SL;LD;SC;UC;US;UI;UL;${ITKM_IT};${ITKM_OT};${WRAP_ITK_SCALAR}")
-+ UNIQUE(vector_types "D;F;SI;SL;SLL;LD;SC;UC;US;UI;UL;ULL;${ITKM_IT};${ITKM_OT};${WRAP_ITK_SCALAR}")
- foreach(t ${vector_types})
- itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
- endforeach()
-diff --git a/Modules/Core/Common/wrapping/vnl_vector_ref.wrap b/Modules/Core/Common/wrapping/vnl_vector_ref.wrap
-index d906942..540450c 100644
---- a/Modules/Core/Common/wrapping/vnl_vector_ref.wrap
-+++ b/Modules/Core/Common/wrapping/vnl_vector_ref.wrap
-@@ -4,7 +4,7 @@
- itk_wrap_include("vnl/vnl_vector_ref.h")
-
- itk_wrap_class("vnl_vector_ref" EXPLICIT_SPECIALIZATION)
-- UNIQUE(vector_types "D;F;SI;SL;LD;SC;UC;US;UI;UL;${WRAP_ITK_SCALAR}")
-+ UNIQUE(vector_types "D;F;SI;SL;SLL;LD;SC;UC;US;UI;UL;ULL;${WRAP_ITK_SCALAR}")
- foreach(t ${vector_types})
- itk_wrap_template("${ITKM_${t}}" "${ITKT_${t}}")
- endforeach()
-diff --git a/Wrapping/CMakeLists.txt b/Wrapping/CMakeLists.txt
-index acac185..d2ab52f 100644
---- a/Wrapping/CMakeLists.txt
-+++ b/Wrapping/CMakeLists.txt
-@@ -42,10 +42,20 @@
- option(ITK_WRAP_unsigned_char "Wrap unsigned char type" ON)
- option(ITK_WRAP_unsigned_short "Wrap unsigned short type" OFF)
- option(ITK_WRAP_unsigned_long "Wrap unsigned long type" OFF)
-+mark_as_advanced(ITK_WRAP_unsigned_long)
-+if(ITK_WRAP_unsigned_long)
-+ message(WARNING "ITK_WRAP_unsigned_long is deprecated. Please use ITK_WRAP_unsigned_long_long instead.")
-+endif()
-+option(ITK_WRAP_unsigned_long_long "Wrap unsigned long long type" OFF)
-
- option(ITK_WRAP_signed_char "Wrap signed char type" OFF)
- option(ITK_WRAP_signed_short "Wrap signed short type" ON)
- option(ITK_WRAP_signed_long "Wrap signed long type" OFF)
-+mark_as_advanced(ITK_WRAP_signed_long)
-+if(ITK_WRAP_signed_long)
-+ message(WARNING "ITK_WRAP_signed_long is deprecated. Please use ITK_WRAP_signed_long_long instead.")
-+endif()
-+option(ITK_WRAP_signed_long_long "Wrap signed long long type" OFF)
-
- option(ITK_WRAP_float "Wrap float type" ON)
- option(ITK_WRAP_double "Wrap double type" OFF)
-diff --git a/Wrapping/ConfigureWrapping.cmake b/Wrapping/ConfigureWrapping.cmake
-index e1ae03f..6d27847 100644
---- a/Wrapping/ConfigureWrapping.cmake
-+++ b/Wrapping/ConfigureWrapping.cmake
-@@ -10,10 +10,10 @@
- # ITK_WRAP_JAVA
- # ITK_WRAP_unsigned_char
- # ITK_WRAP_unsigned_short
--# ITK_WRAP_unsigned_long
-+# ITK_WRAP_unsigned_long_long
- # ITK_WRAP_signed_char
- # ITK_WRAP_signed_short
--# ITK_WRAP_signed_long
-+# ITK_WRAP_signed_long_long
- # ITK_WRAP_float
- # ITK_WRAP_double
- # ITK_WRAP_vector_float
-diff --git a/Wrapping/Generators/Python/itkTemplate.py b/Wrapping/Generators/Python/itkTemplate.py
-index 5ceb22e..738921f 100644
---- a/Wrapping/Generators/Python/itkTemplate.py
-+++ b/Wrapping/Generators/Python/itkTemplate.py
-@@ -420,8 +420,8 @@
- raise RuntimeError("No ImageIO is registered to handle the given file.")
- componentTypeDic= {"float": itk.F, "double": itk.D,
- "unsigned_char": itk.UC, "unsigned_short": itk.US, "unsigned_int": itk.UI,
-- "unsigned_long": itk.UL, "char": itk.SC, "short": itk.SS,
-- "int": itk.SI, "long": itk.SL}
-+ "unsigned_long": itk.UL, "unsigned_long_long": itk.ULL, "char": itk.SC, "short": itk.SS,
-+ "int": itk.SI, "long": itk.SL, "long_long": itk.SLL}
- # Read the metadata from the image file.
- imageIO.SetFileName( inputFileName )
- imageIO.ReadImageInformation()
-diff --git a/Wrapping/WrapBasicTypes.cmake b/Wrapping/WrapBasicTypes.cmake
-index 8a8da68..dae07ea 100644
---- a/Wrapping/WrapBasicTypes.cmake
-+++ b/Wrapping/WrapBasicTypes.cmake
-@@ -83,6 +83,9 @@
- if(ITK_WRAP_unsigned_long)
- list(APPEND WRAP_ITK_USIGN_INT "UL")
- endif()
-+if(ITK_WRAP_unsigned_long_long)
-+ list(APPEND WRAP_ITK_USIGN_INT "ULL")
-+endif()
- if(ITK_WRAP_unsigned_short)
- list(APPEND WRAP_ITK_USIGN_INT "US")
- endif()
-@@ -93,6 +96,9 @@
- endif()
- if(ITK_WRAP_signed_long)
- list(APPEND WRAP_ITK_SIGN_INT "SL")
-+endif()
-+if(ITK_WRAP_signed_long_long)
-+ list(APPEND WRAP_ITK_SIGN_INT "SLL")
- endif()
- if(ITK_WRAP_signed_short)
- list(APPEND WRAP_ITK_SIGN_INT "SS")
-@@ -174,8 +180,10 @@
- INTERSECTION(SMALLER_THAN_D "F;UL;US;UC;SL;SS;SC" "${WRAP_ITK_SCALAR}")
- INTERSECTION(SMALLER_THAN_F "UL;US;UC;SL;SS;SC" "${WRAP_ITK_SCALAR}")
- INTERSECTION(SMALLER_THAN_UL "US;UC;SL;SS;SC" "${WRAP_ITK_INT}")
-+INTERSECTION(SMALLER_THAN_ULL "US;UC;SL;SS;SC" "${WRAP_ITK_INT}")
- INTERSECTION(SMALLER_THAN_US "UC;SC" "${WRAP_ITK_INT}")
- INTERSECTION(SMALLER_THAN_SL "US;UC;SS;SC" "${WRAP_ITK_INT}")
-+INTERSECTION(SMALLER_THAN_SLL "US;UC;SS;SC" "${WRAP_ITK_INT}")
- INTERSECTION(SMALLER_THAN_SS "UC;SC" "${WRAP_ITK_INT}")
-
- # Types that correspond itk::SizeValueType, itk::IdentifierType, and itk::OffsetValueType
-diff --git a/Wrapping/WrapITKConfig.cmake.in b/Wrapping/WrapITKConfig.cmake.in
-index 7d1f1db..286bbfb 100644
---- a/Wrapping/WrapITKConfig.cmake.in
-+++ b/Wrapping/WrapITKConfig.cmake.in
-@@ -26,9 +26,11 @@
- set(ITK_WRAP_unsigned_char @ITK_WRAP_unsigned_char@ CACHE BOOL "Wrap unsigned char type")
- set(ITK_WRAP_unsigned_short @ITK_WRAP_unsigned_short@ CACHE BOOL "Wrap unsigned short type")
- set(ITK_WRAP_unsigned_long @ITK_WRAP_unsigned_long@ CACHE BOOL "Wrap unsigned long type")
-+set(ITK_WRAP_unsigned_long_long @ITK_WRAP_unsigned_long_long@ CACHE BOOL "Wrap unsigned long long type")
- set(ITK_WRAP_signed_char @ITK_WRAP_signed_char@ CACHE BOOL "Wrap signed char type")
- set(ITK_WRAP_signed_short @ITK_WRAP_signed_short@ CACHE BOOL "Wrap signed short type")
- set(ITK_WRAP_signed_long @ITK_WRAP_signed_long@ CACHE BOOL "Wrap signed long type")
-+set(ITK_WRAP_signed_long_long @ITK_WRAP_signed_long@ CACHE BOOL "Wrap signed long long type")
- set(ITK_WRAP_float @ITK_WRAP_float@ CACHE BOOL "Wrap float type")
- set(ITK_WRAP_double @ITK_WRAP_double@ CACHE BOOL "Wrap double type")
- set(ITK_WRAP_vector_float @ITK_WRAP_vector_float@ CACHE BOOL "Wrap vector float type")
-diff --git a/Wrapping/WrapITKTypes.cmake b/Wrapping/WrapITKTypes.cmake
-index 9bbeb78..3d936a7 100644
---- a/Wrapping/WrapITKTypes.cmake
-+++ b/Wrapping/WrapITKTypes.cmake
-@@ -105,12 +105,10 @@
- ADD_TEMPLATE("${ITKM_D}" "${ITKT_D}")
- ADD_TEMPLATE("${ITKM_F}" "${ITKT_F}")
- ADD_TEMPLATE("${ITKM_UL}" "${ITKT_UL}")
-+ ADD_TEMPLATE("${ITKM_ULL}" "${ITKT_ULL}")
- ADD_TEMPLATE("${ITKM_SL}" "${ITKT_SL}")
-+ ADD_TEMPLATE("${ITKM_SLL}" "${ITKT_SLL}")
- ADD_TEMPLATE("${ITKM_UI}" "${ITKT_UI}")
-- if(WIN32 AND ITK_USE_64BITS_IDS)
-- ADD_TEMPLATE("${ITKM_ULL}" "${ITKT_ULL}")
-- ADD_TEMPLATE("${ITKM_SLL}" "${ITKT_SLL}")
-- endif()
- END_WRAP_TYPE()
- set(itk_Wrap_Array ${WRAPPER_TEMPLATES})
-
-@@ -140,10 +138,12 @@
- ADD_TEMPLATE("${ITKM_D}${d}" "${ITKT_D},${d}")
- ADD_TEMPLATE("${ITKM_F}${d}" "${ITKT_F},${d}")
- ADD_TEMPLATE("${ITKM_UL}${d}" "${ITKT_UL},${d}")
-+ ADD_TEMPLATE("${ITKM_ULL}${d}" "${ITKT_ULL},${d}")
- ADD_TEMPLATE("${ITKM_US}${d}" "${ITKT_US},${d}")
- ADD_TEMPLATE("${ITKM_UC}${d}" "${ITKT_UC},${d}")
- ADD_TEMPLATE("${ITKM_UI}${d}" "${ITKT_UI},${d}")
- ADD_TEMPLATE("${ITKM_SL}${d}" "${ITKT_SL},${d}")
-+ ADD_TEMPLATE("${ITKM_SLL}${d}" "${ITKT_SLL},${d}")
- ADD_TEMPLATE("${ITKM_SS}${d}" "${ITKT_SS},${d}")
- ADD_TEMPLATE("${ITKM_SC}${d}" "${ITKT_SC},${d}")
- ADD_TEMPLATE("${ITKM_B}${d}" "${ITKT_B},${d}")
-@@ -203,7 +203,7 @@
- # Make a list of all of the selected image pixel types and also double (for
- # BSplineDeformableTransform), uchar (for 8-bit image output), ulong
- # (for the watershed and relabel filters), bool for (FlatStructuringElement)
-- UNIQUE(wrap_image_types "${WRAP_ITK_ALL_TYPES};D;UC;UL;RGBUC;RGBAUC;VD;B;${ITKM_IT}")
-+ UNIQUE(wrap_image_types "${WRAP_ITK_ALL_TYPES};D;UC;UL;ULL;RGBUC;RGBAUC;VD;B;${ITKM_IT}")
-
- set(defined_vector_list )
- foreach(d ${ITK_WRAP_IMAGE_DIMS})
=====================================
debian/patches/series
=====================================
@@ -10,5 +10,3 @@ simplify-system-gtest.patch
fix-minc-includes.patch
remove_gcc_version_test.patch
python3.8.diff
-
-#fix_python_tests.diff
View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/commit/dff22e397c2c3fed508d01cc81a18c2c15d64737
--
View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/commit/dff22e397c2c3fed508d01cc81a18c2c15d64737
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200808/ce6b5289/attachment-0001.html>
More information about the debian-med-commit
mailing list