Author: jodogne-guest
Date: 2015-08-06 14:20:07 +0000 (Thu, 06 Aug 2015)
New Revision: 19864
Modified:
trunk/packages/gdcm/trunk/debian/patches/castxml.patch
Log:
fix remaining problems with the migration from gccxml to castxml
Modified: trunk/packages/gdcm/trunk/debian/patches/castxml.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/castxml.patch 2015-08-06
14:11:09 UTC (rev 19863)
+++ trunk/packages/gdcm/trunk/debian/patches/castxml.patch 2015-08-06
14:20:07 UTC (rev 19864)
@@ -6,12 +6,12 @@
===================================================================
--- gdcm-2.4.4.orig/Utilities/VTK/CMakeLists.txt
+++ gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
-@@ -411,11 +411,13 @@ if(GDCM_WRAP_CSHARP)
+@@ -411,15 +411,28 @@ if(GDCM_WRAP_CSHARP)
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
COMMAND ${gccxml_EXECUTABLE}
ARGS
- -fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-+ "--" # Dummy argument necessary for castxml to take
"-fxml-start" into consideration
++ "--" # Dummy empty argument necessary for castxml to succeed
-fxml-start=_cable_
${gccxml_include_args} -DCABLE_CONFIGURATION
- --gccxml-compiler ${gccxml_compiler}
@@ -19,6 +19,21 @@
${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
+ -Wno-deprecated
+ -fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
++ # 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
+ )
+
+ #
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
