aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-29 15:45:15 +0000
committerdanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-29 15:45:15 +0000
commita4657c3be52f86660b46ef88e643c35f419de399 (patch)
tree7fb574be0b6f5cbce0c8307dfb23ac405e312056 /sci-misc
parentAdded Gcc-4.3 support. Thanks to Bert K. for his patches! (diff)
downloadsci-a4657c3be52f86660b46ef88e643c35f419de399.tar.gz
sci-a4657c3be52f86660b46ef88e643c35f419de399.tar.bz2
sci-a4657c3be52f86660b46ef88e643c35f419de399.zip
Added Gcc-4.3 support. Thanks to Bert K. for his patches!
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1119 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/salome-gui/Changelog4
-rw-r--r--sci-misc/salome-gui/Manifest5
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch71
-rw-r--r--sci-misc/salome-gui/salome-gui-3.2.6.ebuild5
4 files changed, 83 insertions, 2 deletions
diff --git a/sci-misc/salome-gui/Changelog b/sci-misc/salome-gui/Changelog
index 718dfbe39..b412c1c08 100644
--- a/sci-misc/salome-gui/Changelog
+++ b/sci-misc/salome-gui/Changelog
@@ -1,5 +1,9 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
+ +salome-gui-3.2.6-gcc-4.3.patch
+ Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@web.de>
+
20 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
Corrected a minor issue (icon)
diff --git a/sci-misc/salome-gui/Manifest b/sci-misc/salome-gui/Manifest
index af3713549..631c07cb6 100644
--- a/sci-misc/salome-gui/Manifest
+++ b/sci-misc/salome-gui/Manifest
@@ -1,8 +1,9 @@
+AUX salome-gui-3.2.6-gcc-4.3.patch 2808 RMD160 18acd8191f87846712fe1a49a9cf0ede36c8d1e9 SHA1 aa0a2de9c868daee034f286d43074770313f3589 SHA256 363e9c3c194a7124a091ff6ddc8afc3a448de203a2a5cfbb26eb61ba815a97e8
AUX salome-gui-3.2.6.patch 3012 RMD160 22fb336711a1247d5cc072128e4464beb7fa5df9 SHA1 5a9228794bb143d75c9d1bba7c8cdf46ab6f47bc SHA256 6fe97d1363d257cddd40ce284d4b84f58849a3f75955bd792091b02d9a034ec0
AUX salome-gui-3.2.6_configure_in_base.patch 4588 RMD160 feab6b36319891f65665280d8f6e3e50078ec2f9 SHA1 abf258e19af6601f64215b9d0cc1fadc942f8025 SHA256 2ce9d880a0d7a4be6fca4ac5c1d2b927bd80c25aae41c4ee56eef2007dfe42d4
AUX salome-gui-3.2.6_qwt-4.patch 1853 RMD160 921d470a2aa3be47113c6c0f1cf6d913d08ae47f SHA1 7a35b01bcda7d63b357fd67bd48be16cbf4438fb SHA256 c7fc34c220f4d19896783f43e444de245eae5d8464315fa55d0093adfc0e2b97
AUX salome-gui-3.2.6_sip-4.1.7.patch 785 RMD160 0531e5ab612a973359ed96ce6afdbe09c0894678 SHA1 35207f32922b48782b08b17e85dcae596cfb2123 SHA256 daf7c76dfead2da15a4857849d119843ae5702f163c5d4a45404cdd8fd706185
AUX salome-gui-vtk-5.0.patch 8618 RMD160 e529f86abaad3991ba9e4d9664bf0b55dd9a6bbc SHA1 02cfa2dea47e8d3b8eff50ab90fb6acf2e15befd SHA256 15489b2ee67611077a7e988fcafdab20dab59335a34519baef6797ac4b4e2c30
DIST salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-gui-3.2.6.ebuild 5297 RMD160 341e16b6b183b84a0b160c5ab89d7c6267d33697 SHA1 dc8147204b08ee63a35bf384d3220241d775dacd SHA256 6b7965a9011bef8cf24c7b2f48ec34865f63e15b3c35fbb9c4b25d36ccbb58d5
-MISC Changelog 789 RMD160 05169aaaed11d207c24e8f9300854df1af42b471 SHA1 65be34632dbbebccd03dac550efaf99cb4ce5f9c SHA256 67ad2cdb8f5d9e59d56332450c23e44e695e2e337ed1dcdd67140363b9b29949
+EBUILD salome-gui-3.2.6.ebuild 5415 RMD160 feb747f263df237e2ca3ea0c4e5bda3e2a58d926 SHA1 00c8942a6ea1ff6b2abaf52e17bb5ecfa211e168 SHA256 031765cb8ccdad50e3585d05b2058952aa0842aef545873275022cf86f56cfea
+MISC Changelog 959 RMD160 28da32b52dfb1dc401d65da767afc674b79554f0 SHA1 d6ff4e52a61d4b8512ee31e68f2c7df6483b7b04 SHA256 65d8a6e28a9204fc8b741744e903d44a5ddb0592f3ed1ebb3c169b5334f60bcd
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch
new file mode 100644
index 000000000..63eab18b9
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch
@@ -0,0 +1,71 @@
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx 2008-05-26 00:04:12.000000000 +0200
+@@ -27,7 +27,9 @@
+
+ #include <GL/gl.h>
+
+-#include <iostream.h>
++#include <iostream>
++
++using std::cout;
+
+ /*!
+ Constructor
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx 2008-05-26 00:38:10.000000000 +0200
+@@ -47,6 +47,7 @@
+ #include <qstringlist.h>
+ #include <qapplication.h>
+ #include <iostream>
++#include <cstdlib>
+
+ /*!
+ \return the SALOME version number
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx 2008-05-26 00:28:19.000000000 +0200
+@@ -36,7 +36,7 @@
+ #include <qdict.h>
+
+ #include "utilities.h"
+-#include <iostream.h>
++#include <iostream>
+ #include <string>
+ #include <vector>
+
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx 2008-05-25 23:41:44.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include <qdir.h>
+ #include <qapplication.h>
+ #include <qregexp.h>
++#include <cstdlib>
+
+ /*!
+ Constructor
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx 2008-05-26 00:19:17.000000000 +0200
+@@ -67,7 +67,7 @@
+ //VRV: porting on Qt 3.0.5
+ #include <algorithm>
+
+-#include <iostream.h>
++#include <iostream>
+
+ using namespace std;
+
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx 2008-05-26 00:12:09.000000000 +0200
+@@ -31,6 +31,7 @@
+
+ #include <set>
+ #include <map>
++#include <algorithm>
+
+ #include <vtkUnstructuredGrid.h>
+ #include <vtkGeometryFilter.h>
diff --git a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
index 5268240d2..aae93b298 100644
--- a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
+++ b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
@@ -68,6 +68,11 @@ src_unpack()
epatch "${FILESDIR}"/${P}_qwt-4.patch
epatch "${FILESDIR}"/${P}_configure_in_base.patch
+ # Gcc 4.3 support
+ 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" ; then
einfo "vtk version 5 detected"