Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 131983 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]
GUI 3.2.6 patch
GUI-3.2.6.patch (text/plain), 6.13 KB, created by
Daniel Tourde
on 2007-09-26 23:02:15 UTC
(
hide
)
Description:
GUI 3.2.6 patch
Filename:
MIME Type:
Creator:
Daniel Tourde
Created:
2007-09-26 23:02:15 UTC
Size:
6.13 KB
patch
obsolete
>--- 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 2007-09-27 00:58:52.000000000 +0200 >@@ -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 >--- GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4.org 2007-04-24 18:41:04.000000000 +0200 >+++ 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 >--- GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200 >+++ GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in 2007-05-26 20:20:59.000000000 +0200 >@@ -36,6 +36,10 @@ > QT_VERS = Qt_3_3_0 > endif > >+ifeq ($(QT_VERS),Qt_3_3_5) >+QT_VERS = Qt_3_3_0 >+endif >+ > ifeq ($(QT_VERS),Qt_3_3_6) > QT_VERS = Qt_3_3_0 > endif >@@ -44,6 +48,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_9) >+QT_VERS = Qt_3_3_0 >+endif >+ > # Sip flags > SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) > >--- GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200 >+++ GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in 2007-05-26 20:23:53.000000000 +0200 >@@ -35,12 +35,21 @@ > ifeq ($(QT_VERS),Qt_3_3_4) > QT_VERS = Qt_3_3_0 > endif >+ifeq ($(QT_VERS),Qt_3_3_5) >+QT_VERS = Qt_3_3_0 >+endif > ifeq ($(QT_VERS),Qt_3_3_6) > QT_VERS = Qt_3_3_0 > endif > 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_9) >+QT_VERS = Qt_3_3_0 >+endif > > # Sip flags > SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) >--- GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx.org 2007-04-24 18:41:04.000000000 +0200 >+++ GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2007-07-28 22:58:47.000000000 +0200 >@@ -32,6 +32,7 @@ > #include <vtkCellData.h> > #include <vtkDataSetAttributes.h> > #include <vtkDataSetCollection.h> >+#include <vtkExecutive.h> > #include <vtkObjectFactory.h> > #include <vtkPointData.h> > #include <vtkUnstructuredGrid.h> >@@ -119,8 +120,9 @@ > 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->GetNumberOfInputConnections(0); ++aDataSetId){ >+ vtkDataSet* aDataSet = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,aDataSetId)); >+ > // Do mapping of the nodes > if(!GetSharedPointsDataSet()){ > vtkIdType aNbPnts = aDataSet->GetNumberOfPoints(); >@@ -265,11 +267,11 @@ > > numCells = 0; > >- vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs); >+ vtkDataSetAttributes::FieldList cellList(this->GetNumberOfInputConnections(0)); > int firstCD=1; > >- for (idx = 0; idx < this->NumberOfInputs; ++idx) { >- ds = (vtkDataSet *)(this->Inputs[idx]); >+ for (idx = 0; idx < this->GetNumberOfInputConnections(0); ++idx) { >+ ds = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,idx)); > if (ds != NULL) { > if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) { > continue; //no input, just skip >@@ -308,8 +310,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->GetNumberOfInputConnections(0); ++idx) { >+ ds = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,idx)); > if (ds != NULL) { > numCells = ds->GetNumberOfCells(); > cd = ds->GetCellData(); >--- GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_CellLocationsArray.h.org 2007-07-28 22:45:46.000000000 +0200 >+++ GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_CellLocationsArray.h 2007-07-28 23:04:10.000000000 +0200 >@@ -22,7 +22,7 @@ > > #include "VTKViewer.h" > >-#if (VTK_MAJOR_VERSION >= 4) && (VTK_MINOR_VERSION >= 4) >+#if ((VTK_MAJOR_VERSION == 5) || ((VTK_MAJOR_VERSION==4) && (VTK_MINOR_VERSION>=4) )) > # include <vtkIdTypeArray.h> > # define TCellLocationsArray vtkIdTypeArray > #else
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