aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-29 15:33:02 +0000
committerdanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-29 15:33:02 +0000
commit6b1f1c5b36ba21cb88cf036eecb1ecaf64e2e16f (patch)
tree00214790f772222c61d2b11dfbf566dee6a97e58
parentCorrected a minor bug (diff)
downloadsci-6b1f1c5b36ba21cb88cf036eecb1ecaf64e2e16f.tar.gz
sci-6b1f1c5b36ba21cb88cf036eecb1ecaf64e2e16f.tar.bz2
sci-6b1f1c5b36ba21cb88cf036eecb1ecaf64e2e16f.zip
Added Gcc-4.3 support. Thanks to Bert K. for his patches!
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1115 32389bae-6d03-0410-99cf-db05cde120eb
-rw-r--r--sci-misc/salome-visu/Changelog6
-rw-r--r--sci-misc/salome-visu/Manifest5
-rw-r--r--sci-misc/salome-visu/files/salome-visu-3.2.6-gcc-4.3.patch35
-rw-r--r--sci-misc/salome-visu/salome-visu-3.2.6.ebuild5
4 files changed, 48 insertions, 3 deletions
diff --git a/sci-misc/salome-visu/Changelog b/sci-misc/salome-visu/Changelog
index 879e7c3ec..4ebae0ce2 100644
--- a/sci-misc/salome-visu/Changelog
+++ b/sci-misc/salome-visu/Changelog
@@ -1,6 +1,10 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
-21 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
+ 29 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
+ +salome-visu-3.2.6-gcc-4.3.patch
+ Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@web.de>
+
+ 21 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
Initial import.
+salome-visu-3.2.6.ebuild, +salome-visu-3.2.6.patch, +salome-visu-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!
diff --git a/sci-misc/salome-visu/Manifest b/sci-misc/salome-visu/Manifest
index c6ea8c76b..851161bbe 100644
--- a/sci-misc/salome-visu/Manifest
+++ b/sci-misc/salome-visu/Manifest
@@ -1,5 +1,6 @@
+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 salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-visu-3.2.6.ebuild 4228 RMD160 fc79533f10758efac0985ed431fdd5df5a2b85e1 SHA1 2942b6c299c4baafaf9b0ea947d1397ebde20bce SHA256 fae40feb68e853f9a5c4a46299977946279d6ba0b221821c58585d691978eb5d
-MISC Changelog 601 RMD160 0a99846c8ae58bc0968af91e241ab6a7b7d567d2 SHA1 af869604f9c8bf826b5b029ab374e0effc6a08fd SHA256 f92eca2238fc5b491c061813f68da9762d21e91836b5b2353ed5a19b7f02fe76
+EBUILD salome-visu-3.2.6.ebuild 4346 RMD160 fd70806516a0fbc4ced523c1e388cf0a243f1fc7 SHA1 72cfe1ba36f8cc5db83cd2ce05c5a97cfbcfe864 SHA256 c3bfe0116d9bc22115e28b03a8696640f5eec7b64b2713a3fd4c530b3a904360
+MISC Changelog 774 RMD160 fb9833ddba5264c5e4efe01fbc48290b050f0417 SHA1 f6b143fd0a300d90f07a433bfca887401f8943b4 SHA256 bf72023144a2c87abb3b1835dd2e88527bc84ade6457f50071e074a683a25cbc
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
new file mode 100644
index 000000000..963530a84
--- /dev/null
+++ b/sci-misc/salome-visu/files/salome-visu-3.2.6-gcc-4.3.patch
@@ -0,0 +1,35 @@
+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/salome-visu-3.2.6.ebuild b/sci-misc/salome-visu/salome-visu-3.2.6.ebuild
index 4876c665c..337d69ee0 100644
--- a/sci-misc/salome-visu/salome-visu-3.2.6.ebuild
+++ b/sci-misc/salome-visu/salome-visu-3.2.6.ebuild
@@ -56,6 +56,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
}