[med-svn] [gdcm] 03/03: remove the patches
Gert Wollny
gert-guest at moszumanska.debian.org
Sun Dec 13 20:41:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository gdcm.
commit 71377e54e8887419b7788c66bb35e26c72c22baf
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Fri Dec 11 20:17:23 2015 +0100
remove the patches
---
debian/patches/01_toplevelskip.patch | 22 ------
debian/patches/05_enable-vtk6-bindings.patch | 78 ----------------------
.../06_add-csharp-keyfile-from-commandline.patch | 36 ----------
debian/patches/07_vtkgdcm-sharp-siging.patch | 28 --------
debian/patches/series | 4 --
5 files changed, 168 deletions(-)
diff --git a/debian/patches/01_toplevelskip.patch b/debian/patches/01_toplevelskip.patch
deleted file mode 100644
index 5955a22..0000000
--- a/debian/patches/01_toplevelskip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: fix in source builds
- buildd machine wants insource build. upstream does not allow
- insource build since it break cpack source packaging
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: gdcm-2.4.3/CMakeLists.txt
-===================================================================
---- gdcm-2.6.0.old/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/CMakeLists.txt 2015-10-16 14:10:37.474589397 +0200
-@@ -36,9 +36,9 @@
- get_filename_component(PARENTDIR ${GDCM_BINARY_DIR} PATH)
- string(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR)
- if(INSOURCE OR INSOURCESUBDIR)
-- message(FATAL_ERROR "GDCM requires an out of source Build. "
-- "Please create a separate binary directory and run CMake there. "
-- "Or explicitly define GDCM_ALLOW_INSOURCE_BUILD")
-+# message(FATAL_ERROR "GDCM requires an out of source Build. "
-+# "Please create a separate binary directory and run CMake there. "
-+# "Or explicitly define GDCM_ALLOW_INSOURCE_BUILD")
- endif()
- endif()
- #----------------------------------------------------------------------------
diff --git a/debian/patches/05_enable-vtk6-bindings.patch b/debian/patches/05_enable-vtk6-bindings.patch
deleted file mode 100644
index e4d6ae7..0000000
--- a/debian/patches/05_enable-vtk6-bindings.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Description: Correct bindings for use with VTK6
- Add VTK6 export defines and remove some vtk-python libraries
- that no longer exist from the link command
-Author: Gert Wollny <gw.fossdev at gmail.com>
-
-diff -ru gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt gdcm-2.6.0/Utilities/VTK/CMakeLists.txt
---- gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Utilities/VTK/CMakeLists.txt 2015-10-16 17:28:48.000000000 +0200
-@@ -740,9 +740,9 @@
- # do not set the version on the Python module:
- #set_target_properties(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
- target_link_libraries(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME} ${PYTHON_LIBRARY})
-- foreach(c ${vtkgdcm_LIBS} vtkFiltering)
-- target_link_libraries(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
-- endforeach()
-+# foreach(c ${vtkgdcm_LIBS} vtkFiltering)
-+# target_link_libraries(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
-+# endforeach()
- if(TARGET vtkPythonCore)
- target_link_libraries(${VTKGDCM_NAME}PythonD vtkPythonCore)
- endif()
-diff -ru gdcm-2.6.0.old/Utilities/VTK/vtkgdcm.i gdcm-2.6.0/Utilities/VTK/vtkgdcm.i
---- gdcm-2.6.0.old/Utilities/VTK/vtkgdcm.i 2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Utilities/VTK/vtkgdcm.i 2015-10-16 17:42:20.541502614 +0200
-@@ -31,10 +31,10 @@
- #endif
-
- %{
--//#define VTK_MAJOR_VERSION 5
--//#define VTK_MINOR_VERSION 4
-+//#define VTK_MAJOR_VERSION 6
-+//#define VTK_MINOR_VERSION 2
- //#define VTK_BUILD_VERSION 0
--//#define VTK_VERSION "5.4.0"
-+//#define VTK_VERSION "6.2.0"
- %}
-
-
-@@ -101,17 +101,24 @@
- //using My.Own.Namespace;
- //%}
-
--#ifdef USEACTIVIZ
-+#if defined( USEACTIVIZ ) || defined (SWIGCSHARP)
- %typemap(csimports) SWIGTYPE %{
- // I need to duplicate those also:
- using System;
- using System.Runtime.InteropServices;
-+%}
-+#endif
-+
-+#if defined( USEACTIVIZ )
-+%typemap(csimports) SWIGTYPE %{
- // my special import:
- using Kitware.VTK;
- //using Kitware.mummy.Runtime;
- %}
- #endif
-
-+
-+
- #define GDCM_EXPORT
- #define VTK_EXPORT
- #define VTK_COMMON_EXPORT
-@@ -119,6 +126,13 @@
- #define VTK_IO_EXPORT
- #define VTK_IMAGING_EXPORT
- #define VTK_RENDERING_EXPORT
-+#define VTKCOMMONCORE_EXPORT
-+#define VTKCOMMONMATH_EXPORT
-+#define VTKIOIMAGE_EXPORT
-+#define VTKCOMMONDATAMODEL_EXPORT
-+#define VTKCOMMONEXECUTIONMODEL_EXPORT
-+#define VTKRENDERINGCORE_EXPORT
-+#define VTKIMAGINGCORE_EXPORT
-
-
- // FIXME. Including #include vtkSetGet would not work on siwg 1.3.33 ...
diff --git a/debian/patches/06_add-csharp-keyfile-from-commandline.patch b/debian/patches/06_add-csharp-keyfile-from-commandline.patch
deleted file mode 100644
index 3a6079e..0000000
--- a/debian/patches/06_add-csharp-keyfile-from-commandline.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Correct the key handling for the gdcm-sharp module
- This patch moves the addign of the key to the command line and
- adds the signing of the module after it is build.
-Author: Gert Wollny <gw.fossdev at gmail.com>
-
-diff -ru gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in
---- gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in 2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in 2015-10-17 10:59:49.764531268 +0200
-@@ -70,7 +70,7 @@
- // This is not required, if you don't want signing let these attributes like they're.
- [assembly: AssemblyDelaySign(false)]
- // http://msdn.microsoft.com/en-us/library/6f05ezxy(VS.80).aspx
--[assembly: AssemblyKeyFile("key.snk")]
-+//[assembly: AssemblyKeyFile("key.snk")]
- //[assembly: AssemblyKeyFile("")]
- //[assembly: AssemblyKeyName("GDCM Key")]
- //[assembly: AssemblyKeyName("")]
-Nur in gdcm-2.6.0/Wrapping/Csharp/: AssemblyInfo.cs.in~.
-diff -ru gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt
---- gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt 2015-10-17 10:59:37.408588478 +0200
-@@ -69,11 +69,12 @@
-
- add_custom_command(
- OUTPUT ${GDCM_LIBRARY_DIR}/gdcm-sharp.dll
-- COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/doc:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll.xml" "/out:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll" "*.cs"
-+ COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/doc:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll.xml" "/out:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll" "*.cs" "/keyfile:key.snk"
-+ COMMAND "/usr/bin/sn" "-R" "${GDCM_LIBRARY_DIR}/gdcm-sharp.dll" "${CMAKE_CURRENT_SOURCE_DIR}/key.snk"
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS "${swig_generated_file_fullname}"
- ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
-- COMMENT "csc *.cs"
-+ COMMENT "csc *.cs"
- )
-
- if(BUILD_EXAMPLES)
diff --git a/debian/patches/07_vtkgdcm-sharp-siging.patch b/debian/patches/07_vtkgdcm-sharp-siging.patch
deleted file mode 100644
index 95658e4..0000000
--- a/debian/patches/07_vtkgdcm-sharp-siging.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Correct the key handling for the vtkgdcm-sharp module
- This patch moves the addign of the key to the command line and
- adds the signing of the module after it is build.
-Author: Gert Wollny <gw.fossdev at gmail.com>
-
-diff -ru gdcm-2.6.0.old/Utilities/VTK/AssemblyInfo.cs.in gdcm-2.6.0/Utilities/VTK/AssemblyInfo.cs.in
---- gdcm-2.6.0.old/Utilities/VTK/AssemblyInfo.cs.in 2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Utilities/VTK/AssemblyInfo.cs.in 2015-10-17 11:10:53.112614510 +0200
-@@ -69,5 +69,5 @@
- // .NET Framework documentation for more information about signing.
- // This is not required, if you don't want signing let these attributes like they're.
- [assembly: AssemblyDelaySign(false)]
--[assembly: AssemblyKeyFile("key.snk")]
-+//[assembly: AssemblyKeyFile("key.snk")]
- //[assembly: AssemblyKeyName("")]
-diff -ru gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt gdcm-2.6.0/Utilities/VTK/CMakeLists.txt
---- gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200
-+++ gdcm-2.6.0/Utilities/VTK/CMakeLists.txt 2015-10-17 11:10:55.356721743 +0200
-@@ -598,7 +598,8 @@
-
- add_custom_command(
- OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
-- COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
-+ COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "/keyfile:key.snk" "*.cs"
-+ COMMAND "/usr/bin/sn" "-R" "${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "key.snk"
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS "${swig_generated_file_fullname}"
- ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
diff --git a/debian/patches/series b/debian/patches/series
index 6c23dbf..9e084ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-#01_toplevelskip.patch
02_fixhurd.patch
03_linkvtkdoc.patch
04_multiarch.patch
-#05_enable-vtk6-bindings.patch
-#06_add-csharp-keyfile-from-commandline.patch
-#07_vtkgdcm-sharp-siging.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git
More information about the debian-med-commit
mailing list