[med-svn] r7666 - in trunk/packages/volview/trunk/debian: . patches

Mathieu Malaterre malat-guest at alioth.debian.org
Mon Sep 5 14:56:01 UTC 2011 

Author: malat-guest
Date: 2011-09-05 14:56:01 +0000 (Mon, 05 Sep 2011)
New Revision: 7666

Modified:
   trunk/packages/volview/trunk/debian/control
   trunk/packages/volview/trunk/debian/patches/fixmath.patch
Log:
remove tar for now

Modified: trunk/packages/volview/trunk/debian/control
===================================================================
--- trunk/packages/volview/trunk/debian/control	2011-09-05 14:11:49 UTC (rev 7665)
+++ trunk/packages/volview/trunk/debian/control	2011-09-05 14:56:01 UTC (rev 7666)
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 8), cmake (>= 2.8.2),
  libinsighttoolkit3-dev (>= 3.20), libvtk5-dev (>= 5.8),
  libgdcm2-dev (>= 2.0.16), libkwwidgets1-dev, tcl8.5-dev, tk8.5-dev,
- libavformat-dev, libvtkedge-dev, libcurl4-nss-dev
+ libavformat-dev, libvtkedge-dev, libcurl4-nss-dev, libtar.h
 Standards-Version: 3.9.2
 Homepage: http://www.kitware.com/products/volview.html
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/volview/trunk/?rev=0&sc=0

Modified: trunk/packages/volview/trunk/debian/patches/fixmath.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixmath.patch	2011-09-05 14:11:49 UTC (rev 7665)
+++ trunk/packages/volview/trunk/debian/patches/fixmath.patch	2011-09-05 14:56:01 UTC (rev 7666)
@@ -55,18 +55,30 @@
 Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt
 ===================================================================
 --- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 13:53:41.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 13:54:02.000000000 +0000
-@@ -16,7 +16,9 @@
++++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt	2011-09-05 14:55:39.000000000 +0000
+@@ -16,7 +16,10 @@
  
  
  PROJECT(KWVolView)
 -
 +include_directories(
 +  /usr/include/tcl8.5
++  /usr/include/VTKEdge
 +  )
  INCLUDE_REGULAR_EXPRESSION("^.*$")
  
  # --------------------------------------------------------------------------
+@@ -540,8 +543,8 @@
+ TARGET_LINK_LIBRARIES(KWVolView
+   ${KWWidgetsPro_LIBRARIES}
+   ${VTKEdge_LIBRARIES}
+-  cmtar
+-  Curl
++  #cmtar
++  curl
+   )
+ 
+ IF(KWVolView_USE_GDCM)
 Index: volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx
 ===================================================================
 --- volview-3.4.orig/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx	2011-09-05 14:10:55.000000000 +0000
@@ -108,3 +120,226 @@
          }
  
      case vtkCommand::VolumeMapperRenderStartEvent:
+Index: volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h	2011-09-05 14:41:00.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h	2011-09-05 14:41:14.000000000 +0000
+@@ -43,7 +43,7 @@
+     VolumeMapper        = vtkSmartPointer< vtkPolyDataMapper >::New();
+     ObliqueMapper       = vtkSmartPointer< vtkPolyDataMapper >::New();
+     ObliquePlaneCutter  = vtkSmartPointer< vtkCutter >::New();
+-    ObliquePlane        = vtkSmartPointer< vtkCutter >::New();
++    ObliquePlane        = vtkSmartPointer< vtkPlane >::New();
+     VolumeMapper->ScalarVisibilityOff();
+     ObliqueMapper->ScalarVisibilityOff();
+     ObliqueMapper->SetResolveCoincidentTopologyToPolygonOffset();
+Index: volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx	2011-09-05 14:41:37.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx	2011-09-05 14:42:02.000000000 +0000
+@@ -364,9 +364,9 @@
+       this->SupportsCompression( strategy ))
+     {
+     writer->SetCompression(true);
+-    writer->SetCompressionTypeToJPEG2000();
+-    writer->SetJPEG2000CompressionRatio( this->CompressionRatio );
+-    writer->SetJPEG2000UseIrreversibleKernel(0);
++    //writer->SetCompressionTypeToJPEG2000();
++    //writer->SetJPEG2000CompressionRatio( this->CompressionRatio );
++    //writer->SetJPEG2000UseIrreversibleKernel(0);
+     statusString = "Compressing using JPEG2000 ..";
+     }
+ 
+@@ -375,7 +375,7 @@
+     {
+     // Deflate stream is written out as a single file.
+     writer->SetCompression(true);
+-    writer->SetCompressionTypeToDeflate();
++    //writer->SetCompressionTypeToDeflate();
+     statusString = "Compressing using Deflate ..";
+     }
+ 
+Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx	2011-09-05 14:44:27.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx	2011-09-05 14:44:39.000000000 +0000
+@@ -532,7 +532,7 @@
+   this->VolumePropertyPresetSelector->FilterButtonVisibilityOn();
+   this->VolumePropertyPresetSelector->LocateButtonVisibilityOn();
+   this->VolumePropertyPresetSelector->EmailButtonVisibilityOn();
+-  this->VolumePropertyPresetSelector->RemovePresetAlsoRemoveFileOn();
++  //this->VolumePropertyPresetSelector->RemovePresetAlsoRemoveFileOn();
+   this->VolumePropertyPresetSelector->SetPresetAddCommand(
+     this, "VolumePropertyPresetAddCallback");
+   this->VolumePropertyPresetSelector->SetPresetUpdateCommand(
+@@ -607,7 +607,7 @@
+   this->WindowLevelPresetSelector->ThumbnailColumnVisibilityOn();
+   this->WindowLevelPresetSelector->LocateButtonVisibilityOn();
+   this->WindowLevelPresetSelector->EmailButtonVisibilityOn();
+-  this->WindowLevelPresetSelector->RemovePresetAlsoRemoveFileOn();
++  //this->WindowLevelPresetSelector->RemovePresetAlsoRemoveFileOn();
+   this->WindowLevelPresetSelector->SetPresetAddCommand(
+     this, "WindowLevelPresetAddCallback");
+   this->WindowLevelPresetSelector->SetPresetUpdateCommand(
+Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx	2011-09-05 14:45:03.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx	2011-09-05 14:45:18.000000000 +0000
+@@ -682,10 +682,10 @@
+     list->FindAndDeleteRow(0, labels->GetDirectionCosineLabel());
+     }
+ 
+-  if (med_prop && med_prop->GetTableHeight())
++  if (med_prop /*&& med_prop->GetTableHeight()*/)
+     {
+-    list->FindAndInsertCellText(0, labels->GetTableHeightLabel(), 
+-                                1, med_prop->GetTableHeight());
++//    list->FindAndInsertCellText(0, labels->GetTableHeightLabel(), 
++//                                1, med_prop->GetTableHeight());
+     }
+   else
+     {
+Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx	2011-09-05 14:43:44.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx	2011-09-05 14:43:56.000000000 +0000
+@@ -196,8 +196,8 @@
+   this->UndoStrokeButton->SetText("Undo stroke");
+   this->UndoStrokeButton->SetBalloonHelpString(
+     "Undo the last draw/erase stroke");
+-  this->UndoStrokeButton->SetImageToPredefinedIcon(
+-    vtkKWIcon::IconSilkArrowUndo);
++  //this->UndoStrokeButton->SetImageToPredefinedIcon(
++  //  vtkKWIcon::IconSilkArrowUndo);
+   this->AddWidget(this->UndoStrokeButton);
+ 
+   // Redo
+@@ -208,8 +208,8 @@
+   this->RedoStrokeButton->SetText("Redo stroke");
+   this->RedoStrokeButton->SetBalloonHelpString(
+     "Redo the last draw/erase stroke");
+-  this->RedoStrokeButton->SetImageToPredefinedIcon(
+-    vtkKWIcon::IconSilkArrowRedo);
++  //this->RedoStrokeButton->SetImageToPredefinedIcon(
++  //  vtkKWIcon::IconSilkArrowRedo);
+   this->AddWidget(this->RedoStrokeButton);
+    
+   if (use_sep)
+@@ -438,4 +438,4 @@
+ {
+   this->Superclass::PrintSelf(os,indent);
+   os << indent << "SupportMultiSketchOperations: " << (this->GetSupportMultiSketchOperations() ? "on":"off") << endl;
+-}
+\ No newline at end of file
++}
+Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx	2011-09-05 14:42:44.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx	2011-09-05 14:42:52.000000000 +0000
+@@ -598,8 +598,8 @@
+     this->PopulateInteractorWidgets();
+     this->InteractorWidgetSelector->Update();
+     this->InteractorWidgetSelector->SetEnabled(data ? this->GetEnabled() : 0);
+-    this->InteractorWidgetPropertiesUpdatedCallback(
+-      this->InteractorWidgetSelector->GetIdOfVisibleSelectedPreset());
++    //this->InteractorWidgetPropertiesUpdatedCallback(
++    //  this->InteractorWidgetSelector->GetIdOfVisibleSelectedPreset());
+     }
+ }
+ 
+Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 14:46:33.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx	2011-09-05 14:46:37.000000000 +0000
+@@ -12,7 +12,7 @@
+ #include "vtkHTTPHandler.h"
+ #include "vtkKWRemoteIOUtilities.h"
+ 
+-#include "Curl/curl/mprintf.h"
++#include "curl/mprintf.h"
+ 
+ vtkStandardNewMacro ( vtkHTTPHandler );
+ vtkCxxRevisionMacro ( vtkHTTPHandler, "$Revision: 1.10 $" );
+Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h	2011-09-05 14:46:08.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h	2011-09-05 14:46:12.000000000 +0000
+@@ -16,7 +16,7 @@
+ #pragma warning ( disable : 4786 )
+ #endif
+ 
+-#include "Curl/curl/curl.h"
++#include "curl/curl.h"
+ #include "vtkObjectFactory.h"
+ #include <vtksys/SystemTools.hxx>
+ #include <vtksys/Process.h>
+Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx	2011-09-05 14:46:21.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx	2011-09-05 14:46:25.000000000 +0000
+@@ -13,7 +13,7 @@
+ #include "vtkURIHandler.h"
+ #include "vtkKWRemoteIOManager.h"
+ 
+-#include "Curl/curl/mprintf.h"
++#include "curl/mprintf.h"
+ 
+ //------------------------------------------------------------------------------
+ // The point of this function would be to return a string of the input data,
+Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx	2011-09-05 14:47:58.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx	2011-09-05 14:54:17.000000000 +0000
+@@ -21,8 +21,8 @@
+ #endif
+ 
+ #include "vtkObjectFactory.h"
+-#include <libtar/libtar.h>
+-#include <libtar/config.h>
++#include <libtar.h>
++//#include <libtar/config.h>
+ 
+ #include <stdio.h>
+ #include <fcntl.h>
+@@ -47,7 +47,7 @@
+ # include <signal.h>
+ #endif
+ 
+-# include <vtkzlib/zlib.h>
++# include <vtk_zlib.h>
+ # define cm_zlib_gzdopen gzdopen
+ # define cm_zlib_gzclose gzclose
+ # define cm_zlib_gzread gzread
+@@ -173,6 +173,7 @@
+                               const char* rootDirectory,
+                               bool gzip, bool verbose)
+ {
++#if 0
+   TAR *t;
+   char buf[TAR_MAXPATHLEN];
+   char pathname[TAR_MAXPATHLEN];
+@@ -244,6 +245,7 @@
+     vtkGenericWarningMacro("Problem with tar_close(): ");
+     return 0;
+     }
++#endif
+   return 1;
+ }
+ 
+@@ -253,7 +255,7 @@
+             const char *root_name, 
+             bool gzip)
+ {
+-
++#if 0
+   TAR *t;
+ 
+   vtkKWRemoteIOUtilitiesGZStruct gzs;
+@@ -316,6 +318,7 @@
+     vtkGenericWarningMacro( << "Problem with tar_close(): " );
+     return 0;
+     }
++#endif
+   return 1;
+ }
+

More information about the debian-med-commit mailing list