[med-svn] r20270 - trunk/packages/gdcm/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2015-10-17 13:22:49 +0000 (Sat, 17 Oct 2015)
New Revision: 20270

Removed:
   trunk/packages/gdcm/trunk/debian/patches/castxml.patch
Log:
merge prepare-2.6 to main branch

Deleted: trunk/packages/gdcm/trunk/debian/patches/castxml.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/castxml.patch	2015-10-17 13:22:20 UTC (rev 20269)
+++ trunk/packages/gdcm/trunk/debian/patches/castxml.patch	2015-10-17 13:22:49 UTC (rev 20270)
@@ -1,74 +0,0 @@
-Description: Replace gccxml with castxml
-Author: Sebastien Jodogne <s.jodogne at gmail.com>, Steve Robbins <steve at sumost.ca>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
-===================================================================
---- gdcm-2.4.4.orig/Utilities/VTK/CMakeLists.txt
-+++ gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
-@@ -317,24 +317,16 @@ if(GDCM_WRAP_CSHARP)
-       message(FATAL_ERROR "error: mummy not found. mummy_EXECUTABLE='${mummy_EXECUTABLE}'")
-     endif()
- 
--    if(NOT gccxml_EXECUTABLE)
--      find_program(gccxml_EXECUTABLE gccxml)
-+    if(NOT castxml_EXECUTABLE)
-+      find_program(castxml_EXECUTABLE castxml)
-     endif()
--    mark_as_advanced(gccxml_EXECUTABLE)
--    if(NOT gccxml_EXECUTABLE)
--      message(FATAL_ERROR "error: gccxml not found. gccxml_EXECUTABLE='${gccxml_EXECUTABLE}'")
-+    mark_as_advanced(castxml_EXECUTABLE)
-+    if(NOT castxml_EXECUTABLE)
-+      message(FATAL_ERROR "error: castxml not found. castxml_EXECUTABLE='${castxml_EXECUTABLE}'")
-     endif()
--    set(gccxml_compiler "${CMAKE_CXX_COMPILER}")
--    if(MSVC80)
--      set(gccxml_compiler "msvc8")
--    endif()
--    if(MSVC90)
--      set(gccxml_compiler "msvc9")
--    endif()
--    #message(STATUS "gccxml_compiler='${gccxml_compiler}'...")
--    set(gccxml_include_args "")
-+    set(castxml_include_args "")
-     foreach(dir ${Mummy_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS})
--      set(gccxml_include_args ${gccxml_include_args} "-I${dir}")
-+      set(castxml_include_args ${castxml_include_args} "-I${dir}")
-     endforeach()
-     configure_file(
-       "${CMAKE_CURRENT_SOURCE_DIR}/MummySettings.xml.in"
-@@ -409,17 +401,28 @@ if(GDCM_WRAP_CSHARP)
- 
-         add_custom_command(
-           OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
--          COMMAND ${gccxml_EXECUTABLE}
-+          COMMAND ${castxml_EXECUTABLE}
-           ARGS
--            -fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
--            -fxml-start=_cable_
--            ${gccxml_include_args} -DCABLE_CONFIGURATION
--            --gccxml-compiler ${gccxml_compiler}
-+	    --castxml-gccxml
-+            -o ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-+            --castxml-start _cable_
-+            ${castxml_include_args} -DCABLE_CONFIGURATION
-             ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
-+          # Remove the "Converter" and "Destructor" XML tags that are
-+          # generated by "castxml" with a format that is different
-+          # from that of "gccxml", and thus that are not properly
-+          # understood by "mummy". Removing these tags does not seem
-+          # to modify the output of "mummy".
-+          COMMAND sed
-+          ARGS
-+            -i
-+            "/^  <\\(Converter\\|Destructor\\) /d"
-+            ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-           DEPENDS
-             ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
-             ${header}
-             ${gccxml_EXECUTABLE}
-+	  VERBATIM
-         )
- 
- #