Added support to VTK 5.2

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1322 32389bae-6d03-0410-99cf-db05cde120eb

5 files changed, 66 insertions, 13 deletions

diff --git a/sci-misc/salome-smesh/ChangeLog b/sci-misc/salome-smesh/ChangeLog
index 7c3c745bd..1248ab8c8 100644
--- a/sci-misc/salome-smesh/ChangeLog
+++ b/sci-misc/salome-smesh/ChangeLog
@@ -1,6 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
-
+  20 Oct 2008; Daniel Tourde <daniel.tourde@caelae.se>
+  +salome-smesh-3.2.6-vtk-5.2.patch
+  Added support to vtk 5.2. Patch provided by Bert Karwatzki <spasswolf@web.de>
+ 
   04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
   salome-smesh-3.2.6.ebuild:
   removed omniorb* dependencies, as they are already in salome-kernel
@@ -21,4 +24,4 @@
   Initial import.
   +salome-smesh-3.2.6.ebuild, +salome-smesh-3.2.6.patch, +salome-smesh-3.2.6_makefiles.patch
   A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.com>, Dewald Pietersen <dewald.pieterse@gmail.com>, <etienne.lorriaux@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info
\ No newline at end of file
+  See bug #155974 for more info
diff --git a/sci-misc/salome-smesh/Manifest b/sci-misc/salome-smesh/Manifest
index 9e9e9de89..08f71a7b1 100644
--- a/sci-misc/salome-smesh/Manifest
+++ b/sci-misc/salome-smesh/Manifest
@@ -1,7 +1,9 @@
+AUX salome-smesh-3.2.6-amd64-relocation-error.patch 795 RMD160 b75c24f4441888695a0488309f1799d317411db3 SHA1 26cdcf653e3b8b76fa67e7084bf4c7b64326a08e SHA256 cd09fb04bbcdcd6386a52dcd280c7739f2e7fe5e9352b7982527b6fb9c2c28f0
 AUX salome-smesh-3.2.6-gcc-4.3.patch 1819 RMD160 64f383736be1357d90fdcaaa2bcd28e61d3ecb5f SHA1 5e8682ec4917dcb9e1473efb9db8d29c1c978315 SHA256 316a48bde730ce3c5b67fc4a16d6b3e6698c413d921875b21aae2ed8c9b679f2
+AUX salome-smesh-3.2.6-vtk-5.2.patch 1193 RMD160 ee5b3b96d9a65793d6d5e883f8e28525308aec09 SHA1 17fe6508d1aaeb22038f6e9400fe2554170bcbab SHA256 da21d3790d48ae540beaf6d8b78a878537ffdf72e29f4adf42b16b64b32fdf2d
 AUX salome-smesh-3.2.6.patch 10793 RMD160 fa4f8e8db86d6d7d2ecc6b535467c6bd16ac9fe5 SHA1 79cb4dd4370a94f309b4f55da5333584362f5c2f SHA256 0e599d64bf2f22b033cb4fcfb59a06c1e4f7ea41a859518a6ab8d691bec104b2
 AUX salome-smesh-3.2.6_makefiles.patch 1289 RMD160 acb8f3382726b42e149a6c33b561772ea0d91ca6 SHA1 8452437b52bec4879de5a1e245547df919bf1301 SHA256 68a416ec2279ce13e7879a7ec8dcf8e5881efbef45e0433aac4201c539297ab7
 DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-smesh-3.2.6.ebuild 3993 RMD160 1250d5d933fbcd3f2c1262fbfad797771f1c1f8d SHA1 f5a2e7478210385096f8fbd19d5fe934e17cf5aa SHA256 4a21c56b4afd28ac1587f8a49bca89f49505adb4b218604e5e9dd301e3102e5a
-MISC ChangeLog 1212 RMD160 cce056fcbd779e280d64427260c7c772fa911c9b SHA1 8002feded5f2a164dce842a164cf8ad28a81bfc2 SHA256 e711047232262fdc3b1f690d41f7aed7b862a6c22986036623ede8274323772b
+EBUILD salome-smesh-3.2.6.ebuild 4202 RMD160 d50f7ea595d2a029fa238a8f9788feda94594653 SHA1 5d042fac70ff3115e26048552b64ad2c2c0b3a6e SHA256 33e46d5ebd47d9787f7aa5ae0ecb43d83362af9e4f0778916d963a8197dfd91f
+MISC ChangeLog 1385 RMD160 9b5ac4dc3fb510d2209bb69f57305d569bbaa1c7 SHA1 c97929994d8df9242b911ec82d44b34fbcca70da SHA256 9f1a7aa650c5be18353e677fb5328d8a6bcf98578f7c500efc94d550d0ebbf9c
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch
new file mode 100644
index 000000000..e7df92bc1
--- /dev/null
+++ b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-amd64-relocation-error.patch
@@ -0,0 +1,12 @@
+diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx
+--- src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx	2008-07-25 09:16:09.000000000 +0200
++++ src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx	2008-07-25 13:09:01.000000000 +0200
+@@ -92,7 +92,7 @@
+ /*!
+  * \brief Return an edge from which hypotheses are propagated from
+  */
+-TopoDS_Edge StdMeshers_Propagation::GetPropagationSource(SMESH_Mesh& theMesh,
++inline TopoDS_Edge StdMeshers_Propagation::GetPropagationSource(SMESH_Mesh& theMesh,
+                                                          const TopoDS_Shape& theEdge)
+ {
+   return PropagationMgr::GetSource(theMesh.GetSubMeshContaining( theEdge ));
diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch
new file mode 100644
index 000000000..cbb59099d
--- /dev/null
+++ b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-vtk-5.2.patch
@@ -0,0 +1,30 @@
+diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+--- src3.2.6.old/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx	2008-07-25 09:16:09.000000000 +0200
++++ src3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx	2008-10-16 01:33:46.000000000 +0200
+@@ -86,7 +86,7 @@
+ 
+ namespace SMESH {
+ 
+-  void ReverseConnectivity( vector<int> & ids, int type )
++  void ReverseConnectivity( vector<vtkIdType> & ids, int type )
+   {
+     // for reverse connectivity of other types keeping the first id, see
+     // void SMESH_VisualObjDef::buildElemPrs() in SMESH_Object.cxx:900
+@@ -134,7 +134,7 @@
+       reverse( ids.begin(), ids.end() );
+     }
+     else {
+-      vector<int> aRevIds( ids.size() );
++      vector<vtkIdType> aRevIds( ids.size() );
+       for ( int i = 0; i < ids.size(); i++)
+         aRevIds[ i ] = ids[ conn[ i ]];
+       ids = aRevIds;
+@@ -597,7 +597,7 @@
+   if (IsValid() && !mySMESHGUI->isActiveStudyLocked()) {
+     myBusy = true;
+     
+-    vector<int> anIds;
++    vector<vtkIdType> anIds;
+ 
+     switch (myType) {
+     case QUAD_EDGE:
diff --git a/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild b/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild
index 9968c4f49..c9b04ce21 100644
--- a/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild
+++ b/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild
@@ -31,7 +31,6 @@ 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"
@@ -46,6 +45,21 @@ src_unpack() {
 	if version_is_at_least "4.3" $(gcc-version) ; then
 		epatch "${FILESDIR}"/${P}-gcc-4.3.patch
 	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" && has_version "<=sci-libs/vtk-5.2" ; then
+		append-flags -I/usr/include/vtk-5.0
+	fi
+	# If vtk-5.2 is used, include directory is named vtk-5.2 and not vtk
+	if has_version ">=sci-libs/vtk-5.2" ; then
+	   append-flags -I/usr/include/vtk-5.2
+	   epatch "${FILESDIR}"/${P}-vtk-5.2.patch
+	fi
+
+	# fix relocation error
+	if use amd64 ; then
+		epatch "${FILESDIR}"/${P}-amd64-relocation-error.patch
+	fi
 }
 
 
@@ -55,14 +69,6 @@ src_compile() {
 	rm -r -f autom4te.cache
 	./build_configure
 
-	# 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
-
 	# 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