Author: gert-guest Date: 2015-10-16 15:28:41 +0000 (Fri, 16 Oct 2015) New Revision: 20242
Added: trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch Modified: trunk/packages/gdcm/prepare-2.6/debian/control trunk/packages/gdcm/prepare-2.6/debian/control.in trunk/packages/gdcm/prepare-2.6/debian/patches/linkvtkdoc.patch trunk/packages/gdcm/prepare-2.6/debian/patches/series Log: Correct bindings and documentation with VTK6 * d/control: update to vtk6 * d/p/enable-vtk6-bindings.patch: correct compilation and linking * d/p/linkvtkdoc.patch: correct for compressed vtk6-doc scripts * d/p/series: add new vtk6 patch Modified: trunk/packages/gdcm/prepare-2.6/debian/control =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/control 2015-10-16 13:00:23 UTC (rev 20241) +++ trunk/packages/gdcm/prepare-2.6/debian/control 2015-10-16 15:28:41 UTC (rev 20242) @@ -12,7 +12,7 @@ libpoppler-private-dev, libssl-dev, python-vtk6, castxml, libsocket++-dev, libpapyrus3-dev, cli-common-dev (>= 0.8~) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x], mono-devel (>= 2.10.5) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x] -Build-Depends-Indep: vtk-doc, doxygen-latex, ghostscript, graphviz +Build-Depends-Indep: vtk6-doc, doxygen-latex, ghostscript, graphviz Standards-Version: 3.9.6 X-Python-Version: 2.7 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/ Modified: trunk/packages/gdcm/prepare-2.6/debian/control.in =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/control.in 2015-10-16 13:00:23 UTC (rev 20241) +++ trunk/packages/gdcm/prepare-2.6/debian/control.in 2015-10-16 15:28:41 UTC (rev 20242) @@ -12,7 +12,7 @@ libpoppler-private-dev, libssl-dev, python-vtk6, castxml, libsocket++-dev, libpapyrus3-dev, cli-common-dev (>= 0.8~) [@DEB_MONO_ARCHS@], mono-devel (>= 2.10.5) [@DEB_MONO_ARCHS@] -Build-Depends-Indep: vtk-doc, doxygen-latex, ghostscript, graphviz +Build-Depends-Indep: vtk6-doc, doxygen-latex, ghostscript, graphviz Standards-Version: 3.9.6 X-Python-Version: @PYVER@ Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/ Added: trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch (rev 0) +++ trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch 2015-10-16 15:28:41 UTC (rev 20242) @@ -0,0 +1,47 @@ +diff -ur gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt gdcm-2.6.0.obsolete.0.0988784821975095/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.obsolete.0.0988784821975095/Utilities/VTK/CMakeLists.txt 2015-10-16 16:54:45.316439853 +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 -ur gdcm-2.6.0.old/Utilities/VTK/vtkgdcm.i gdcm-2.6.0.obsolete.0.0988784821975095/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.obsolete.0.0988784821975095/Utilities/VTK/vtkgdcm.i 2015-10-16 16:47:42.419780119 +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" + %} + + +@@ -119,6 +119,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 ... Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/linkvtkdoc.patch =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/patches/linkvtkdoc.patch 2015-10-16 13:00:23 UTC (rev 20241) +++ trunk/packages/gdcm/prepare-2.6/debian/patches/linkvtkdoc.patch 2015-10-16 15:28:41 UTC (rev 20242) @@ -1,24 +1,7 @@ -Description: link to vtk doc - Also prefer SVG output to reduce package size -Author: Mathieu Malaterre <[email protected]> - -Index: gdcm-2.4.4/Utilities/doxygen/vtk/doxyfile.in -=================================================================== ---- gdcm-2.4.4.orig/Utilities/doxygen/vtk/doxyfile.in 2014-09-24 09:40:10.000000000 +0200 -+++ gdcm-2.4.4/Utilities/doxygen/vtk/doxyfile.in 2014-09-24 10:17:58.526433733 +0200 -@@ -23,6 +23,7 @@ - HAVE_DOT = YES - #HAVE_DOT = NO - DOT_PATH = "@DOT_PATH@" -+DOT_IMAGE_FORMAT = svg - CLASS_GRAPH = YES - COLLABORATION_GRAPH = YES - TEMPLATE_RELATIONS = YES -Index: gdcm-2.4.4/Utilities/doxygen/doxyfile.in -=================================================================== ---- gdcm-2.4.4.orig/Utilities/doxygen/doxyfile.in 2014-09-24 09:40:10.000000000 +0200 -+++ gdcm-2.4.4/Utilities/doxygen/doxyfile.in 2014-09-24 10:17:58.530433733 +0200 -@@ -1737,7 +1737,7 @@ +diff -ru gdcm-2.6.0.old/Utilities/doxygen/doxyfile.in gdcm-2.6.0/Utilities/doxygen/doxyfile.in +--- gdcm-2.6.0.old/Utilities/doxygen/doxyfile.in 2015-09-03 16:42:12.000000000 +0200 ++++ gdcm-2.6.0/Utilities/doxygen/doxyfile.in 2015-10-16 16:32:10.000000000 +0200 +@@ -1738,7 +1738,7 @@ # HTML_FILE_EXTENSION to xhtml in order to make the SVG files # visible in IE 9+ (other browsers do not have this requirement). @@ -27,10 +10,9 @@ # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to # enable generation of interactive SVG images that allow zooming and panning. -Index: gdcm-2.4.4/Utilities/doxygen/vtk/CMakeLists.txt -=================================================================== ---- gdcm-2.4.4.orig/Utilities/doxygen/vtk/CMakeLists.txt 2014-09-24 09:40:10.000000000 +0200 -+++ gdcm-2.4.4/Utilities/doxygen/vtk/CMakeLists.txt 2014-09-24 10:17:58.530433733 +0200 +diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/CMakeLists.txt gdcm-2.6.0/Utilities/doxygen/vtk/CMakeLists.txt +--- gdcm-2.6.0.old/Utilities/doxygen/vtk/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200 ++++ gdcm-2.6.0/Utilities/doxygen/vtk/CMakeLists.txt 2015-10-16 17:06:34.550679081 +0200 @@ -22,7 +22,7 @@ set (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag") endif () @@ -40,6 +22,15 @@ set(DOCUMENTATION_HTML_TARZ ON) set(DOXYGEN_PROJECT_NAME "vtkgdcm") if(VTK_SOURCE_DIR) +@@ -31,7 +31,7 @@ + set(DOXYGEN_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/Doxygen") + else() + # sudo apt-get install vtk-doc +- set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-doc/html/") ++ set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk6-doc/doxygen/") + endif() + set(DOXYGEN_PROJECT_SOURCE_DIR "${vtkgdcm_SOURCE_DIR}") + set(VTK_DOXYGEN_HOME "${vtkgdcm_SOURCE_DIR}/VTK/Utilities/Doxygen") @@ -89,7 +89,7 @@ get_filename_component(DOT_PATH ${DOT} PATH) endif() @@ -58,3 +49,69 @@ ${BASH} ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh) +diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/doc_makeall.sh.in gdcm-2.6.0/Utilities/doxygen/vtk/doc_makeall.sh.in +--- gdcm-2.6.0.old/Utilities/doxygen/vtk/doc_makeall.sh.in 2015-09-03 16:42:12.000000000 +0200 ++++ gdcm-2.6.0/Utilities/doxygen/vtk/doc_makeall.sh.in 2015-10-16 17:20:10.811973984 +0200 +@@ -169,12 +169,12 @@ + # Convert the VTK headers to the Doxygen format. + echo "Convert the VTK headers to the Doxygen format." + if test "x$PERL_PROG" != "xNOTFOUND" ; then +- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \ ++ gzip -cd "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl.gz" | $PERL_PROG - \ + --to "$INTERMEDIATE_DOX_DIR" \ + --relativeto "@DOXYGEN_SOURCE_LOCATIONS_DIR@" \ + @DOXYGEN_SOURCE_LOCATIONS@ || echoexit "Problem converting VTK headers" + if test "x@DOXYGEN_BINARY_LOCATIONS_DIR@" != "x"; then +- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \ ++ gzip -cd "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl.gz" | $PERL_PROG - \ + --to "$INTERMEDIATE_DOX_DIR" \ + --relativeto "@DOXYGEN_BINARY_LOCATIONS_DIR@" \ + @DOXYGEN_BINARY_LOCATIONS@ || echoexit "Problem converting VTK headers" +@@ -186,13 +186,16 @@ + # Build the full-text index. + echo "Build the full-text index." + if test "x$PERL_PROG" != "xNOTFOUND" ; then +- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.pl" \ ++ gzip -dc "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.stop.gz" > doc_index.stop ++ ++ gzip -dc "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.pl.gz" | $PERL_PROG - \ + --project "$PROJECT_NAME" \ +- --stop "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.stop" \ ++ --stop "doc_index.stop" \ + --store "doc_""$PROJECT_NAME""_index.dox" \ + --to "$INTERMEDIATE_DOX_DIR" \ + @DOXYGEN_SOURCE_LOCATIONS@ \ + @DOXYGEN_BINARY_LOCATIONS@ || echoexit "Problem building full-text index" ++ rm -f doc_index.stop + fi + echo "Build the full-text index - done" + +@@ -201,7 +204,7 @@ + # # demos that use that class. + + # if test "x$PERL_PROG" != "xNOTFOUND" ; then +-# $PERL_PROG $PATH_TO_VTK_DOX_SCRIPTS/doc_class2example.pl \ ++# gzip -dc $PATH_TO_VTK_DOX_SCRIPTS/doc_class2example.pl | $PERL_PROG - \ + # --datamatch "\W((VTK|ParaView)_DATA_ROOT|(VTK|MedVIP)Data|(vtk)?GetDataRoot|ExpandDataFileName)\W" \ + # --dataicon "paper-clip.gif" \ + # --dirmatch "^demos$" \ +@@ -246,7 +249,7 @@ + # Clean the HTML pages to remove the path to the intermediate Doxygen dir. + + if test "x$PERL_PROG" != "xNOTFOUND" ; then +- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_rmpath.pl" \ ++ gzip -dc "$PATH_TO_VTK_DOX_SCRIPTS/doc_rmpath.pl.gz" | $PERL_PROG - \ + --to "$INTERMEDIATE_DOX_DIR" \ + --html "$OUTPUT_DIRECTORY/html" || echoexit "Problem cleaning HTML pages" + fi +diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/doxyfile.in gdcm-2.6.0/Utilities/doxygen/vtk/doxyfile.in +--- gdcm-2.6.0.old/Utilities/doxygen/vtk/doxyfile.in 2015-09-03 16:42:12.000000000 +0200 ++++ gdcm-2.6.0/Utilities/doxygen/vtk/doxyfile.in 2015-10-16 16:32:10.000000000 +0200 +@@ -23,6 +23,7 @@ + HAVE_DOT = YES + #HAVE_DOT = NO + DOT_PATH = "@DOT_PATH@" ++DOT_IMAGE_FORMAT = svg + CLASS_GRAPH = YES + COLLABORATION_GRAPH = YES + TEMPLATE_RELATIONS = YES Modified: trunk/packages/gdcm/prepare-2.6/debian/patches/series =================================================================== --- trunk/packages/gdcm/prepare-2.6/debian/patches/series 2015-10-16 13:00:23 UTC (rev 20241) +++ trunk/packages/gdcm/prepare-2.6/debian/patches/series 2015-10-16 15:28:41 UTC (rev 20242) @@ -2,3 +2,4 @@ fixhurd.patch linkvtkdoc.patch multiarch.patch +enable-vtk6-bindings.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
