Fix for gcc-4.6, #362365

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 205 insertions, 4 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 7fdc164e6ace..5bfe4d7ba331 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.56 2011/03/22 10:20:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.57 2011/04/23 15:38:47 jlec Exp $
+
+  23 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/3.2.2-gcc46.patch,
+  geos-3.2.2.ebuild:
+  Fix for gcc-4.6, #362365
 
   22 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -geos-3.1.1.ebuild, -files/geos-3.1.1-missing-includes.patch,
diff --git a/sci-libs/geos/files/3.2.2-gcc46.patch b/sci-libs/geos/files/3.2.2-gcc46.patch
new file mode 100644
index 000000000000..ac91a0a26e7a
--- /dev/null
+++ b/sci-libs/geos/files/3.2.2-gcc46.patch
@@ -0,0 +1,194 @@
+ .../geos/geom/CoordinateArraySequenceFactory.h     |    1 +
+ .../headers/geos/geom/CoordinateSequenceFactory.h  |    1 +
+ .../geos/index/chain/MonotoneChainBuilder.h        |    1 +
+ .../geos/operation/overlay/OverlayNodeFactory.h    |    2 ++
+ .../geos/operation/valid/SimpleNestedRingTester.h  |    1 +
+ source/headers/geos/planargraph/DirectedEdgeStar.h |    1 +
+ source/headers/geos/planargraph/Node.h             |    2 ++
+ .../geos/simplify/DouglasPeuckerLineSimplifier.h   |    1 +
+ source/headers/geos/simplify/TaggedLineString.h    |    1 +
+ .../geos/simplify/TaggedLineStringSimplifier.h     |    1 +
+ source/index/bintree/Bintree.cpp                   |    1 +
+ source/index/bintree/Node.cpp                      |    2 ++
+ source/index/bintree/Root.cpp                      |    1 +
+ source/index/strtree/AbstractNode.cpp              |    1 +
+ 14 files changed, 17 insertions(+), 0 deletions(-)
+
+diff --git a/source/headers/geos/geom/CoordinateArraySequenceFactory.h b/source/headers/geos/geom/CoordinateArraySequenceFactory.h
+index 1f19e09..bef5bfc 100644
+--- a/source/headers/geos/geom/CoordinateArraySequenceFactory.h
++++ b/source/headers/geos/geom/CoordinateArraySequenceFactory.h
+@@ -23,6 +23,7 @@
+ #include <geos/geom/CoordinateSequenceFactory.h> // for inheritance
+ 
+ #include <geos/inline.h>
++#include <cstddef>
+ 
+ // Forward declarations
+ namespace geos {
+diff --git a/source/headers/geos/geom/CoordinateSequenceFactory.h b/source/headers/geos/geom/CoordinateSequenceFactory.h
+index 6441d94..008e183 100644
+--- a/source/headers/geos/geom/CoordinateSequenceFactory.h
++++ b/source/headers/geos/geom/CoordinateSequenceFactory.h
+@@ -23,6 +23,7 @@
+ 
+ #include <geos/export.h>
+ #include <vector>
++#include <cstddef>
+ 
+ //#include <geos/geom/Coordinate.h>
+ #include <geos/inline.h>
+diff --git a/source/headers/geos/index/chain/MonotoneChainBuilder.h b/source/headers/geos/index/chain/MonotoneChainBuilder.h
+index 7c27e83..e273713 100644
+--- a/source/headers/geos/index/chain/MonotoneChainBuilder.h
++++ b/source/headers/geos/index/chain/MonotoneChainBuilder.h
+@@ -22,6 +22,7 @@
+ 
+ #include <geos/export.h>
+ #include <vector>
++#include <cstddef>
+ 
+ // Forward declarations
+ namespace geos {
+diff --git a/source/headers/geos/operation/overlay/OverlayNodeFactory.h b/source/headers/geos/operation/overlay/OverlayNodeFactory.h
+index 12fb81c..568d05d 100644
+--- a/source/headers/geos/operation/overlay/OverlayNodeFactory.h
++++ b/source/headers/geos/operation/overlay/OverlayNodeFactory.h
+@@ -23,6 +23,7 @@
+ #include <geos/export.h>
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ #include <geos/geomgraph/NodeFactory.h> // for inheritance
+ 
+@@ -46,6 +47,7 @@ namespace overlay { // geos::operation::overlay
+  */
+ class GEOS_DLL OverlayNodeFactory: public geomgraph::NodeFactory {
+ public:
++	OverlayNodeFactory() {}
+ 	geomgraph::Node* createNode(const geom::Coordinate &coord) const;
+ 	static const geomgraph::NodeFactory &instance();
+ };
+diff --git a/source/headers/geos/operation/valid/SimpleNestedRingTester.h b/source/headers/geos/operation/valid/SimpleNestedRingTester.h
+index b8888ac..7ab726d 100644
+--- a/source/headers/geos/operation/valid/SimpleNestedRingTester.h
++++ b/source/headers/geos/operation/valid/SimpleNestedRingTester.h
+@@ -24,6 +24,7 @@
+ #include <geos/export.h>
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ // Forward declarations
+ namespace geos {
+diff --git a/source/headers/geos/planargraph/DirectedEdgeStar.h b/source/headers/geos/planargraph/DirectedEdgeStar.h
+index cc36ca7..a8e1f68 100644
+--- a/source/headers/geos/planargraph/DirectedEdgeStar.h
++++ b/source/headers/geos/planargraph/DirectedEdgeStar.h
+@@ -20,6 +20,7 @@
+ #include <geos/export.h>
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ // Forward declarations
+ namespace geos {
+diff --git a/source/headers/geos/planargraph/Node.h b/source/headers/geos/planargraph/Node.h
+index 579b203..06b978c 100644
+--- a/source/headers/geos/planargraph/Node.h
++++ b/source/headers/geos/planargraph/Node.h
+@@ -23,6 +23,8 @@
+ #include <geos/planargraph/DirectedEdgeStar.h> // for inlines
+ #include <geos/geom/Coordinate.h> // for composition
+ 
++#include <cstddef>
++
+ // Forward declarations
+ namespace geos {
+ 	namespace planargraph { 
+diff --git a/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h b/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
+index 5dd0412..1e32838 100644
+--- a/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
++++ b/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
+@@ -23,6 +23,7 @@
+ #include <geos/export.h>
+ #include <vector>
+ #include <memory> // for auto_ptr
++#include <cstddef>
+ 
+ // Forward declarations
+ namespace geos {
+diff --git a/source/headers/geos/simplify/TaggedLineString.h b/source/headers/geos/simplify/TaggedLineString.h
+index 49af2ba..2025a31 100644
+--- a/source/headers/geos/simplify/TaggedLineString.h
++++ b/source/headers/geos/simplify/TaggedLineString.h
+@@ -29,6 +29,7 @@
+ #include <geos/export.h>
+ #include <vector>
+ #include <memory>
++#include <cstddef>
+ 
+ // Forward declarations
+ namespace geos {
+diff --git a/source/headers/geos/simplify/TaggedLineStringSimplifier.h b/source/headers/geos/simplify/TaggedLineStringSimplifier.h
+index 8ab8507..ad4cd75 100644
+--- a/source/headers/geos/simplify/TaggedLineStringSimplifier.h
++++ b/source/headers/geos/simplify/TaggedLineStringSimplifier.h
+@@ -28,6 +28,7 @@
+ #include <geos/export.h>
+ #include <vector>
+ #include <memory>
++#include <cstddef>
+ 
+ // Forward declarations
+ namespace geos {
+diff --git a/source/index/bintree/Bintree.cpp b/source/index/bintree/Bintree.cpp
+index 66a5ebc..25be163 100644
+--- a/source/index/bintree/Bintree.cpp
++++ b/source/index/bintree/Bintree.cpp
+@@ -18,6 +18,7 @@
+ #include <geos/index/bintree/Root.h>
+ #include <geos/index/bintree/Interval.h>
+ #include <vector>
++#include <cstddef>
+ 
+ namespace geos {
+ namespace index { // geos.index
+diff --git a/source/index/bintree/Node.cpp b/source/index/bintree/Node.cpp
+index a879bc9..ae5e952 100644
+--- a/source/index/bintree/Node.cpp
++++ b/source/index/bintree/Node.cpp
+@@ -20,6 +20,8 @@
+ #include <geos/index/bintree/Key.h>
+ #include <geos/index/bintree/Interval.h>
+ 
++#include <cstddef>
++
+ namespace geos {
+ namespace index { // geos.index
+ namespace bintree { // geos.index.bintree
+diff --git a/source/index/bintree/Root.cpp b/source/index/bintree/Root.cpp
+index 0f2de89..19b05fe 100644
+--- a/source/index/bintree/Root.cpp
++++ b/source/index/bintree/Root.cpp
+@@ -20,6 +20,7 @@
+ #include <geos/index/quadtree/IntervalSize.h>
+ 
+ #include <cassert>
++#include <cstddef>
+ 
+ namespace geos {
+ namespace index { // geos.index
+diff --git a/source/index/strtree/AbstractNode.cpp b/source/index/strtree/AbstractNode.cpp
+index bd07cf4..16ad808 100644
+--- a/source/index/strtree/AbstractNode.cpp
++++ b/source/index/strtree/AbstractNode.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include <vector>
+ #include <cassert>
++#include <cstddef>
+ 
+ using namespace std;
+ 
diff --git a/sci-libs/geos/geos-3.2.2.ebuild b/sci-libs/geos/geos-3.2.2.ebuild
index f219c5cbaf89..935eb661ebc8 100644
--- a/sci-libs/geos/geos-3.2.2.ebuild
+++ b/sci-libs/geos/geos-3.2.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.2.ebuild,v 1.8 2011/03/12 13:49:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.2.2.ebuild,v 1.9 2011/04/23 15:38:47 jlec Exp $
 
 EAPI="3"
+
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
@@ -31,11 +32,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/3.2.0-multipy.patch \
+	epatch \
+		"${FILESDIR}"/3.2.0-multipy.patch \
 		"${FILESDIR}"/3.2.0-swig2.0.patch \
 		"${FILESDIR}"/3.2.0-python.patch \
 		"${FILESDIR}"/3.2.0-darwin.patch \
-		"${FILESDIR}"/3.2.2-disable_static_modules.patch
+		"${FILESDIR}"/${PV}-disable_static_modules.patch \
+		"${FILESDIR}"/${PV}-gcc46.patch
 	eautoreconf
 	echo "#!${EPREFIX}/bin/bash" > py-compile
 }