[med-svn] r9231 - trunk/packages/volview/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-01-10 12:44:03 +0000 (Tue, 10 Jan 2012)
New Revision: 9231

Added:
   trunk/packages/volview/trunk/debian/patches/removerpath.patch
Modified:
   trunk/packages/volview/trunk/debian/patches/series
   trunk/packages/volview/trunk/debian/patches/vvforward.patch
Log:
remove rpath

Added: trunk/packages/volview/trunk/debian/patches/removerpath.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/removerpath.patch	                        (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/removerpath.patch	2012-01-10 12:44:03 UTC (rev 9231)
@@ -0,0 +1,15 @@
+Index: volview-3.4/VolViewPlatformComplete/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewPlatformComplete/CMakeLists.txt	2012-01-07 14:12:40.000000000 +0000
++++ volview-3.4/VolViewPlatformComplete/CMakeLists.txt	2012-01-07 14:26:01.000000000 +0000
+@@ -85,8 +85,8 @@
+ # easier to use. The install tree would be busted anyway and require
+ # special launchers.
+ 
+-set(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "" FORCE)
+-set(VTK_USE_RPATH ON CACHE INTERNAL "" FORCE)
++set(CMAKE_SKIP_RPATH ON CACHE INTERNAL "" FORCE)
++set(VTK_USE_RPATH OFF CACHE INTERNAL "" FORCE)
+ set(VTKEdge_PAINTBRUSH_LABEL_TYPE "VTK_UNSIGNED_CHAR" CACHE INTERNAL "" FORCE)
+ if(APPLE)
+   set(CMAKE_INSTALL_NAME_DIR "@executable_path/../lib" CACHE INTERNAL "" FORCE)

Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series	2012-01-10 09:47:26 UTC (rev 9230)
+++ trunk/packages/volview/trunk/debian/patches/series	2012-01-10 12:44:03 UTC (rev 9231)
@@ -9,3 +9,4 @@
 fixuptar.patch
 fixupcurl.patch
 vvforward.patch
+removerpath.patch

Modified: trunk/packages/volview/trunk/debian/patches/vvforward.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/vvforward.patch	2012-01-10 09:47:26 UTC (rev 9230)
+++ trunk/packages/volview/trunk/debian/patches/vvforward.patch	2012-01-10 12:44:03 UTC (rev 9231)
@@ -5,9 +5,9 @@
 Forwarded: not-needed
 Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt
 ===================================================================
---- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-06 10:01:12.000000000 +0000
-+++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt	2011-09-06 10:01:14.000000000 +0000
-@@ -45,3 +45,31 @@
+--- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt	2012-01-07 14:12:44.000000000 +0000
++++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt	2012-01-08 21:37:39.000000000 +0000
+@@ -45,3 +45,32 @@
    INSTALL_DEFAULT_DATA_SAMPLES 1
    DOCUMENTATION_FILE  "Documentation/VolView 3 User Manual.pdf"
  )
@@ -26,6 +26,7 @@
 +set(KWCommon_FORWARD_EXE
 +  VolView
 +  )
++set(KWCommon_FORWARD_DIR_BUILD ${EXECUTABLE_OUTPUT_PATH})
 +configure_file(
 +  ${VolViewLibraries_SOURCE_DIR}/KWCommon/kw-forward.c.in
 +  ${CMAKE_CURRENT_BINARY_DIR}/vv-forward.c
@@ -41,8 +42,8 @@
 +  )
 Index: volview-3.4/VolViewLibraries/KWCommon/kw-forward.c.in
 ===================================================================
---- volview-3.4.orig/VolViewLibraries/KWCommon/kw-forward.c.in	2011-09-06 10:01:12.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWCommon/kw-forward.c.in	2011-09-06 10:01:14.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWCommon/kw-forward.c.in	2012-01-07 14:06:01.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWCommon/kw-forward.c.in	2012-01-07 14:12:45.000000000 +0000
 @@ -12,7 +12,7 @@
  
  #define vtksys_SHARED_FORWARD_DIR_BUILD "@KWCommon_FORWARD_DIR_BUILD@"