The following commit has been merged in the upstream branch: commit ef014a0a4cc50e3758f340092f8aca04cb313917 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed May 25 15:35:00 2011 +0200
Added patch DirectedEdgeStar.h still for std namespace. diff --git a/debian/changelog b/debian/changelog index 86c075f..9c91432 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,12 +4,14 @@ geos (3.2.2-2) unstable; urgency=low * Fixed previous changelog entry. * Added CoordinateSequenceFactory.h patch to fix a missing declaration. (closes: #624949) - * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp - patches to fix a missing header file inclusion in some files. + * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp, + and other patches to fix a missing cstddef header file inclusion in + some files and use of std namespace. This is required in current + default gcc flavor. * Use -fpermessive at building time to work around some minor compatibility problems which prevent a successuful building. - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 25 May 2011 14:21:49 +0200 + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 25 May 2011 15:33:37 +0200 geos (3.2.2-1) unstable; urgency=low diff --git a/debian/patches/DirectedEdgeStar.h b/debian/patches/DirectedEdgeStar.h new file mode 100644 index 0000000..5422464 --- /dev/null +++ b/debian/patches/DirectedEdgeStar.h @@ -0,0 +1,21 @@ +Index: geos/source/headers/geos/planargraph/DirectedEdgeStar.h +=================================================================== +--- geos.orig/source/headers/geos/planargraph/DirectedEdgeStar.h 2011-05-25 15:32:28.000000000 +0200 ++++ geos/source/headers/geos/planargraph/DirectedEdgeStar.h 2011-05-25 15:33:06.000000000 +0200 +@@ -20,6 +20,7 @@ + #include <geos/export.h> + + #include <vector> ++#include <cstddef> + + // Forward declarations + namespace geos { +@@ -35,6 +36,8 @@ + namespace geos { + namespace planargraph { // geos.planargraph + ++using namespace std; ++ + /// A sorted collection of DirectedEdge which leave a Node in a PlanarGraph. + class GEOS_DLL DirectedEdgeStar { + protected: diff --git a/debian/patches/series b/debian/patches/series index a4edf69..f55ed3c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ Root.cpp MonotoneChainBuilder.h AbstractNode.cpp SimpleNestedRingTester.h +DirectedEdgeStar.h -- Geometry engine for Geographic Information Systems _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel