Fix building with GCC 4.4+ wrt #279160, thanks to Dominik Kapusta for patch.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 54 insertions, 4 deletions

diff --git a/sci-libs/openfoam-kernel/ChangeLog b/sci-libs/openfoam-kernel/ChangeLog
index 6e7729675d04..afed352b6ba6 100644
--- a/sci-libs/openfoam-kernel/ChangeLog
+++ b/sci-libs/openfoam-kernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/openfoam-kernel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-kernel/ChangeLog,v 1.2 2009/04/26 13:42:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-kernel/ChangeLog,v 1.3 2009/08/15 12:18:55 ssuominen Exp $
+
+  14 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  openfoam-kernel-1.5_p20090311.ebuild,
+  +files/openfoam-kernel-1.5_p20090311-gcc44.patch:
+  Fix building with GCC 4.4+ wrt #279160, thanks to Dominik Kapusta for
+  patch.
 
   26 Apr 2009; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Adding Oliver Borm to metadata
diff --git a/sci-libs/openfoam-kernel/Manifest b/sci-libs/openfoam-kernel/Manifest
index 2d91f8a796a7..b0f47157c7b9 100644
--- a/sci-libs/openfoam-kernel/Manifest
+++ b/sci-libs/openfoam-kernel/Manifest
@@ -1,8 +1,9 @@
 AUX OpenFOAM-1.5-compile.patch 13417 RMD160 1c074f559011c5135ab8069f0ebc9325d9094fba SHA1 bbeb3d53f75eb7dfee475766a78c509b6a7c4a1c SHA256 8dd34d4690f694f22d33b9ba4fb5391eeadad5104676b63de7fe5ccf72e0ff6a
 AUX OpenFOAM-1.5-ggi.patch 5907 RMD160 9a678e2fd7d36e862ffa1ed7e18aa4a073b77ea3 SHA1 2053a2e4e0c96500330b8ec233673391cb7487cf SHA256 e592d47ffee2fe9495378860932630936d5d838cf7290fb10d1e298986729b6c
+AUX openfoam-kernel-1.5_p20090311-gcc44.patch 1724 RMD160 4af87a7d199df2bf4585349cb3081cd61d8b648b SHA1 fc932548b0612666681ba0fdfa8ea0a842fe91f1 SHA256 153494cb285dac663b07fe71fccbeba7678cbcde5a0967e02bffcbcf247c8003
 DIST OpenFOAM-1.5-svn.patch 4002548 RMD160 75b28c0c9c03b3e3886d0d90e8c631233d0734a2 SHA1 349e50a91095e0ff0e75b41f8eb8453623d5e4a8 SHA256 2a5872a4dbb8f58cb55b1ec64bcdc6f8e462ce2a541d21f1a8fc5faeb345d7d4
 DIST OpenFOAM-1.5.General.tgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31
 DIST OpenFOAM-git-1.5_p20090311.patch 711366 RMD160 ac9f6710aa9c92473068c18cf97ca2b25dc904e8 SHA1 068ade9111558adf4b2330e6acb5aabfe55f58fe SHA256 393ad127f9bd2cf6eb8826d65e2528d83ad8b6cceeab3de5ed04fb01746e3201
-EBUILD openfoam-kernel-1.5_p20090311.ebuild 1717 RMD160 94eeaaf1bdcea4b2443383755b7aab319de0307d SHA1 bf284bc7e2aa99e24430a43575f272746b9537c8 SHA256 391c439d2d75305fad3c32b865d4fec322b8659e845cba16373f8f1c611f836b
-MISC ChangeLog 4415 RMD160 e450357d380c5ebb1e4201a19809dd6bc4c2786d SHA1 dd7ca64dce434e3d83e3973268a526bab2f27341 SHA256 0753c1b6cdc10fdd9ce4071bf87655a19a003732e80cd5da59dddf49f76d2e01
+EBUILD openfoam-kernel-1.5_p20090311.ebuild 1758 RMD160 f51a0cec2107cdd10d37ac2f5c832d91774a7ba3 SHA1 c7a13bd18050397fccfe06bb3a77a959e90a1a87 SHA256 3fd35b186f8d00123501bfc52e12a87bbeaeaff72c611d7d69622e4e83072599
+MISC ChangeLog 4645 RMD160 441f0b08b86fea12bffb2387101616cf1ecf09f9 SHA1 f5117bca8ba4bb75a20234123d2efa1fa9d7243c SHA256 36c132549080b0c891c1880de338f150b83e5356f22db72d4765a47d64b7debd
 MISC metadata.xml 342 RMD160 bba0c7eb3af0d1cd2322a40e86f4a80a0f48b6cf SHA1 7950d74b3d7d4fbe7167b487c5cd26559548b4ab SHA256 b57f05d81648f5a92cedd91c025852cb3bc5fc8d4ab4d110eb6886fc89e2ba97
diff --git a/sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc44.patch b/sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc44.patch
new file mode 100644
index 000000000000..6e41bfb00a1c
--- /dev/null
+++ b/sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc44.patch
@@ -0,0 +1,42 @@
+diff --git a/src/OSspecific/Unix/signals/sigFpe.C b/src/OSspecific/Unix/signals/sigFpe.C
+index e3bcf15..759f8c8 100644
+--- a/src/OSspecific/Unix/signals/sigFpe.C
++++ b/src/OSspecific/Unix/signals/sigFpe.C
+@@ -39,6 +39,7 @@ License
+ 
+ #   include <fenv.h>
+ #   include <malloc.h>
++#   include <stdint.h>
+ 
+ #elif defined(sgiN32) || defined(sgiN32Gcc)
+ 
+diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+index 9f858b9..25f2641 100644
+--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
++++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+@@ -763,10 +763,11 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
+     const scalarField& maxDist
+ ) const
+ {
++    treeBoundBox tbb(samples);
+     // Build tree out of all samples.
+     octree<octreeDataPoint> ppTree
+     (
+-        treeBoundBox(samples),      // overall search domain
++        tbb,      // overall search domain
+         octreeDataPoint(samples),   // all information needed to do checks
+         1,          // min levels
+         20.0,       // maximum ratio of cubes v.s. cells
+@@ -864,10 +865,11 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
+     scalar maxSearch = max(maxDist);
+     vector span(maxSearch, maxSearch, maxSearch);
+ 
++    treeBoundBox tbb(samples);
+     // octree.shapes holds reference!
+     octree<octreeDataPoint> ppTree
+     (
+-        treeBoundBox(samples),      // overall search domain
++        tbb,      // overall search domain
+         octreeDataPoint(samples),   // all information needed to do checks
+         1,          // min levels
+         20.0,       // maximum ratio of cubes v.s. cells
diff --git a/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild b/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild
index 84f45f08e682..1b67ace7b144 100644
--- a/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild
+++ b/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild,v 1.1 2009/04/25 16:19:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild,v 1.2 2009/08/15 12:18:55 ssuominen Exp $
 
 EAPI="2"
 
@@ -44,6 +44,7 @@ src_prepare() {
 	epatch "${DISTDIR}"/${MY_P}-svn.patch
 	epatch "${DISTDIR}"/${MY_PN}-git-${PVR}.patch
 	epatch "${FILESDIR}"/${MY_P}-ggi.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_compile() {