[med-svn] [activiz.net] 01/01: Add patch to fix 798545
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Mon Sep 14 12:31:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository activiz.net.
commit 36d1a3e7fb98f19e529a65cecea346920e426e6b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Sep 14 14:31:08 2015 +0200
Add patch to fix 798545
---
debian/changelog | 7 ++
debian/patches/series | 1 +
debian/patches/vtk5_10_1.patch | 152 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 160 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index aa34575..3fb1f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
activiz.net (1:1.0~git20111214-3) UNRELEASED; urgency=medium
+ * Team upload.
+
+ [ Andreas Tille ]
* Remove Mathieu Malaterre from Uploaders as requested
* Add Corentin Desfarges to Uploaders as requested
* Moved from SVN to Git
@@ -7,6 +10,10 @@ activiz.net (1:1.0~git20111214-3) UNRELEASED; urgency=medium
* debian/get-orig-source: use xz compressed tarball
* debian/watch: Document why there is no proper watch file
+ [ Mathieu Malaterre ]
+ * debian/patches/vtk5_10_1.patch: fix compilation against vtk5.10
+ (Closes: #798545)
+
-- Andreas Tille <tille at debian.org> Wed, 08 Jul 2015 15:49:50 +0200
activiz.net (1:1.0~git20111214-2) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 90cce78..9f31b84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ removedoxfromall.patch
removeusersguide.patch
buildindephack.patch
removesoname.patch
+vtk5_10_1.patch
diff --git a/debian/patches/vtk5_10_1.patch b/debian/patches/vtk5_10_1.patch
new file mode 100644
index 0000000..f788eff
--- /dev/null
+++ b/debian/patches/vtk5_10_1.patch
@@ -0,0 +1,152 @@
+Description: Fix compilation with vtk 5.10.1
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: https://bugs.debian.org/798545
+Forwarded: not-needed
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,12 +120,12 @@
+ MESSAGE(FATAL_ERROR "error: mummy not found. mummy_EXECUTABLE='${mummy_EXECUTABLE}'")
+ ENDIF(NOT mummy_EXECUTABLE)
+
+-IF(NOT gccxml_EXECUTABLE)
+- FIND_PROGRAM(gccxml_EXECUTABLE gccxml)
+-ENDIF(NOT gccxml_EXECUTABLE)
+-IF(NOT gccxml_EXECUTABLE)
+- MESSAGE(FATAL_ERROR "error: gccxml not found. gccxml_EXECUTABLE='${gccxml_EXECUTABLE}'")
+-ENDIF(NOT gccxml_EXECUTABLE)
++IF(NOT castxml_EXECUTABLE)
++ FIND_PROGRAM(castxml_EXECUTABLE castxml)
++ENDIF(NOT castxml_EXECUTABLE)
++IF(NOT castxml_EXECUTABLE)
++ MESSAGE(FATAL_ERROR "error: castxml not found. castxml_EXECUTABLE='${castxml_EXECUTABLE}'")
++ENDIF(NOT castxml_EXECUTABLE)
+
+
+ INCLUDE_DIRECTORIES(${Mummy_INCLUDE_DIRS})
+@@ -280,7 +280,7 @@
+ MESSAGE(STATUS "AVDN_VTK_USE_SYSTEM_ZLIB='${AVDN_VTK_USE_SYSTEM_ZLIB}'")
+
+ MESSAGE(STATUS "csc_EXECUTABLE='${csc_EXECUTABLE}'")
+-MESSAGE(STATUS "gccxml_EXECUTABLE='${gccxml_EXECUTABLE}'")
++MESSAGE(STATUS "castxml_EXECUTABLE='${castxml_EXECUTABLE}'")
+ MESSAGE(STATUS "mono_EXECUTABLE='${mono_EXECUTABLE}'")
+ MESSAGE(STATUS "mummy_EXECUTABLE='${mummy_EXECUTABLE}'")
+
+@@ -441,9 +441,9 @@
+
+ # Compute
+ #
+-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(dir)
+
+ SET(exe_dir "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
+@@ -452,7 +452,7 @@
+ ENDIF(EXECUTABLE_OUTPUT_PATH)
+
+
+-# Run gccxml/mummy on each wrapped class:
++# Run castxml/mummy on each wrapped class:
+ #
+ SET(WRAPPED_CLASS_TABLE "")
+ SET(generated_files "")
+@@ -528,14 +528,6 @@
+ MESSAGE(STATUS "VTK_KITS_DIR='${VTK_KITS_DIR}'...")
+
+
+-SET(gccxml_compiler "${CMAKE_CXX_COMPILER}")
+-IF(MSVC80)
+- SET(gccxml_compiler "msvc8")
+-ENDIF(MSVC80)
+-IF(MSVC90)
+- SET(gccxml_compiler "msvc9")
+-ENDIF(MSVC90)
+-MESSAGE(STATUS "gccxml_compiler='${gccxml_compiler}'...")
+
+
+ FOREACH(kit ${kits})
+@@ -605,17 +597,28 @@
+
+ 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}
++ ${castxml_EXECUTABLE}
++ VERBATIM
+ )
+
+ #
+--- a/GenerateEventFragments.cmake
++++ b/GenerateEventFragments.cmake
+@@ -109,6 +109,11 @@
+ IF("${line}" STREQUAL "#define VTK_EVENT_TYPES \\E")
+ SET(in_event_list 1)
+ ENDIF()
++ # Sometime between 5.8 and 6.0, it changed to this line:
++ if("${line}" STREQUAL "#define vtkAllEventsMacro() \\E")
++ set(in_event_list 1)
++ endif()
++
+ ENDFOREACH()
+
+ # In addition to parsing the list, also add the two pre-defined ones that
+--- a/MummySettings.xml.in
++++ b/MummySettings.xml.in
+@@ -5,10 +5,13 @@
+ that comes out of VTK's CMake info...) -->
+
+ <Class name="vtkAbstractContextBufferId" wrappable="false"/>
++ <Class name="vtkAbstractElectronicData" wrappable="false"/>
+ <Class name="vtkAMRBox" wrappable="false"/>
+ <Class name="vtkArrayCoordinates" wrappable="false"/>
+ <Class name="vtkArrayExtents" wrappable="false"/>
+ <Class name="vtkArrayRange" wrappable="false"/>
++ <Class name="vtkAtom" wrappable="false"/>
++ <Class name="vtkBond" wrappable="false"/>
+ <Class name="vtkBoundingBox" wrappable="false"/>
+ <Class name="vtkCallbackCommand" wrappable="false"/>
+ <Class name="vtkColor3ub" wrappable="false"/>
+@@ -16,6 +19,7 @@
+ <Class name="vtkContextKeyEvent" wrappable="false"/>
+ <Class name="vtkContextMouseEvent" wrappable="false"/>
+ <Class name="vtkContourRepresentationNode" wrappable="false"/>
++ <Class name="vtkDebugLeaksObserver" wrappable="false"/>
+ <Class name="vtkEdgeType" wrappable="false"/>
+ <Class name="vtkExodusIICacheKey" wrappable="false"/>
+ <Class name="vtkImageComplex" wrappable="false"/>
+@@ -46,6 +50,7 @@
+ <Class name="vtkVector2f" wrappable="false"/>
+ <Class name="vtkVector2i" wrappable="false"/>
+ <Class name="vtkVector3d" wrappable="false"/>
++ <Class name="vtkVector3f" wrappable="false"/>
+ <Class name="vtkVolumeRayCastDynamicInfo" wrappable="false"/>
+ <Class name="vtkVolumeRayCastStaticInfo" wrappable="false"/>
+ @AVDN_EXTRA_EXCLUDE_CLASSES_XML@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/activiz.net.git
More information about the debian-med-commit
mailing list