sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6

3 files changed, 11 insertions, 117 deletions

diff --git a/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch b/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch
deleted file mode 100644
index e0b4e8778..000000000
--- a/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -aur src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx
---- src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx	2008-07-25 09:16:09.000000000 +0200
-+++ src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx	2008-10-16 22:11:49.000000000 +0200
-@@ -88,7 +88,7 @@
- static Standard_Real HatcherConfusion2d   = 1.e-8 ;
- static Standard_Real HatcherConfusion3d   = 1.e-8 ;
- 
--static Standard_Integer lastVTKpoint = 0;
-+static vtkIdType lastVTKpoint = 0;
- static Standard_Integer PlotCount = 0;
- static Standard_Real IsoRatio = 1.001;
- static Standard_Integer MaxPlotCount = 5; 
-@@ -483,9 +483,9 @@
- {
-   float coord[3];
-   coord[0] = P.X(); coord[1] = P.Y(); coord[2] = P.Z();
--  Standard_Integer NewVTKpoint =  Pts->InsertNextPoint(coord);
-+  vtkIdType NewVTKpoint =  Pts->InsertNextPoint(coord);
- 
--  int pts[2];
-+  vtkIdType pts[2];
-   pts[0] = lastVTKpoint;
-   pts[1] = NewVTKpoint;
- 
-@@ -751,7 +751,7 @@
-     aP2 = theNodesP(nbnodes);
- 
-     float coord[3];
--    int pts[2];
-+    vtkIdType pts[2];
- 
-     for(int j=1;j<nbnodes;j++) {
-       gp_Pnt pt1 = theNodesP(j);
-@@ -783,7 +783,7 @@
-     aP2 = theNodesPoly(nbnodes);
- 
-     float coord[3];
--    int pts[2];
-+    vtkIdType pts[2];
-     
-     for(int j=1;j<nbnodes;j++) {
-       Standard_Integer id1 = Nodesidx(j);
-@@ -854,12 +854,12 @@
-     float coord[3];
-     coord[0] = xo; coord[1] = yo; coord[2] = zo;
- 
--    int ptLoc = Pts->InsertNextPoint(coord);
--    int ptFirst = 0;
--    int ptPrev = 0;
--    int ptCur = 0;
-+    vtkIdType ptLoc = Pts->InsertNextPoint(coord);
-+    vtkIdType ptFirst = 0;
-+    vtkIdType ptPrev = 0;
-+    vtkIdType ptCur = 0;
- 
--    int pts[2];
-+    vtkIdType pts[2];
- 
-     int NbPoints = 15;
-     for (int i = 1; i <= NbPoints; i++, ptPrev = ptCur)
-@@ -947,7 +947,7 @@
-   
-   gp_Pnt P = BRep_Tool::Pnt( aVertex );
-   float delta = 1, coord[3];
--  int pts[2];
-+  vtkIdType pts[2];
-   // insert pt
-   ZERO_COORD; coord[0] = +delta;
-   pts[0] = Pts->InsertNextPoint(coord);
-@@ -1026,7 +1026,7 @@
-       Standard_Integer N1,N2,N3;
-       Triangles(i).Get(N1,N2,N3);
- 	
--      int pts[3];
-+      vtkIdType pts[3];
-       pts[0] = N1-1; pts[1] = N2-1; pts[2] = N3-1;
-       Cells->InsertNextCell(3,pts);
- 
diff --git a/sci-misc/salome-geom/files/salome-geom-3.2.6.patch b/sci-misc/salome-geom/files/salome-geom-3.2.6.patch
deleted file mode 100644
index f537d9e37..000000000
--- a/sci-misc/salome-geom/files/salome-geom-3.2.6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./GEOM_SRC_3.2.6/build_configure.org 2007-04-24 18:40:50.000000000 +0200
-+++ ./GEOM_SRC_3.2.6/build_configure     2008-01-07 10:28:14.000000000 +0100
-@@ -116,7 +116,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
---- ./GEOM_SRC_3.2.6/adm_local/Makefile.in.org     2007-04-24 18:40:50.000000000 +0200
-+++ ./GEOM_SRC_3.2.6/adm_local/Makefile.in 2008-01-07 11:34:23.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:
-
---- ./GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in.org     2007-04-24 18:40:50.000000000 +0200
-+++ ./GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-07 12:00:47.000000000 +0100
-@@ -29,7 +29,7 @@
- @COMMENCE@
-
- usr_docs:
--	cp -fr $(srcdir)/GEOM ./
-+#	cp -fr $(srcdir)/GEOM ./
-	-find $(PWD) -name CVS -prune -exec rm -rf {} \;
-
- docs: usr_docs
diff --git a/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch b/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch
new file mode 100644
index 000000000..0f4168613
--- /dev/null
+++ b/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/GEOM_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:00:58.281572535 +0100
++++ src5.1.3/GEOM_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