[med-svn] r8870 - trunk/packages/imagevis3d/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-09 10:31:47 +0000 (Fri, 09 Dec 2011)
New Revision: 8870

Modified:
   trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch
Log:
Dont ask

Modified: trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch	2011-12-09 10:10:01 UTC (rev 8869)
+++ trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch	2011-12-09 10:31:47 UTC (rev 8870)
@@ -1,8 +1,14 @@
 Index: imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro
 ===================================================================
---- imagevis3d-2.0.1.orig/ImageVis3D/ImageVis3D.pro	2011-12-09 09:45:24.000000000 +0000
-+++ imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro	2011-12-09 10:08:24.000000000 +0000
-@@ -25,6 +25,7 @@
+--- imagevis3d-2.0.1.orig/ImageVis3D/ImageVis3D.pro	2011-12-09 10:45:24.000000000 +0100
++++ imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro	2011-12-09 11:29:55.000000000 +0100
+@@ -20,11 +20,12 @@
+ INCLUDEPATH      += $$incpath
+ #INCLUDEPATH      += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW ../Tuvok
+ QT               += opengl network
+-LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
++LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
+ RESOURCES         = ImageVis3D.qrc
  RC_FILE 	  = Resources/ImageVis3D.rc
  QMAKE_INFO_PLIST  = ../IV3D.plist
  ICON              = Resources/ImageVis3D.icns
@@ -12,24 +18,28 @@
  unix:QMAKE_CFLAGS += -fno-strict-aliasing
 Index: imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro
 ===================================================================
---- imagevis3d-2.0.1.orig/CmdLineConverter/CmdLineConverter.pro	2011-12-09 09:45:24.000000000 +0000
-+++ imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro	2011-12-09 10:08:59.000000000 +0000
-@@ -17,6 +17,7 @@
+--- imagevis3d-2.0.1.orig/CmdLineConverter/CmdLineConverter.pro	2011-12-09 10:45:24.000000000 +0100
++++ imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro	2011-12-09 11:30:48.000000000 +0100
+@@ -16,7 +16,8 @@
+ incpath          += ../Tuvok/Basics/3rdParty ../Tuvok
  DEPENDPATH       += $$incpath
  INCLUDEPATH      += $$incpath
- LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
+-LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
++LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
 +unix:LIBS        += -lGLEW -ljpeg -ltiff -lbz2 -lz
  unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
  unix:QMAKE_CFLAGS += -fno-strict-aliasing
  
 Index: imagevis3d-2.0.1/UVFReader/UVFReader.pro
 ===================================================================
---- imagevis3d-2.0.1.orig/UVFReader/UVFReader.pro	2011-12-09 09:45:24.000000000 +0000
-+++ imagevis3d-2.0.1/UVFReader/UVFReader.pro	2011-12-09 10:09:32.000000000 +0000
-@@ -14,6 +14,7 @@
+--- imagevis3d-2.0.1.orig/UVFReader/UVFReader.pro	2011-12-09 10:45:24.000000000 +0100
++++ imagevis3d-2.0.1/UVFReader/UVFReader.pro	2011-12-09 11:31:31.000000000 +0100
+@@ -13,7 +13,8 @@
+ DEPENDPATH       += .
  INCLUDEPATH      += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW
  INCLUDEPATH      += ../Tuvok ../Tuvok/Basics/3rdParty ../Tuvok/Basics
- LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
+-LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
++LIBS              = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
 +unix:LIBS         += -lGLEW -ltiff -ljpeg -lbz2 -lz
  unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
  unix:QMAKE_CFLAGS += -fno-strict-aliasing