Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 168734 Details for
Bug 155974
[science overlay] sci-misc/salome-* (New packages)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for compilation with vtk-5.2
salome-gui-3.2.6-vtk-5.2.patch (text/plain), 8.74 KB, created by
Bert Karwatzki
on 2008-10-16 21:28:40 UTC
(
hide
)
Description:
Patch for compilation with vtk-5.2
Filename:
MIME Type:
Creator:
Bert Karwatzki
Created:
2008-10-16 21:28:40 UTC
Size:
8.74 KB
patch
obsolete
>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 );
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 155974
:
102571
|
102572
|
102573
|
114639
|
114650
|
114651
|
114653
|
114655
|
114657
|
114659
|
114660
|
114662
|
114664
|
120027
|
120226
|
131980
|
131981
|
131983
|
137331
|
137336
|
137338
|
137719
|
138048
|
138578
|
138580
|
138581
|
138582
|
138583
|
138584
|
138586
|
138588
|
138877
|
138896
|
138925
|
138960
|
139043
|
139045
|
139956
|
139958
|
139964
|
139965
|
139973
|
140002
|
140005
|
140007
|
140030
|
140032
|
140064
|
140066
|
140068
|
140071
|
140073
|
140086
|
140088
|
140280
|
140283
|
140301
|
140303
|
140366
|
140368
|
140373
|
140375
|
140378
|
140385
|
140386
|
140455
|
140466
|
140468
|
140472
|
140474
|
140637
|
141242
|
141243
|
141250
|
141252
|
141254
|
141256
|
141257
|
141462
|
141473
|
141474
|
141475
|
141565
|
141572
|
142892
|
142894
|
142905
|
143984
|
143986
|
144011
|
144061
|
144063
|
144084
|
144086
|
144089
|
144091
|
144093
|
144098
|
144105
|
144107
|
144117
|
144119
|
144182
|
144184
|
144185
|
144187
|
144188
|
144198
|
144223
|
144305
|
144306
|
144308
|
144310
|
144311
|
144313
|
144314
|
144316
|
144318
|
144320
|
144347
|
144348
|
144350
|
144352
|
144353
|
144354
|
144356
|
144357
|
144557
|
145883
|
145885
|
145887
|
146138
|
146414
|
147142
|
147146
|
148604
|
148606
|
148607
|
148609
|
148611
|
148613
|
148615
|
148617
|
148618
|
148619
|
150326
|
151031
|
151032
|
151034
|
151036
|
151038
|
151039
|
151040
|
151042
|
151044
|
151045
|
152339
|
152341
|
152343
|
152345
|
152347
|
152349
|
152351
|
152353
|
152355
|
152357
|
152359
|
152361
|
152363
|
152365
|
152369
|
152371
|
152979
|
153067
|
154323
|
154325
|
154327
|
154329
|
154331
|
154333
|
154335
|
158563
|
161347
|
163275
|
163841
|
163842
|
164412
|
164611
|
168552
|
168560
|
168624
|
168626
|
168724
|
168726
| 168734 |
168736
|
178432
|
178434
|
178739
|
179160
|
179161
|
179162
|
179237
|
179627
|
179628
|
183321
|
183323
|
183324
|
183325
|
183327
|
183329
|
183347
|
183348
|
189058
|
189059
|
189061
|
200799
|
200800
|
200802
|
200803
|
200805
|
200807
|
200809
|
200811
|
200812
|
200813
|
200815
|
200816
|
200818
|
200820
|
200821
|
200823
|
200825
|
204604
|
204699
|
204980
|
205339
|
223869
|
223871
|
232539
|
234261
|
253803
|
253805
|
254743
|
254751
|
254755
|
257260
|
257261
|
268839
|
268883
|
278009
|
286253
|
286255
|
286257
|
286259
|
286261
|
286263
|
286265
|
286267
|
286269
|
286271
|
286273
|
323878