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-visu
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-visu')
-rw-r--r--sci-misc/salome-visu/ChangeLog10
-rw-r--r--sci-misc/salome-visu/Manifest9
-rw-r--r--sci-misc/salome-visu/files/salome-visu-3.2.6-gcc-4.3.patch35
-rw-r--r--sci-misc/salome-visu/files/salome-visu-3.2.6.patch348
-rw-r--r--sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch39
-rw-r--r--sci-misc/salome-visu/salome-visu-3.2.6.ebuild138
-rw-r--r--sci-misc/salome-visu/salome-visu-5.1.3.ebuild114
7 files changed, 126 insertions, 567 deletions
diff --git a/sci-misc/salome-visu/ChangeLog b/sci-misc/salome-visu/ChangeLog
index 1efde0376..1340a1a62 100644
--- a/sci-misc/salome-visu/ChangeLog
+++ b/sci-misc/salome-visu/ChangeLog
@@ -1,6 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*salome-visu-5.1.3 (14 Mar 2010)
+
+ 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+ -salome-visu-3.2.6.ebuild, -files/salome-visu-3.2.6-gcc-4.3.patch,
+ -files/salome-visu-3.2.6_makefiles.patch, -files/salome-visu-3.2.6.patch,
+ +salome-visu-5.1.3.ebuild:
+ Version bump 5.1.3 + removed broken 3.2.6
+
04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
salome-visu-3.2.6.ebuild:
removed omniorb* dependencies, as they are already in salome-kernel
diff --git a/sci-misc/salome-visu/Manifest b/sci-misc/salome-visu/Manifest
index bfbec3eba..71712f897 100644
--- a/sci-misc/salome-visu/Manifest
+++ b/sci-misc/salome-visu/Manifest
@@ -1,7 +1,4 @@
-AUX salome-visu-3.2.6-gcc-4.3.patch 1465 RMD160 6bbc4eed2e1ea8b3c8b1de24ca3cd4440e84f35d SHA1 4b703d99c8f5b45995d5c81d3a4ef6c6c234204c SHA256 5fb40f5eeb56677a1ac6909802cf126ab6e164b21c0214b81ba7c111a14bf9c6
-AUX salome-visu-3.2.6.patch 16848 RMD160 34b4460e7b01c8f5200cfdd46570c0517afd3201 SHA1 cd787bfbb330c6abe859990225a14e1ecdf319b6 SHA256 1d48148857b7958872b7c0e4ab64ae774a156aef59aa46d6239d35e53955e644
-AUX salome-visu-3.2.6_makefiles.patch 1283 RMD160 fd663c12446b91ffdba4bba689ed16da64455763 SHA1 0b9ca2d2e9e44f43387f5428fba0111dd5cd6e52 SHA256 20b7130d7b3172dd6f357ae329f4d2bdcb73d39ff5686d400d9796f254bf7795
-DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-visu-3.2.6.ebuild 3981 RMD160 16a98b1aadf618e9c332983769097f11ae1abe95 SHA1 d37bca44c77ca63e9cb2d135115478e428ebf9f1 SHA256 8184b5d3b91961272e89a41cc152f5c3028bffebf1250f1df3a7a9080d3cbee1
-MISC ChangeLog 1084 RMD160 b9612ec8512b3c2af304fea9c0b26dc9f3fd5d9e SHA1 b079197fe8e268396263a233e19e440e866fd48a SHA256 b1df248269e465d78cda90dace12c13ae3aabcfea7b127f5f08a4ff3e5097f8c
+DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
+EBUILD salome-visu-5.1.3.ebuild 2989 RMD160 13ac0e8e2e66ea38677c116dce1618a7aced2234 SHA1 d1338d5e7e2f29ed155c064fe949bdf329b11ece SHA256 fe699ae1e4ac3f6f7ed4d6a05c3e12d8582925087f5a95276c5f3f7fb49cd141
+MISC ChangeLog 1398 RMD160 ddaab42fdeec660a9fbdb2f50dd433e32896c872 SHA1 4a30fe3d7a6e493b2344ba98747a0a1dbb41893c SHA256 17e072efd42f3746bc980b77ce8b423aa4cb4096047a5fc29dacf248bb33c8c2
MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-visu/files/salome-visu-3.2.6-gcc-4.3.patch b/sci-misc/salome-visu/files/salome-visu-3.2.6-gcc-4.3.patch
deleted file mode 100644
index 963530a84..000000000
--- a/sci-misc/salome-visu/files/salome-visu-3.2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -aur src3.2.6.old/VISU_SRC_3.2.6/src/PIPELINE/VISU_PipeLine.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_PipeLine.cxx
---- src3.2.6.old/VISU_SRC_3.2.6/src/PIPELINE/VISU_PipeLine.cxx 2008-05-25 19:32:55.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_PipeLine.cxx 2008-05-26 04:24:56.000000000 +0200
-@@ -32,6 +32,7 @@
- #include "SALOME_ExtractGeometry.h"
-
- #include <float.h>
-+#include <climits>
-
- #include <vtkObjectFactory.h>
- #include <vtkDataSetMapper.h>
-diff -aur src3.2.6.old/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx
---- src3.2.6.old/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2008-05-25 19:32:55.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2008-05-26 04:35:35.000000000 +0200
-@@ -30,7 +30,7 @@
- #include "VISU_UsedPointsFilter.hxx"
- #include "VTKViewer_GeometryFilter.h"
-
--#include <algo.h>
-+#include <algorithm>
-
- #include <vtkCell.h>
- #include <vtkPointSet.h>
-diff -aur src3.2.6.old/VISU_SRC_3.2.6/src/VVTK/VVTK_PrimitiveBox.cxx src3.2.6/VISU_SRC_3.2.6/src/VVTK/VVTK_PrimitiveBox.cxx
---- src3.2.6.old/VISU_SRC_3.2.6/src/VVTK/VVTK_PrimitiveBox.cxx 2008-05-25 19:32:55.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/VVTK/VVTK_PrimitiveBox.cxx 2008-05-26 04:39:50.000000000 +0200
-@@ -43,7 +43,7 @@
- #include <qpushbutton.h>
- #include <qfiledialog.h>
-
--#include <iostream.h>
-+#include <iostream>
-
- using namespace std;
-
diff --git a/sci-misc/salome-visu/files/salome-visu-3.2.6.patch b/sci-misc/salome-visu/files/salome-visu-3.2.6.patch
deleted file mode 100644
index 139415712..000000000
--- a/sci-misc/salome-visu/files/salome-visu-3.2.6.patch
+++ /dev/null
@@ -1,348 +0,0 @@
-Seulement dans src3.2.6: build
-Seulement dans src3.2.6/VISU_SRC_3.2.6: aclocal.m4
-Seulement dans src3.2.6/VISU_SRC_3.2.6: autom4te.cache
-Seulement dans src3.2.6/VISU_SRC_3.2.6: configure
-Seulement dans src3.2.6/VISU_SRC_3.2.6: configure.in
-Seulement dans src3.2.6/VISU_SRC_3.2.6: salome_adm
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx 2007-11-28 17:30:04.000000000 +0100
-@@ -235,8 +235,8 @@
- {
- VISU::TTimerLog aTimerLog(MYDEBUG,"VISU_AppendFilter::Execute");
- vtkUnstructuredGrid *anOutput = this->GetOutput();
-- if(this->NumberOfInputs == 1){
-- anOutput->ShallowCopy(this->Inputs[0]);
-+ if(this->InputList->GetNumberOfItems() == 1){
-+ anOutput->ShallowCopy(this->GetInput(0));
- return;
- }
-
-@@ -247,8 +247,8 @@
- return;
-
- if(IsMergingInputs()){
-- TCellIdMerger aFunctor(this->NumberOfInputs);
-- ForEachInput<TCellIdMerger>(this->Inputs, this->NumberOfInputs, aFunctor);
-+ TCellIdMerger aFunctor(this->InputList->GetNumberOfItems());
-+ ForEachInput<TCellIdMerger>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor);
-
- vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;
- TObject2InputIdMap& anObject2InputIdMap = aFunctor.myObject2InputIdMap;
-@@ -275,7 +275,7 @@
- //TObjectId anObjectId = anIter->first;
- const TInputCellId& anInputCellId = anIter->second;
- TInputId anInputId = anInputCellId.first;
-- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){
-+ if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){
- TCellId aCellId = anInputCellId.second;
- aDataSet->GetCellPoints(aCellId, anIdList);
-
-@@ -288,8 +288,8 @@
- }
- anIdList->Delete();
- }else{
-- TCellCounter aFunctor(this->NumberOfInputs);
-- ForEachInput<TCellCounter>(this->Inputs, this->NumberOfInputs, aFunctor);
-+ TCellCounter aFunctor(this->InputList->GetNumberOfItems());
-+ ForEachInput<TCellCounter>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor);
-
- vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;
- vtkIdType aNbCells = aFunctor.GetNbCells();
-@@ -309,8 +309,8 @@
- // 2.cells
- vtkIdList *anIdList = vtkIdList::New();
- anIdList->Allocate(VTK_CELL_SIZE);
-- for(vtkIdType anInputId = 0; anInputId < this->NumberOfInputs; anInputId++) {
-- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){
-+ for(vtkIdType anInputId = 0; anInputId < this->InputList->GetNumberOfItems(); anInputId++) {
-+ if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){
- vtkIdType aNbCells = aDataSet->GetNumberOfCells();
- vtkCellData *aCellData = aDataSet->GetCellData();
- // copy cell and cell data
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_AppendFilter.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx 2007-11-28 17:30:04.000000000 +0100
-@@ -1307,7 +1307,7 @@
- aConnectivity->InitTraversal();
- for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
- aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
-- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
-+ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
-
- if(MYVTKDEBUG) aConnectivity->DebugOn();
-
-@@ -1397,7 +1397,7 @@
- aConnectivity->InitTraversal();
- for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
- aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
-- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
-+ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
-
- if(MYVTKDEBUG) aConnectivity->DebugOn();
-
-@@ -1561,7 +1561,7 @@
- aConnectivity->InitTraversal();
- for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
- aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
-- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
-+ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
-
- {
- int aNbTuples = aNbCells;
-@@ -1829,7 +1829,7 @@
- aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
-
- const TVTKSource& aSource = theGaussSubMesh->GetSource();
-- aSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
-+ aSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
- aSource->SetPoints(aPoints.GetPointer());
-
- aCellLocationsArray->Delete();
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_Convertor_impl.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx 2007-11-28 17:30:04.000000000 +0100
-@@ -51,7 +51,7 @@
- vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New();
- //aWriter->SetFileType(VTK_BINARY);
- aWriter->SetFileName(theFileName.c_str());
-- aWriter->SetInput(theDataSet);
-+ aWriter->SetInput((vtkDataObject*)theDataSet);
- aWriter->Write();
- aWriter->Delete();
- }
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_ConvertorUtils.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in
---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in 2007-11-28 17:30:01.000000000 +0100
-@@ -104,7 +104,7 @@
- $(HDF5_INCLUDES) $(BOOST_CPPFLAGS)
-
- LDFLAGS+= \
-- $(VTK_LIBS) -lVTKViewer -lVisuConvertor \
-+ $(VTK_LIBS) -lVTKViewer -lVisuConvertor -lvtkWidgets \
- $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
- $(GUI_LDFLAGS) \
- $(MED_LDFLAGS)
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx 2007-11-28 17:30:02.000000000 +0100
-@@ -202,7 +202,7 @@
- vtkFloatingPointType multiplier;
- vtkPoints *newPts;
- vtkIdList *newCellPts;
-- vtkDataSet *input = this->GetInput();
-+ vtkDataSet *input = (vtkDataSet*)(this->GetInput());
- vtkPointData *pd = input->GetPointData();
- vtkCellData *cd = input->GetCellData();
- vtkUnstructuredGrid *output = this->GetOutput();
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: SALOME_ExtractGeometry.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx 2007-11-28 17:30:01.000000000 +0100
-@@ -127,7 +127,8 @@
- VISU_CutPlanesPL
- ::ClearAppendPolyData(vtkAppendPolyData *theAppendPolyData)
- {
-- int iEnd = theAppendPolyData->GetNumberOfInputs();
-+ //int iEnd = theAppendPolyData->GetNumberOfInputs();
-+ int iEnd = theAppendPolyData->GetUserManagedInputs();
- for(int i = iEnd-1; i >= 0; i--)
- theAppendPolyData->RemoveInput(theAppendPolyData->GetInput(i));
- }
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_CutPlanesPL.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx 2007-11-28 17:30:02.000000000 +0100
-@@ -43,10 +43,10 @@
- VISU_DeformedShapePL
- ::~VISU_DeformedShapePL()
- {
-- myWarpVector->UnRegisterAllOutputs();
-+ //myWarpVector->UnRegisterAllOutputs();
- myWarpVector->Delete();
-
-- myCellDataToPointData->UnRegisterAllOutputs();
-+ //myCellDataToPointData->UnRegisterAllOutputs();
- myCellDataToPointData->Delete();
- }
-
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_DeformedShapePL.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx 2007-11-28 17:30:02.000000000 +0100
-@@ -311,7 +311,7 @@
- ::GetNodeCoord(int theObjID)
- {
- vtkIdType anID = GetNodeVTKID(theObjID);
-- vtkDataSet* aDataSet = myGeomFilter->GetInput();
-+ vtkDataSet* aDataSet = (vtkDataSet*)(myGeomFilter->GetInput());
- return aDataSet->GetPoint(anID);
- }
-
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_GaussPointsPL.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx 2007-11-28 17:30:02.000000000 +0100
-@@ -44,10 +44,10 @@
- VISU_IsoSurfacesPL
- ::~VISU_IsoSurfacesPL()
- {
-- myContourFilter->UnRegisterAllOutputs();
-+ //myContourFilter->UnRegisterAllOutputs();
- myContourFilter->Delete();
-
-- myCellDataToPointData->UnRegisterAllOutputs();
-+ //myCellDataToPointData->UnRegisterAllOutputs();
- myCellDataToPointData->Delete();
- }
-
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_IsoSurfacesPL.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx 2007-11-28 17:30:01.000000000 +0100
-@@ -34,7 +34,7 @@
- #include <vtkLookupTable.h>
- #include <vtkTextProperty.h>
- #include <vtkScalarBarActor.h>
--#include <vtkIdType.h>
-+//#include <vtkIdType.h>
-
- #include <string.h>
-
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_ScalarBarCtrl.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx 2007-11-28 17:30:02.000000000 +0100
-@@ -66,7 +66,7 @@
- VISU_ScalarMapOnDeformedShapePL
- ::~VISU_ScalarMapOnDeformedShapePL()
- {
-- myDeformVectors->UnRegisterAllOutputs();
-+ // myDeformVectors->UnRegisterAllOutputs();
- myDeformVectors->Delete();
-
- myMergeFilter->UnRegisterAllOutputs();
-@@ -75,7 +75,7 @@
- myExtractorScalars->UnRegisterAllOutputs();
- myExtractorScalars->Delete();
-
-- myCellDataToPointData->UnRegisterAllOutputs();
-+ //myCellDataToPointData->UnRegisterAllOutputs();
- myCellDataToPointData->Delete();
- }
-
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_ScalarMapOnDeformedShapePL.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2007-11-28 17:30:01.000000000 +0100
-@@ -61,16 +61,16 @@
- }
-
- VISU_StreamLinesPL::~VISU_StreamLinesPL(){
-- myPointsFilter->UnRegisterAllOutputs();
-+ //myPointsFilter->UnRegisterAllOutputs();
- myPointsFilter->Delete();
-
-- myCenters->UnRegisterAllOutputs();
-+ //myCenters->UnRegisterAllOutputs();
- myCenters->Delete();
-
-- myGeomFilter->UnRegisterAllOutputs();
-+ //myGeomFilter->UnRegisterAllOutputs();
- myGeomFilter->Delete();
-
-- myStream->UnRegisterAllOutputs();
-+ //myStream->UnRegisterAllOutputs();
- myStream->Delete();
- }
-
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_StreamLinesPL.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx 2007-11-28 17:30:04.000000000 +0100
-@@ -218,7 +218,7 @@
- myMapper->RemoveAllInputs();
- myMapper->Delete();
-
-- myPlaneSource->UnRegisterAllOutputs();
-+ //myPlaneSource->UnRegisterAllOutputs();
- myPlaneSource->Delete();
- }
-
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISUGUI: VisuGUI_ClippingDlg.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx 2007-11-28 17:30:04.000000000 +0100
-@@ -119,7 +119,7 @@
- ~TPlane() {
- myMapper->RemoveAllInputs();
- myMapper->Delete();
-- myPlaneSource->UnRegisterAllOutputs();
-+ // myPlaneSource->UnRegisterAllOutputs();
- myPlaneSource->Delete();
- };
- // Not implemented.
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISUGUI: VisuGUI_Plot3DDlg.cxx~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/Makefile.in src3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in
---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2007-11-28 17:30:03.000000000 +0100
-@@ -122,7 +122,7 @@
- LDFLAGS += \
- $(PYTHON_LIBS) \
- $(QT_MT_LIBS) \
-- $(VTK_LIBS) \
-+ $(VTK_LIBS) -lvtkWidgets \
- $(QWT_LIBS) \
- $(BOOST_LIBS) \
- $(KERNEL_LDFLAGS) \
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc
---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc 2007-11-28 17:30:04.000000000 +0100
-@@ -409,7 +409,8 @@
- aTitle = aTitle.simplifyWhiteSpace();
- aTableOfReal->SetTitle(aTitle.latin1());
-
-- int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs();
-+ // int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs();
-+ int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetUserManagedInputs();
- if(MYDEBUG) MESSAGE("CutPlanes_i::BuildTableOfReal iLineEnd = "<<iLineEnd);
- TXCont aXCont;
- TXYMapCont aXYMapCont;
-@@ -461,7 +462,7 @@
- aXYMap[aDist] = aScalars->GetTuple1(i);
- }
- if(aFilter){
-- aFilter->UnRegisterAllOutputs();
-+ // aFilter->UnRegisterAllOutputs();
- aFilter->Delete();
- }
- }
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISU_I: VISU_CutLines_i.cc~
-diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc
---- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc 2007-04-24 18:41:04.000000000 +0200
-+++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc 2007-11-28 17:30:04.000000000 +0100
-@@ -161,7 +161,7 @@
-
- VISU::StreamLines_i::~StreamLines_i(){
- if(MYDEBUG) MESSAGE("StreamLines_i::~StreamLines_i()");
-- myAppendFilter->UnRegisterAllOutputs();
-+ //myAppendFilter->UnRegisterAllOutputs();
- myAppendFilter->Delete();
- }
-
-@@ -178,8 +178,9 @@
- vtkPointSet* aSource = NULL;
- if(!thePrs3d->_is_nil())
- if((aPrs3di = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(thePrs3d).in()))){
-- for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--)
-- myAppendFilter->RemoveInput(myAppendFilter->GetInput(i));
-+ // for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--)
-+ // myAppendFilter->RemoveInput(myAppendFilter->GetInput(i));
-+ myAppendFilter->RemoveAllInputs();
- myAppendFilter->AddInput(aPrs3di->GetPL()->GetMapper()->GetInput());
- aSource = myAppendFilter->GetOutput();
- }
-Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISU_I: VISU_StreamLines_i.cc~
diff --git a/sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch b/sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch
deleted file mode 100644
index a54090945..000000000
--- a/sci-misc/salome-visu/files/salome-visu-3.2.6_makefiles.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./VISU_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200
-+++ ./VISU_SRC_3.2.6/build_configure 2008-01-07 14:43:19.000000000 +0100
-@@ -127,7 +127,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
---- ./VISU_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200
-+++ ./VISU_SRC_3.2.6/adm_local/Makefile.in 2008-01-07 14:44:21.000000000 +0100
-@@ -27,12 +27,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:
-
---- ./VISU_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200
-+++ ./VISU_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-07 14:45:41.000000000 +0100
-@@ -30,7 +30,7 @@
- @COMMENCE@
-
- usr_docs:
-- cp -fr $(srcdir)/VISU ./
-+# cp -fr $(srcdir)/VISU ./
- -find $(PWD) -name CVS -prune -exec rm -rf {} \;
-
- docs: usr_docs
diff --git a/sci-misc/salome-visu/salome-visu-3.2.6.ebuild b/sci-misc/salome-visu/salome-visu-3.2.6.ebuild
deleted file mode 100644
index cd451dc42..000000000
--- a/sci-misc/salome-visu/salome-visu-3.2.6.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. VISU Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi opengl"
-
-RDEPEND="opengl? ( virtual/opengl )
- mpi? ( sys-cluster/mpich2 )
- debug? ( dev-util/cppunit )"
-
-DEPEND="${RDEPEND}
- >=sci-misc/salome-kernel-${PV}
- >=sci-misc/salome-gui-${PV}
- >=sci-misc/salome-component-${PV}"
-
-MODULE_NAME="VISU"
-MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-VISU_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-export OPENPBS="/usr"
-
-src_unpack() {
- python_version
- distutils_python_version
- ewarn "Python 2.4 is highly recommended for Salome..."
-
- if ! built_with_use sci-libs/vtk python ; then
- die "You must rebuild sci-libs/vtk with python USE flag"
- fi
-
- unpack ${A}
- cd "${MY_S}"
- epatch "${FILESDIR}"/${P}.patch
- epatch "${FILESDIR}"/${P}_makefiles.patch
-
- # Gcc 4.3 support
- if version_is_at_least "4.3" $(gcc-version) ; then
- epatch "${FILESDIR}"/${P}-gcc-4.3.patch
- fi
-}
-
-
-src_compile() {
- local myconf=""
- cd "${MY_S}"
- rm -r -f autom4te.cache
- ./build_configure
-
- # CXXFLAGS are slightly modified to allow the compilation of
- # salome-visu with OpenCascade and gcc-4.1.x
- if version_is_at_least "4.1" $(gcc-version) ; then
- append-flags -ffriend-injection -fpermissive
- fi
-
- # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk
- if has_version ">=sci-libs/vtk-5.0" ; then
- einfo "vtk version 5 detected"
- append-flags -I/usr/include/vtk-5.0
- else
- einfo "vtk version 4 or prior detected"
- fi
-
- # Compiler and linker flags
- if use amd64 ; then
- append-flags -m64
- fi
-
- # Specifying --without-<flag> for mpi / mpich
- # has the same effect as turning it on
- # so we just ommit it if it's not required to turn it off
- if use mpi ; then
- myconf="${myconf} --with-mpi --with-mpich"
- fi
-
- # Configuration
- econf --prefix=${INSTALL_DIR} \
- --datadir=${INSTALL_DIR}/share/salome \
- --docdir=${INSTALL_DIR}/doc/salome \
- --infodir=${INSTALL_DIR}/share/info \
- --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
- --with-python-site=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
- --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
- ${myconf} \
- $(use_enable debug ) \
- $(use_enable !debug production ) \
- $(use_with debug cppunit /usr ) \
- $(use_with opengl opengl /usr) \
- || die "configuration failed"
-
- MAKEOPTS="-j1" emake || die "Compilation failed"
-}
-
-
-src_install() {
- cd "${MY_S}"
-
- # Installation
- emake prefix="${D}/${INSTALL_DIR}" \
- docdir="${D}/${INSTALL_DIR}/doc/salome" \
- infodir="${D}/${INSTALL_DIR}/share/info" \
- datadir="${D}/${INSTALL_DIR}/share/salome" \
- libdir="${D}/${INSTALL_DIR}/$(get_libdir)/salome" \
- pythondir="${D}/${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages" install \
- || die "emake install failed"
-
- if use amd64 ; then
- dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
- fi
-
- echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
- echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
- echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
- echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" >> ./90${P}
- doenvd 90${P}
- rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb
- insinto "${INSTALL_DIR}"
- doins -r adm_local
- if use doc ; then
- dodoc INSTALL
- fi
-}
-
-
-pkg_postinst() {
- elog "Run \`env-update && source /etc/profile\`"
- elog "now to set up the correct paths."
- elog ""
-}
-
diff --git a/sci-misc/salome-visu/salome-visu-5.1.3.ebuild b/sci-misc/salome-visu/salome-visu-5.1.3.ebuild
new file mode 100644
index 000000000..e01e36ab8
--- /dev/null
+++ b/sci-misc/salome-visu/salome-visu-5.1.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+PYTHON_DEPEND="2:2.4"
+
+inherit distutils eutils
+
+DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. VISU Component"
+HOMEPAGE="http://www.salome-platform.org"
+SRC_URI="http://www.stasyan.com/devel/distfiles/src${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug doc opengl"
+
+RDEPEND="opengl? ( virtual/opengl )
+ >=dev-python/omniorbpy-3.4
+ >=net-misc/omniORB-4.1.4
+ >=sci-misc/salome-kernel-${PV}
+ >=sci-misc/salome-gui-${PV}
+ >=sci-misc/salome-component-${PV}
+ >=x11-libs/qt-core-4.5.2
+ >=x11-libs/qt-gui-4.5.2
+ >=x11-libs/qt-opengl-4.5.2
+ >=dev-libs/boost-1.40.0
+ >=sci-libs/opencascade-6.3
+ >=sci-libs/hdf5-1.6.4
+ >=sci-libs/med-2.3.5
+ >=sci-libs/vtk-5.0[python]"
+
+DEPEND="${RDEPEND}
+ dev-lang/swig
+ >=app-doc/doxygen-1.5.6
+ media-gfx/graphviz
+ >=dev-python/docutils-0.4"
+
+MODULE_NAME="VISU"
+MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+VISU_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+
+PYVER=$(python_get_version)
+
+pkg_setup() {
+ [[ ${PYVER} > 2.4 ]] && \
+ ewarn "Python 2.4 is highly recommended for Salome..."
+}
+
+src_prepare() {
+ cd "${MY_S}"
+
+ rm -r -f autom4te.cache
+ ./build_configure
+}
+
+src_configure() {
+ local vtk_suffix=""
+
+ has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
+ has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
+ has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
+
+ cd "${MY_S}"
+
+ econf --prefix=${INSTALL_DIR} \
+ --datadir=${INSTALL_DIR}/share/salome \
+ --docdir=${INSTALL_DIR}/doc/salome \
+ --infodir=${INSTALL_DIR}/share/info \
+ --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
+ --with-python-site=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
+ --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
+ --with-vtk=${VTKHOME} \
+ --with-vtk-version=${vtk_suffix} \
+ --with-qt="/usr" \
+ --with-qwt_inc="/usr/include/qwt5" \
+ $(use_enable debug ) \
+ $(use_enable !debug production ) \
+ $(use_with opengl opengl /usr) \
+ || die "econf failed"
+}
+
+src_compile() {
+ cd "${MY_S}"
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ cd "${MY_S}"
+
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
+
+ echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
+ echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
+ echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
+ echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" >> ./90${P}
+ doenvd 90${P}
+ rm adm_local/Makefile
+ insinto "${INSTALL_DIR}"
+ doins -r adm_local
+
+ use doc && dodoc INSTALL
+}
+
+pkg_postinst() {
+ elog "Run \`env-update && source /etc/profile\`"
+ elog "now to set up the correct paths."
+ elog ""
+}