aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
committerEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
commit3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40 (patch)
tree0cc82498adcf7e3fdde6a370e4fdd4f510ca5167 /sci-misc/salome-gui/files
parentAdd hydra pm. #309353 (diff)
downloadsci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.gz
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.bz2
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.zip
sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6
Diffstat (limited to 'sci-misc/salome-gui/files')
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch71
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6-vtk-5.2.patch188
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6.patch87
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch118
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch11
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch50
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch46
-rw-r--r--sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch11
-rw-r--r--sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch176
9 files changed, 11 insertions, 747 deletions
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch
deleted file mode 100644
index 63eab18b9..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx 2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx 2008-05-26 00:04:12.000000000 +0200
-@@ -27,7 +27,9 @@
-
- #include <GL/gl.h>
-
--#include <iostream.h>
-+#include <iostream>
-+
-+using std::cout;
-
- /*!
- Constructor
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx 2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx 2008-05-26 00:38:10.000000000 +0200
-@@ -47,6 +47,7 @@
- #include <qstringlist.h>
- #include <qapplication.h>
- #include <iostream>
-+#include <cstdlib>
-
- /*!
- \return the SALOME version number
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx 2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx 2008-05-26 00:28:19.000000000 +0200
-@@ -36,7 +36,7 @@
- #include <qdict.h>
-
- #include "utilities.h"
--#include <iostream.h>
-+#include <iostream>
- #include <string>
- #include <vector>
-
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx 2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx 2008-05-25 23:41:44.000000000 +0200
-@@ -22,6 +22,7 @@
- #include <qdir.h>
- #include <qapplication.h>
- #include <qregexp.h>
-+#include <cstdlib>
-
- /*!
- Constructor
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx 2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx 2008-05-26 00:19:17.000000000 +0200
-@@ -67,7 +67,7 @@
- //VRV: porting on Qt 3.0.5
- #include <algorithm>
-
--#include <iostream.h>
-+#include <iostream>
-
- using namespace std;
-
-diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx
---- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx 2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx 2008-05-26 00:12:09.000000000 +0200
-@@ -31,6 +31,7 @@
-
- #include <set>
- #include <map>
-+#include <algorithm>
-
- #include <vtkUnstructuredGrid.h>
- #include <vtkGeometryFilter.h>
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 );
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6.patch
deleted file mode 100644
index c5a9988ab..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- GUI_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200
-+++ GUI_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-03 12:51:11.000000000 +0100
-@@ -28,7 +28,7 @@
- @COMMENCE@
-
- usr_docs:
-- cp -fr $(srcdir)/GUI ./
-+# cp -fr $(srcdir)/GUI ./
- -find $(PWD) -name CVS -prune -exec rm -rf {} \;
-
- docs: usr_docs
---- ./GUI_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200
-+++ ./GUI_SRC_3.2.6/adm_local/Makefile.in 2007-09-26 23:23:59.000000000 +0200
-@@ -26,12 +26,12 @@
- all: resources
-
- install:
-- cp -rf @top_srcdir@/adm_local @prefix@
-+# cp -rf @top_srcdir@/adm_local @prefix@
-
- bin:
-
- resources :
-- cp -rf @top_srcdir@/adm_local $(top_builddir)
-+# cp -rf @top_srcdir@/adm_local $(top_builddir)
-
- inc:
-
---- ./GUI_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200
-+++ ./GUI_SRC_3.2.6/build_configure 2007-05-26 12:29:53.000000000 +0200
-@@ -109,7 +109,7 @@
-
- # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
- echo "" >> configure.in_tmp1
--echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
-+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
-
- echo "" >> configure.in_tmp1
- echo "AC_OUTPUT([ \\" >> configure.in_tmp1
-diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4
---- ./GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4.org 2007-11-25 19:13:29.000000000 +0100
-+++ ./GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 2007-11-25 19:15:45.000000000 +0100
-@@ -50,6 +50,10 @@
- SIP_VERS=v4_new ;;
- 4.5*)
- SIP_VERS=v4_new ;;
-+ 4.6*)
-+ SIP_VERS=v4_new ;;
-+ 4.7*)
-+ SIP_VERS=v4_new ;;
- *)
- AC_MSG_RESULT(sip version $version not supported)
- SIP_VERS=unsupported ;;
-diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in
---- ./GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in.org 2007-11-25 19:13:29.000000000 +0100
-+++ ./GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in 2007-11-25 19:14:50.000000000 +0100
-@@ -41,6 +41,12 @@
- ifeq ($(QT_VERS),Qt_3_3_7)
- QT_VERS = Qt_3_3_0
- endif
-+ifeq ($(QT_VERS),Qt_3_3_8)
-+QT_VERS = Qt_3_3_0
-+endif
-+ifeq ($(QT_VERS),Qt_3_3_8b)
-+QT_VERS = Qt_3_3_6
-+endif
-
- # Sip flags
- SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
-diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
---- ./GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in.org 2007-11-25 19:13:29.000000000 +0100
-+++ ./GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in 2007-11-25 19:14:21.000000000 +0100
-@@ -44,6 +44,14 @@
- QT_VERS = Qt_3_3_0
- endif
-
-+ifeq ($(QT_VERS),Qt_3_3_8)
-+QT_VERS = Qt_3_3_0
-+endif
-+
-+ifeq ($(QT_VERS),Qt_3_3_8b)
-+QT_VERS = Qt_3_3_6
-+endif
-+
- # Sip flags
- SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
-
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch
deleted file mode 100644
index 71044edad..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Seulement dans src3.2.6/GUI_SRC_3.2.6: #configure.in.base#
-diff -abur src3.2.6_orig/GUI_SRC_3.2.6/configure.in.base src3.2.6/GUI_SRC_3.2.6/configure.in.base
---- src3.2.6_orig/GUI_SRC_3.2.6/configure.in.base 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/configure.in.base 2008-03-24 16:41:34.000000000 +0100
-@@ -35,37 +35,82 @@
- ########################################################################
- # Check --disable-corba-gen and other --disable-* options
-
--GUI_DISABLE_CORBA="no"
--DISABLE_PYCONSOLE="no"
--DISABLE_GLVIEWER="no"
--DISABLE_PLOT2DVIEWER="no"
--DISABLE_SUPERVGRAPHVIEWER="no"
--DISABLE_OCCVIEWER="no"
--DISABLE_VTKVIEWER="no"
--DISABLE_SALOMEOBJECT="no"
--
--for option
--do
-- case $option in
-- -disable-corba-gen=yes | --disable-corba-gen=yes | -disable-corba-gen | --disable-corba-gen)
-- GUI_DISABLE_CORBA="yes";;
-- -disable-pyConsole=yes | --disable-pyConsole=yes | -disable-pyConsole | --disable-pyConsole)
-- DISABLE_PYCONSOLE="yes";;
-- -disable-glViewer=yes | --disable-glViewer=yes | -disable-glViewer | --disable-glViewer)
-- DISABLE_GLVIEWER="yes";;
-- -disable-plot2dViewer=yes | --disable-plot2dViewer=yes | -disable-plot2dViewer | --disable-plot2dViewer)
-- DISABLE_PLOT2DVIEWER="yes";;
-- -disable-supervGraphViewer=yes | --disable-supervGraphViewer=yes | \
-- -disable-supervGraphViewer | --disable-supervGraphViewer)
-- DISABLE_SUPERVGRAPHVIEWER="yes";;
-- -disable-occViewer=yes | --disable-occViewer=yes | -disable-occViewer | --disable-occViewer)
-- DISABLE_OCCVIEWER="yes";;
-- -disable-vtkViewer=yes | --disable-vtkViewer=yes | -disable-vtkViewer | --disable-vtkViewer)
-- DISABLE_VTKVIEWER="yes";;
-- -disable-salomeObject=yes | --disable-salomeObject=yes | -disable-salomeObject | --disable-salomeObject)
-- DISABLE_SALOMEOBJECT="yes";;
-- esac
--done
-+AC_ARG_ENABLE([corba-gen],
-+ [--enable-corba-gen],
-+ [if test x$enableval = "xyes"; then
-+ GUI_DISABLE_CORBA="no";
-+ elif test x$enableval = "xno"; then
-+ GUI_DISABLE_CORBA="yes";
-+ else
-+ echo "Error : unknown value : $enableval"
-+ exit 1
-+ fi])
-+
-+AC_ARG_ENABLE([pyConsole],
-+ [--enable-pyConsole],
-+ [if test x$enableval = "xyes"; then
-+ DISABLE_PYCONSOLE="no";
-+ elif test x$enableval = "xno"; then
-+ DISABLE_PYCONSOLE="yes";
-+ else
-+ echo "Error : unknown value : $enableval"
-+ exit 1
-+ fi])
-+
-+AC_ARG_ENABLE([glViewer],
-+ [--enable-glViewer],
-+ [if test x$enableval = "xyes"; then
-+ DISABLE_GLVIEWER="no";
-+ elif test x$enableval = "xno"; then
-+ DISABLE_GLVIEWER="yes";
-+ else
-+ echo "Error : unknown value : $enableval"
-+ exit 1
-+ fi])
-+
-+AC_ARG_ENABLE([plot2dViewer],
-+ [--enable-plot2dViewer],
-+ [if test x$enableval = "xyes"; then
-+ DISABLE_PLOT2DVIEWER="no";
-+ elif test x$enableval = "xno"; then
-+ DISABLE_PLOT2DVIEWER="yes";
-+ else
-+ echo "Error : unknown value : $enableval"
-+ exit 1
-+ fi])
-+
-+AC_ARG_ENABLE([supervGraphViewer],
-+ [--enable-supervGraphViewer],
-+ [if test x$enableval = "xyes"; then
-+ DISABLE_SUPERVGRAPHVIEWER="no";
-+ elif test x$enableval = "xno"; then
-+ DISABLE_SUPERVGRAPHVIEWER="yes";
-+ else
-+ echo "Error : unknown value : $enableval"
-+ exit 1
-+ fi])
-+
-+AC_ARG_ENABLE([occViewer],
-+ [--enable-occViewer],
-+ [if test x$enableval = "xyes"; then
-+ DISABLE_OCCVIEWER="no";
-+ elif test x$enableval = "xno"; then
-+ DISABLE_OCCVIEWER="yes";
-+ else
-+ echo "Error : unknown value : $enableval"
-+ exit 1
-+ fi])
-+
-+AC_ARG_ENABLE([salomeObject],
-+ [--enable-salomeObject],
-+ [if test x$enableval = "xyes"; then
-+ DISABLE_SALOMEOBJECT="no";
-+ elif test x$enableval = "xno"; then
-+ DISABLE_SALOMEOBJECT="yes";
-+ else
-+ echo "Error : unknown value : $enableval"
-+ exit 1
-+ fi])
-
- dnl
- dnl Initialize source and build root directories
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch
deleted file mode 100644
index 0607ae387..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src3.2.6.orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2008-09-04 10:20:58.000000000 +0200
-+++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2008-09-04 10:21:43.000000000 +0200
-@@ -764,7 +764,7 @@
- if ( PyDict_Check( res1 ) ) {
- PyObject* key;
- PyObject* value;
-- int pos = 0;
-+ Py_ssize_t pos = 0;
- while ( PyDict_Next( res1, &pos, &key, &value ) ) {
- // parse the return value
- // it should be a map: {integer:integer}
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch
deleted file mode 100644
index c4c703cd9..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4.org 2008-02-19 14:43:03.000000000 +0100
-+++ GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4 2008-02-19 14:46:31.000000000 +0100
-@@ -27,17 +27,17 @@
- exits_ok=no
- if test "x$exits_ok" = "xno"; then
- for d in /usr/local /usr ; do
-- AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so,exits_ok=yes,exits_ok=no)
-+ AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so.4,exits_ok=yes,exits_ok=no)
- if test "x$exits_ok" = "xyes"; then
- QWTHOME=$d
-- AC_MSG_RESULT(libqwt.so detected in $d/lib)
-+ AC_MSG_RESULT(libqwt.so.4 detected in $d/lib)
- fi
- done
- fi
- if test "x$exits_ok" = "xno"; then
- for d in `echo $LD_LIBRARY_PATH | sed -e "s/:/ /g"` ; do
-- if test -f $d/libqwt.so ; then
-- AC_MSG_RESULT(libqwt.so detected in $d)
-+ if test -f $d/libqwt.so.4 ; then
-+ AC_MSG_RESULT(libqwt.so.4 detected in $d)
- QWTHOME=$d
- QWTHOME=`echo ${QWTHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
- exits_ok=yes
---- GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4_orig 2008-01-06 12:46:14.000000000 +0100
-+++ GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4 2008-01-06 13:16:14.000000000 +0100
-@@ -96,9 +96,9 @@
- fi
- if test "x$QWTHOME" = "x/usr"
- then
-- LIBS="$LIBS -lqwt"
-+ LIBS="$LIBS -l:libqwt.so.4"
- else
-- LIBS="$LIBS -L$QWTHOME/lib -lqwt"
-+ LIBS="$LIBS -L$QWTHOME/lib -l:libqwt.so.4"
- fi
-
- CXXFLAGS_old=$CXXFLAGS
-@@ -126,9 +126,9 @@
- QWT_INCLUDES="-I$QWT_INCLUDES"
- if test "x$QWTHOME" = "x/usr"
- then
-- QWT_LIBS=" -lqwt"
-+ QWT_LIBS=" -l:libqwt.so.4"
- else
-- QWT_LIBS="-L$QWTHOME/lib -lqwt"
-+ QWT_LIBS=" -L$QWTHOME/lib -l:libqwt.so.4"
- fi
-
- AC_SUBST(QWT_INCLUDES)
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch
deleted file mode 100644
index f389a65a4..000000000
--- a/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip 2007-12-21 23:04:12.000000000 +0100
-+++ GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip 2007-12-21 23:05:26.000000000 +0100
-@@ -63,6 +63,43 @@
- PT_User
- };
-
-+%ModuleCode
-+
-+enum MenuName {
-+ File = 1,
-+ View = 2,
-+ Edit = 3,
-+ Preferences = 4,
-+ Tools = 5,
-+ Window = 6,
-+ Help = 7
-+};
-+
-+enum WindowType {
-+ WT_ObjectBrowser,
-+ WT_PyConsole,
-+ WT_LogWindow,
-+ WT_User
-+};
-+
-+enum PrefType {
-+ PT_Space,
-+ PT_Bool,
-+ PT_Color,
-+ PT_String,
-+ PT_Selector,
-+ PT_DblSpin,
-+ PT_IntSpin,
-+ PT_Double,
-+ PT_Integer,
-+ PT_GroupBox,
-+ PT_Font,
-+ PT_DirList,
-+ PT_File,
-+ PT_User
-+};
-+%End
-+
- class QtxAction : QAction
- {
- %TypeHeaderCode
diff --git a/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch b/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch
new file mode 100644
index 000000000..da9c6d089
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/GUI_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:00:58.281572535 +0100
++++ src5.1.3/GUI_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:03:34.110325466 +0100
+@@ -333,7 +333,7 @@
+
+ LIBS_old=$LIBS
+ if test "x$QTDIR" = "x/usr" ; then
+- QT_LIB_DIR=""
++ QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4"
+ elif test -d ${QTDIR}/lib; then
+ QT_LIB_DIR="-L$QTDIR/lib"
+ elif test -d ${QTDIR}/lib64; then
diff --git a/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch b/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch
deleted file mode 100644
index 032ed937f..000000000
--- a/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch
+++ /dev/null
@@ -1,176 +0,0 @@
---- ./src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4.org 2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2007-05-26 12:32:50.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.0/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.0 $LOCAL_INCLUDES"
-+ LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS"
-+ TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -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
-\ No newline at end of file
-+])dnl
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6: autom4te.cache
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6: configure
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6: configure.in
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6: salome_adm
-diff -abur /home/francois/Desktop/salome/src3.2.6/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/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2007-11-26 00:18:40.000000000 +0100
-@@ -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
-
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt: SalomePyQt.sip~
-diff -abur ./src3.2.6/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/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2007-11-25 23:34:31.000000000 +0100
-@@ -46,8 +46,8 @@
- #include "sipSalomePyQtGUIDeclSalomePyQtGUI.h"
- #endif
-
--#include <sipqtQWidget.h>
--#include <sipqtQPopupMenu.h>
-+//#include <sipqtQWidget.h>
-+//#include <sipqtQPopupMenu.h>
-
- #include <CORBA.h>
-
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI: SALOME_PYQT_Module.cxx~
-diff -abur ./src3.2.6/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/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2007-11-25 21:39:54.000000000 +0100
-@@ -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();
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_AppendFilter.cxx~
-diff -abur ./src3.2.6/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/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2007-11-25 20:53:53.000000000 +0100
-@@ -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();
- }
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_ExtractUnstructuredGrid.cxx~
-diff -abur ./src3.2.6/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/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2007-11-25 20:55:38.000000000 +0100
-@@ -80,7 +80,7 @@
- VTKViewer_GeometryFilter
- ::Execute()
- {
-- vtkDataSet *input= this->GetInput();
-+ vtkDataSet *input= (vtkDataSet*) this->GetInput();
- vtkIdType numCells=input->GetNumberOfCells();
-
- if (numCells == 0)
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_GeometryFilter.cxx~
-diff -abur ./src3.2.6/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/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2007-11-25 21:40:41.000000000 +0100
-@@ -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;
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_ShrinkFilter.cxx~
-diff -abur ./src3.2.6/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/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2007-11-25 21:41:40.000000000 +0100
-@@ -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 );
-Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_TransformFilter.cxx~