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

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2015-08-07 07:35:27 +0000 (Fri, 07 Aug 2015)
New Revision: 19866

Modified:
   trunk/packages/gdcm/trunk/debian/patches/castxml.patch
Log:
fix in the arguments to castxml

Modified: trunk/packages/gdcm/trunk/debian/patches/castxml.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/castxml.patch	2015-08-07 06:30:41 UTC (rev 19865)
+++ trunk/packages/gdcm/trunk/debian/patches/castxml.patch	2015-08-07 07:35:27 UTC (rev 19866)
@@ -1,10 +1,12 @@
-Description: Replace gccxml with its castxml wrapper
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
+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 @@
+@@ -317,24 +317,16 @@ if(GDCM_WRAP_CSHARP)
        message(FATAL_ERROR "error: mummy not found. mummy_EXECUTABLE='${mummy_EXECUTABLE}'")
      endif()
  
@@ -36,7 +38,7 @@
      endforeach()
      configure_file(
        "${CMAKE_CURRENT_SOURCE_DIR}/MummySettings.xml.in"
-@@ -409,17 +401,28 @@
+@@ -409,17 +401,28 @@ if(GDCM_WRAP_CSHARP)
  
          add_custom_command(
            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
@@ -49,7 +51,7 @@
 -            --gccxml-compiler ${gccxml_compiler}
 +	    --castxml-gccxml
 +            -o ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-+            --castxml-start=_cable_
++            --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