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

[Mathieu Malaterre]

Author: malat-guest
Date: 2009-05-18 14:09:57 +0000 (Mon, 18 May 2009)
New Revision: 3393

Modified:
   trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch
Log:
revert patch, as it broke VTK 5.2 refactoring

Modified: trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch	2009-05-18 13:56:31 UTC (rev 3392)
+++ trunk/packages/gdcm/trunk/debian/patches/gdcm210_branchbackport.patch	2009-05-18 14:09:57 UTC (rev 3393)
@@ -891,7 +891,7 @@
 Only in gdcm-2-0/Utilities/rle: rledump.c.old
 diff -r -u -x .svn ../tags/gdcm-2-0-10/Utilities/VTK/Applications/CMakeLists.txt gdcm-2-0/Utilities/VTK/Applications/CMakeLists.txt
 --- ../tags/gdcm-2-0-10/Utilities/VTK/Applications/CMakeLists.txt	2008-11-18 09:54:28.000000000 +0100
-+++ gdcm-2-0/Utilities/VTK/Applications/CMakeLists.txt	2009-05-18 15:53:29.000000000 +0200
++++ gdcm-2-0/Utilities/VTK/Applications/CMakeLists.txt	2009-05-18 16:08:06.000000000 +0200
 @@ -16,13 +16,8 @@
  
  SET(GDCM_VTK_APPS
@@ -907,19 +907,15 @@
  
  FOREACH(app ${GDCM_VTK_APPS})
    ADD_EXECUTABLE(${app} ${app}.cxx)
-@@ -30,9 +25,9 @@
-     SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
+@@ -31,7 +26,7 @@
    ENDIF(GDCM_EXECUTABLE_PROPERTIES)
    TARGET_LINK_LIBRARIES(${app} ${VTKGDCM_NAME} vtkRendering)
--  IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
+   IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
 -    TARGET_LINK_LIBRARIES(${app} vtkWidgets vtkVolumeRendering)
--  ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
-+  #IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
-+  #  TARGET_LINK_LIBRARIES(${app} vtkWidgets vtkVolumeRendering)
-+  #ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
++    TARGET_LINK_LIBRARIES(${app} vtkWidgets)
+   ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
    IF(WIN32 AND NOT CYGWIN)
      TARGET_LINK_LIBRARIES(${app} gdcmgetopt)
-   ENDIF(WIN32 AND NOT CYGWIN)
 diff -r -u -x .svn ../tags/gdcm-2-0-10/Utilities/VTK/Applications/gdcmviewer.cxx gdcm-2-0/Utilities/VTK/Applications/gdcmviewer.cxx
 --- ../tags/gdcm-2-0-10/Utilities/VTK/Applications/gdcmviewer.cxx	2008-11-18 09:54:28.000000000 +0100
 +++ gdcm-2-0/Utilities/VTK/Applications/gdcmviewer.cxx	2008-11-17 15:33:11.000000000 +0100