From 8ff9e5df0edfa8e59477e2af4e5471997c5e9acc Mon Sep 17 00:00:00 2001 From: danieltourde Date: Thu, 29 May 2008 15:28:36 +0000 Subject: Added Gcc-4.3 support. Thanks to Bert K. for his patches! git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1113 32389bae-6d03-0410-99cf-db05cde120eb --- sci-misc/salome-smesh/Changelog | 6 +++- sci-misc/salome-smesh/Manifest | 5 +-- .../files/salome-smesh-3.2.6-gcc-4.3.patch | 39 ++++++++++++++++++++++ sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild | 5 +++ 4 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch (limited to 'sci-misc/salome-smesh') diff --git a/sci-misc/salome-smesh/Changelog b/sci-misc/salome-smesh/Changelog index e34f69dd6..95303bd86 100644 --- a/sci-misc/salome-smesh/Changelog +++ b/sci-misc/salome-smesh/Changelog @@ -1,6 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ -21 May 2008; Daniel Tourde + 29 May 2008; Daniel Tourde + +salome-smesh-3.2.6-gcc-4.3.patch + Added support to gcc-4.3. Patch provided by Bert Karwatzki + + 21 May 2008; Daniel Tourde 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 , Jon Hood , Dewald Pietersen , and Richard Westwell for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks! diff --git a/sci-misc/salome-smesh/Manifest b/sci-misc/salome-smesh/Manifest index ba66e1bf8..14c7f273a 100644 --- a/sci-misc/salome-smesh/Manifest +++ b/sci-misc/salome-smesh/Manifest @@ -1,5 +1,6 @@ +AUX salome-smesh-3.2.6-gcc-4.3.patch 1819 RMD160 64f383736be1357d90fdcaaa2bcd28e61d3ecb5f SHA1 5e8682ec4917dcb9e1473efb9db8d29c1c978315 SHA256 316a48bde730ce3c5b67fc4a16d6b3e6698c413d921875b21aae2ed8c9b679f2 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 salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-smesh-3.2.6.ebuild 4241 RMD160 6faba70605ad3c55293b931993b14df77ec2f9e5 SHA1 0d47e58259a0b2622096e833cd72e869e61b266c SHA256 7ee70b8e208f89fd86b8fea9b445d3f060fb7480cc389d27733840f56fd48f81 -MISC Changelog 603 RMD160 bca33a87b9f9a64f6490afeb25e88345fe91f351 SHA1 8c4ceb703bf6131fcd892b160c6c51fc5547bdbe SHA256 07373bd7ecfa59bf3ff7bbfefb36d6b4328e621e2e139c9963b55ec92c0da115 +EBUILD salome-smesh-3.2.6.ebuild 4359 RMD160 6b6a75cb53bd94df8084b5c51fb8793a56b0a828 SHA1 004e0fef8ebe4ed09afc778077ed8771b97ada3c SHA256 0684e42b3d6bbbf5bb0d72b81552c3010fa976c3a94dae35ffea27ef492cae5c +MISC Changelog 777 RMD160 d826560ae3fa819cecf0dc9c4ed15b95531f3318 SHA1 e98f1fe70e0b74db1580ae25fca3d866de7b1741 SHA256 adcc7c24d30ecaa475c25114a2893ad2cc73ce7802ed593f962b0ab0c239d366 diff --git a/sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch new file mode 100644 index 000000000..b015022e6 --- /dev/null +++ b/sci-misc/salome-smesh/files/salome-smesh-3.2.6-gcc-4.3.patch @@ -0,0 +1,39 @@ +diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx src3.2.6/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx +--- src3.2.6.old/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx 2008-05-25 19:32:52.000000000 +0200 ++++ src3.2.6/SMESH_SRC_3.2.6/src/DriverUNV/UNV_Utilities.hxx 2008-05-26 03:23:15.000000000 +0200 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + namespace UNV{ + using namespace std; +diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h src3.2.6/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h +--- src3.2.6.old/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h 2008-05-25 19:32:52.000000000 +0200 ++++ src3.2.6/SMESH_SRC_3.2.6/src/MEFISTO2/aptrte.h 2008-05-26 03:38:58.000000000 +0200 +@@ -31,8 +31,8 @@ + #include // limites min max int long real ... + #include // gethostname, ... + #include +-#include // pour cout cin ... +-#include // pour le format des io setw, stx, setfill, ... ++#include // pour cout cin ... ++#include // pour le format des io setw, stx, setfill, ... + #include // pour les fonctions sur les chaines de caracteres + #include + #include +diff -aur src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx +--- src3.2.6.old/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx 2008-05-25 19:32:52.000000000 +0200 ++++ src3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Prism_3D.hxx 2008-05-26 03:47:51.000000000 +0200 +@@ -37,8 +37,8 @@ + #include "SMESH_MesherHelper.hxx" + #include "SMESH_Comment.hxx" + +-#include +-#include ++#include ++#include + + #include + #include 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 4edc88f5b..0b3869313 100644 --- a/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild +++ b/sci-misc/salome-smesh/salome-smesh-3.2.6.ebuild @@ -57,6 +57,11 @@ src_unpack() 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 } -- cgit v1.2.3