diff options
Diffstat (limited to 'sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch')
| -rw-r--r-- | sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch | 188 |
1 files changed, 0 insertions, 188 deletions
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch deleted file mode 100644 index 0f7efaf90..000000000 --- a/sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch +++ /dev/null @@ -1,188 +0,0 @@ -diff -aur src3.2.6.old/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 ---- src3.2.6.old/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2008-10-16 23:05:29.000000000 +0200 -@@ -76,7 +76,7 @@ - if test -z $VTKHOME - then - AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled) -- if test -f /usr/include/vtk/vtkPlane.h ; then -+ if test -f /usr/include/vtk-5.2/vtkPlane.h ; then - AC_MSG_RESULT(trying /usr) - VTKHOME="/usr" - fi -@@ -84,9 +84,9 @@ - - if test ! -z $VTKHOME - then -- LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES" -- LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $LOCAL_LIBS" -- TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $TRY_LINK_LIBS" -+ LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.2 $LOCAL_INCLUDES" -+ LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS" -+ TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk/ $TRY_LINK_LIBS" - fi - - dnl vtk headers -@@ -142,4 +142,4 @@ - # Save cache - AC_CACHE_SAVE - --])dnl -\ Kein Zeilenumbruch am Dateiende. -+])dnl -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip ---- src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2008-10-16 23:05:29.000000000 +0200 -@@ -13,7 +13,7 @@ - - class SALOME_Selection : QObject - { --%HeaderCode -+%TypeHeaderCode - #include <SalomePyQt.h> - %End - -@@ -75,7 +75,7 @@ - - class SalomePyQt - { --%HeaderCode -+%TypeHeaderCode - #include <SalomePyQt.h> - %End - -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -46,8 +46,8 @@ - #include "sipSalomePyQtGUIDeclSalomePyQtGUI.h" - #endif - --#include <sipqtQWidget.h> --#include <sipqtQPopupMenu.h> -+//#include <sipqtQWidget.h> -+//#include <sipqtQPopupMenu.h> - - #include <CORBA.h> - -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx 2008-10-16 23:12:43.000000000 +0200 -@@ -143,7 +143,7 @@ - if(int aNbOfParts = theMapIndex.Extent()){ - vtkPoints *aPoints = vtkPoints::New(); - aPoints->SetNumberOfPoints(aNbOfParts); -- for(int i = 0; i < aNbOfParts; i++){ -+ for(vtkIdType i = 0; i < aNbOfParts; i++){ - int aPartId = theMapIndex( i+1 ); - if(vtkFloatingPointType* aCoord = theMapActor->GetNodeCoord(aPartId)){ - aPoints->SetPoint(i,aCoord); -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -119,8 +119,8 @@ - vtkIdType aPntStartId = 0; - vtkIdType aCellStartId = 0; - -- for(vtkIdType aDataSetId = 0; aDataSetId < this->NumberOfInputs; ++aDataSetId){ -- vtkDataSet* aDataSet = (vtkDataSet *)(this->Inputs[aDataSetId]); -+ for(vtkIdType aDataSetId = 0; aDataSetId < this->InputList->GetNumberOfItems(); ++aDataSetId){ -+ vtkDataSet* aDataSet = (vtkDataSet *)(this->GetInput(aDataSetId)); - // Do mapping of the nodes - if(!GetSharedPointsDataSet()){ - vtkIdType aNbPnts = aDataSet->GetNumberOfPoints(); -@@ -265,11 +265,11 @@ - - numCells = 0; - -- vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs); -+ vtkDataSetAttributes::FieldList cellList(this->InputList->GetNumberOfItems()); - int firstCD=1; - -- for (idx = 0; idx < this->NumberOfInputs; ++idx) { -- ds = (vtkDataSet *)(this->Inputs[idx]); -+ for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) { -+ ds = (vtkDataSet *)(this->GetInput(idx)); - if (ds != NULL) { - if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) { - continue; //no input, just skip -@@ -308,8 +308,8 @@ - output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData()); - - // 2.cells -- for (idx = 0; idx < this->NumberOfInputs; ++idx) { -- ds = (vtkDataSet *)(this->Inputs[idx]); -+ for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) { -+ ds = (vtkDataSet *)(this->GetInput(idx)); - if (ds != NULL) { - numCells = ds->GetNumberOfCells(); - cd = ds->GetCellData(); -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -240,7 +240,7 @@ - for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){ - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); - } -- anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - anOutput->SetPoints(anInput->GetPoints()); - aCellLocationsArray->Delete(); - } -@@ -329,7 +329,7 @@ - for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){ - aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); - } -- anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); -+ anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); - anOutput->SetPoints(anInput->GetPoints()); - aCellLocationsArray->Delete(); - } -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -80,7 +80,7 @@ - VTKViewer_GeometryFilter - ::Execute() - { -- vtkDataSet *input= this->GetInput(); -+ vtkDataSet *input= (vtkDataSet*) this->GetInput(); - vtkIdType numCells=input->GetNumberOfCells(); - - if (numCells == 0) -@@ -134,7 +134,8 @@ - vtkIdType newCellId; - int faceId, *faceVerts, numFacePts; - vtkFloatingPointType *x; -- int PixelConvert[4], aNewPts[VTK_CELL_SIZE]; -+ int PixelConvert[4]; -+ vtkIdType aNewPts[VTK_CELL_SIZE]; - // ghost cell stuff - unsigned char updateLevel = (unsigned char)(output->GetUpdateGhostLevel()); - unsigned char *cellGhostLevels = 0; -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -58,7 +58,7 @@ - vtkFloatingPointType center[3], *p, pt[3]; - vtkPointData *pd, *outPD;; - vtkIdList *ptIds, *newPtIds; -- vtkDataSet *input= this->GetInput(); -+ vtkDataSet *input= (vtkDataSet*) this->GetInput(); - vtkUnstructuredGrid *output = this->GetOutput(); - vtkIdType tenth; - vtkFloatingPointType decimal; -diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx ---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2008-07-25 09:16:08.000000000 +0200 -+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2008-10-16 23:05:29.000000000 +0200 -@@ -43,8 +43,8 @@ - vtkPoints *inPts; - vtkPoints *newPts; - int numPts, numCells; -- vtkPointSet *input = this->GetInput(); -- vtkPointSet *output = this->GetOutput(); -+ vtkPointSet *input = (vtkPointSet*) this->GetInput(); -+ vtkPointSet *output = (vtkPointSet*) this->GetOutput(); - vtkPointData *pd=input->GetPointData(), *outPD=output->GetPointData(); - vtkCellData *cd=input->GetCellData(), *outCD=output->GetCellData(); - output->CopyStructure( input ); |