debian/0000755000000000000000000000000012320333560007163 5ustar debian/libgeos-c1.install0000644000000000000000000000003012312537734012503 0ustar usr/lib/libgeos_c.so.1* debian/control.in0000644000000000000000000001163712312537734011215 0ustar Source: geos Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine , Bas Couwenberg Section: science Priority: optional Build-Depends: debhelper (>= 9), doxygen, swig, ruby, ruby-all-dev, dh-autoreconf Standards-Version: 3.9.3 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/geos.git Vcs-Git: git://anonscm.debian.org/pkg-grass/geos.git Homepage: http://trac.osgeo.org/geos/ Package: libgeos-dev Architecture: any Section: libdevel Depends: libgeos-c1 (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc Description: Geometry engine for GIS - Development files GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the headers and libraries needed to develop programs using GEOS. Package: libgeos++-dev Architecture: any Section: libdevel Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-dev, ${misc:Depends} Suggests: libgdal-doc Breaks: libgeos-dev (<< 3.3.1-1~) Description: Geometry engine for GIS - C++ development files GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the headers and libraries needed to develop programs using GEOS in C++. Note that third-parties programs should use the stable C API instead of the unstable C++ one. Package: libgeos-c1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Geometry engine for Geographic Information Systems - C Library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. Functions provided include: . * spatial predicates (based on the DE-9IM model), * overlay functions (intersection, difference, union, symmetric difference), * buffer, * convex hull, * area and distance functions, and * topological validity checking . This package contains the C library. A C++ library is provided by the libgeos-* package. Package: libgeos-@VERSION@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Geometry engine for Geographic Information Systems - C++ Library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. Functions provided include: . * spatial predicates (based on the DE-9IM model), * overlay functions (intersection, difference, union, symmetric difference), * buffer, * convex hull, * area and distance functions, and * topological validity checking . This package contains the C++ library. A stable C library is provided by the libgeos-c* package and should be preferred by third-parties programs. Package: libgeos-doc Architecture: all Section: doc Depends: ${misc:Depends} Suggests: libgeos-dev (= ${binary:Version}) Description: Documentation for the GEOS GIS geometry engine library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the documentation for the GEOS API. Homepage: http://download.osgeo.org/geos/doxygen/ Package: libgeos-ruby1.8 Architecture: any Section: oldlibs Depends: ruby-geos, ${misc:Depends} Description: Transitional package from libgeos-ruby1.8 to ruby-geos This is a transitional dummy package to ease upgrades from the libgeos-ruby1.8 package to the ruby-geos package. It can safely be removed. Package: ruby-geos Architecture: any Section: ruby Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libgeos-ruby1.8 (<< 3.4.2-2~) Provides: libgeos-ruby1.8 Replaces: libgeos-ruby1.8 (<< 3.4.2-2~) Description: GEOS bindings for Ruby GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the Ruby bindings for GEOS. Package: libgeos-dbg Architecture: any Section: debug Priority: extra Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for the GEOS library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the debugging symbols for C/C++ GEOS library. debian/docs0000644000000000000000000000003112312537734010042 0ustar NEWS README TODO AUTHORS debian/libgeos-c1.lintian-overrides0000644000000000000000000000014712312537734014504 0ustar # Symbols are problematic for C++ libraries libgeos-c1: no-symbols-control-file usr/lib/libgeos_c.so.* debian/libgeos-doc.links0000644000000000000000000000011712312537734012425 0ustar usr/share/doc/libgeos-doc/html/index.html usr/share/doc/libgeos-doc/index.html debian/copyright0000644000000000000000000001061612312537734011134 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: GEOS Upstream-Contact: GEOS Developers Source: http://trac.osgeo.org/geos/ Files: * Copyright: 2001-2009, Vivid Solutions Inc 2005-2011, Refractions Research Inc 2009-2013, Sandro Santilli 2008-2010, Safe Software Inc License: LGPL-2.1+ Comment: The upstream contributors are listed in the AUTHORS file. Files: include/geos/triangulate/* src/triangulate/* Copyright: 2012, Excensus LLC License: LGPL-2.1+ Files: tests/xmltester/tinyxml/* Copyright: 2000-2006, Lee Thomason (www.grinninglizard.com) License: zlib Files: include/geos/io/CLocalizer.h src/io/CLocalizer.cpp Copyright: 2008, Sean Gillies License: LGPL-2.1+ Files: ltmain.sh Copyright: 1996-2001, 2003-2008 Free Software Foundation, Inc License: GPL-2.0+ with Libtool exception Files: include/geos/timeval.h Copyright: 2006, Wu Yongwei License: public-domain All code here is considered in the public domain though I do wish my name could be retained if anyone uses them. :-) Files: include/geos/algorithm/RobustDeterminant.h Copyright: 1995, INRIA Prisme Project 2001-2002, Vivid Solutions Inc 2005-2006, Refractions Research Inc License: LGPL-2.1+ Files: src/algorithm/RobustDeterminant.cpp Copyright: 1995, Olivier Devillers 2001-2002, Vivid Solutions Inc 2006, Refractions Research Inc License: LGPL-2.1+ Files: include/geos/export.h Copyright: 2009, Ragi Y. Burhum License: LGPL-2.1+ Files: swig/python/tests/runtests.py Copyright: 2004, Sean Gillies, sgillies@frii.com License: LGPL-2.1+ License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . On Debian systems, the full text of the GNU Lesser General Public License version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'. License: GPL-2.0+ with Libtool exception GNU Libtool is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . As a special exception to the GNU General Public License, if you distribute this file as part of a program or library that is built using GNU Libtool, you may include this file under the same distribution terms that you use for the rest of that program. . GNU Libtool is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with GNU Libtool; see the file COPYING. If not, a copy can be downloaded from http://www.gnu.org/licenses/gpl.html, or obtained by writing to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. License: zlib This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. . Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: . 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. . 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. . 3. This notice may not be removed or altered from any source distribution. debian/libgeos-doc.README.Debian0000644000000000000000000000051512312537734013425 0ustar GEOS documentation for Debian ----------------------------- To access the GEOS API Documentation open index.html in a web browser. There is example code in examples/example.cpp. It requires the libgeos2 package to be installed to compile and run. Invoke 'make' to compile it. -- Steve Halasz (debian@adkgis.org), Fri, 5 Nov 2004 debian/changelog0000644000000000000000000003016612320333540011041 0ustar geos (3.4.2-4ubuntu1) trusty; urgency=medium * Skip the tests on arm64 and ppc64el too. -- Matthias Klose Sun, 06 Apr 2014 22:21:26 +0200 geos (3.4.2-4) unstable; urgency=low * Re-enable parallel builds, wasn't cause of testrunning failures. * Skip tests on troublesome architectures. -- Bas Couwenberg Thu, 20 Mar 2014 08:44:52 +0100 geos (3.4.2-3) unstable; urgency=medium * Add patch to include cmath in unit tests to have isnan() defined. * Disable parallel builds, can cause xmltester failures. -- Bas Couwenberg Wed, 19 Mar 2014 09:15:09 +0100 geos (3.4.2-2) unstable; urgency=medium * Add myself to Uploaders. * Restructure control file with cme, changes: Vcs-* fields. * Rename libgeos-ruby1.8 to ruby-geos, according to Ruby packaging policy. * Use minimal dh rules with autoreconf for retooling. (closes: #733585) * Also patch Makefile.am and macros/ruby.m4 for Ruby extension. * Enable parallel builds. * Link to LGPL-2.1 common license instead of symlink in copyright file. * Update copyright file using copyright-format 1.0. * Add DEP3 patch headers. * Add doc-base registration for libgeos-doc. * Add patches to modernize the build system to prevent autoreconf warnings. * Add gbp.conf to use pristine-tar by default. * Add lintian overrides for no symbols file, symbols are problematic for C++ libraries. * Bump Standards-Version to 3.9.5, changes: Vcs-* fields, minimal dh rules, copyright-format. -- Bas Couwenberg Fri, 07 Mar 2014 21:08:52 +0100 geos (3.4.2-1.1) unstable; urgency=medium * Non-maintainer upload. * Build for current Ruby version. (Closes: #735652) -- Christian Hofstaedtler Thu, 13 Feb 2014 02:29:40 +0100 geos (3.4.2-1) unstable; urgency=low [ Markus Wanner and Francesco Paolo Lovergine ] * New upstream release. (closes: #693694) * Patches just refreshed. [ Bas Couwenberg ] * Build-depend on autotools-dev so that the config.guess/config.sub update code in debian/rules works properly. Thanks Colin Watson for the patch! (closes: #726455) * Update watch file, handle common mistakes. [ Francesco Paolo Lovergine ] * Added an idiot-proof ruby patch for libtool in order to avoid a FTBS. -- Francesco Paolo Lovergine Fri, 06 Dec 2013 13:48:39 +0100 geos (3.3.3-1.1) unstable; urgency=low * Non-maintainer upload. * Build-depend on ruby/ruby-dev1.8 and build-conflict on ruby/ruby-dev1.9 to ensure the package continues to be built using ruby1.8 (Closes: #676094) - Thanks to Peter Green and Raspbian for the patch -- Scott Kitterman Tue, 10 Jul 2012 23:39:07 -0400 geos (3.3.3-1) unstable; urgency=low * New upstream bugfixing version. This is useful because correctly support new topology-enabled for Postgis 2.0. * Policy bumped to 3.9.3, no changes required. * Debhelper level set to 9. * Patch geos-config revised, partially merged upstream. -- Francesco Paolo Lovergine Wed, 23 May 2012 15:30:33 +0200 geos (3.3.2-1) unstable; urgency=low * New upstream release. * Dropped geos-config patch, merged upstream. -- Francesco Paolo Lovergine Sun, 26 Feb 2012 23:29:37 +0100 geos (3.3.1-1) unstable; urgency=low * New upstream major release. (closes: #648611) * Changed the C/C++ chain for development. See NEWS file for an explanation. Thanks strk for a useful discussion about that. (closes: #643658) * Patches refreshed and merged with upstream changes. * Added patch geos-config to fix library paths. This is coherent with upstream approach too. * Moved the C++ headers under libgeos++-dev automagically and added a break against the old libgeos-dev all-in-one package. * The libgeos++-dev package depends on libgeos-dev for a couple of reasons: - a common header (geos/extern.h) - a program using C++ API could mixup C and C++ APIs so better being safe about that. * Merged NMU change in debian/rules to fix armhf FTBS. (closes: #641387) -- Francesco Paolo Lovergine Wed, 22 Feb 2012 14:20:57 +0100 geos (3.2.2-3) unstable; urgency=low * New patch: swig. Fixed for strong version detection in ac_pkg_swig.m4. Merged from 3.3 series. Thanks strk. (closes: #631819) * Removed obsolete python build-deps, because now the suggested binding is via shapely. (closes: #616823) -- Francesco Paolo Lovergine Mon, 18 Jul 2011 12:23:11 +0200 geos (3.2.2-2) unstable; urgency=low * Policy bumped to 3.9.2, no changes. * Fixed previous changelog entry. * Added CoordinateSequenceFactory.h patch to fix a missing declaration. (closes: #624949) * 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 Wed, 25 May 2011 15:33:37 +0200 geos (3.2.2-1) unstable; urgency=low [ Alan Boudreault ] * New upstream release. [ Francesco Paolo Lovergine ] * Policy set to 3.9.1, without changes. * Merged log for post squeeze release. * Repository moved to git and changed Vcs-* fields as required. * Source format moved to 3.0 with quilt support. * Added ${misc:Depends} to bin pkgs due to dh use. * Added -dbg package for debugging symbols. (closes: #582273) -- Francesco Paolo Lovergine Thu, 03 Mar 2011 13:40:04 +0100 geos (3.2.0-1) unstable; urgency=low * New upstream release. * Removed kobold among uploaders because no more active on DebianGIS packages. * Policy bumped to 3.8.3, without changes. * Changed a bit debian/rules to manage RC patch version. * Now, it does not install libtool helper file .la, as currently deprecated. * Revised licenses around and updated the debian/copyright file. -- Francesco Paolo Lovergine Thu, 21 Jan 2010 17:05:45 +0100 geos (3.1.1-1) unstable; urgency=low * New upstream release (bug fixes only). * Added me as an uploader. * Policy bumped to 3.8.2 (no changes). * Introduced a debian/control.in template to version automagically the C++ binding package and dependencies. -- Francesco Paolo Lovergine Fri, 26 Jun 2009 14:28:42 +0200 geos (3.1.0-1) unstable; urgency=low * New upstream release. * This version includes also a missing header inclusion, which caused FTBFS on armel. (Closes: #520447) -- Fabio Tranchitella Fri, 27 Mar 2009 15:54:54 +0100 geos (3.0.3-2) unstable; urgency=low * debian/control: do not build the python bindings, they are deprecated by upstream and superseded by python-shapely. -- Fabio Tranchitella Fri, 06 Mar 2009 13:28:29 +0100 geos (3.0.3-1) unstable; urgency=low [ Francesco Paolo Lovergine ] * New upstream release. * Updated debian/copyright adding copyright notice [lintian]. * Policy bumped to 3.8.0 (no changes) * C++ version bumped in package name. * Updated homepage fields in debian/control to reflect moving into OSGeo infrastracture. * Watch file updated. (closes: #504470) * Patch gcc43.dpatch removed, merged upstream. * Moved to debhelper level 7. * Some minor clean up in debian/rules. [ Fabio Tranchitella ] * debian/control: added libgeos-ruby1.8 and python-geos. (Closes: #509679) * debian/copyright: updated. -- Fabio Tranchitella Thu, 05 Mar 2009 20:18:57 +0100 geos (3.0.0-5) unstable; urgency=low * debian/rules: fixed a FTBFS on arm eabi; patch from Riku Voipio. (Closes: #480345) -- Fabio Tranchitella Mon, 12 May 2008 12:33:47 +0200 geos (3.0.0-4) unstable; urgency=low * [PATCH] gcc4.3.dpatch added to manage GCC 4.3 issue. (closes: #456089) -- Francesco Paolo Lovergine Thu, 10 Apr 2008 14:27:56 +0200 geos (3.0.0-3) unstable; urgency=low * debian/rules: the library itself (.so file) shouldn't be in the -dev package. (Closes: #471745) -- Fabio Tranchitella Thu, 20 Mar 2008 08:30:03 +0100 geos (3.0.0-2) unstable; urgency=low * Upload to unstable. -- Fabio Tranchitella Wed, 19 Mar 2008 19:18:41 +0100 geos (3.0.0-1) experimental; urgency=low [ Francesco Paolo Lovergine ] * Added Vcs-* fields to debian/control * Policy bumped to 3.7.3 without changes * Removed Steve Halasz among Uploaders (last contribute is almost 2 years ago). * Fixed debian/watch. (closes: #460009) * Now using ${binary:Version} instead of obsoleted ${Source-Version} [ Fabio Tranchitella ] * New upstream release. (Closes: #458893, #456089) * Renamed binary package libgeos2c2a to libgeos-3.0.0 for C++ ABI transition. -- Fabio Tranchitella Mon, 28 Jan 2008 17:42:00 +0100 geos (2.2.3-4) unstable; urgency=low [ Fabio Tranchitella ] * debian/watch: fixed. [ Paul Wise ] * Switch to the new Homepage field [ Francesco Paolo Lovergine ] * Fixed lintian error: debian-rules-ignores-make-clean-error -- Francesco Paolo Lovergine Wed, 17 Oct 2007 12:30:10 +0200 geos (2.2.3-3) unstable; urgency=low * debian/control: move doxygen from build-depends-indep to build-depends. -- Fabio Tranchitella Mon, 6 Nov 2006 21:35:52 +0100 geos (2.2.3-2) unstable; urgency=low * Upload to unstable. * debian/rules: added -V switch to dh_makeshlibs, since 2.2.3 doesn't bump the SONAME but provides new functions. Packages which depend on this version or above should have a versioned build-dependency on this release. -- Fabio Tranchitella Wed, 1 Nov 2006 08:46:54 +0100 geos (2.2.3-1) experimental; urgency=low * New upstream release. (Closes: #370498) -- Fabio Tranchitella Tue, 10 Oct 2006 19:56:09 +0200 geos (2.2.1-1) unstable; urgency=low [ Steve Halasz ] * New upstream release * Convert to team maintenance by DebianGIS group * 2.2.1 introduces a new C API in the libgeos-c1 package * Apply patch from Martin Michlmayr for FTBFS with g++ (Closes: #356111) * Don't put empty ChangeLog file in packages [ Paul Wise ] * Add homepages to the package descriptions. * Add a watchfile * Upload sponsored by Peter Reinholdtsen -- Steve Halasz Sun, 15 Jan 2006 13:53:40 +0800 geos (2.1.4-2) unstable; urgency=low * Rename to libgeos2c2a for the libstdc++ transition. Transitions are fun. Wheeeeee! -- Steve Halasz Fri, 18 Nov 2005 13:22:44 -0500 geos (2.1.4-1) unstable; urgency=low * New upstream release -- Steve Halasz Sat, 5 Nov 2005 20:15:22 -0500 geos (2.1.3-2) unstable; urgency=low * libgeos-dev should depend on libgeos2c2 rather than libgeos2 (Closes: #318990) * bump standards version to 3.6.2 -- Steve Halasz Tue, 19 Jul 2005 13:18:19 -0400 geos (2.1.3-1) unstable; urgency=low * New upstream release * Renaming libgeos2 to libgeos2c2 for C++ ABI transition * Removed cp config.{guess,sub} from clean: target and put it into configure target (change from ubuntu bug #11183) -- Steve Halasz Mon, 11 Jul 2005 11:17:32 -0400 geos (2.1.2-1) unstable; urgency=low * New upstream release -- Steve Halasz Thu, 9 Jun 2005 15:36:33 -0400 geos (2.1.1-2) unstable; urgency=low * Fix bug in isvalid(), backport from geos CVS (Closes: #303737). Thanks to Markus Shaber for the patch. -- Steve Halasz Fri, 8 Apr 2005 10:51:36 -0400 geos (2.1.1-1) unstable; urgency=low * New upstream release * Create libgeos-doc with the binary-indep target (Closes: #284361) -- Steve Halasz Wed, 9 Mar 2005 10:34:56 -0500 geos (2.0.1-1) unstable; urgency=low * Initial Release. (Closes: #277514). -- Steve Halasz Fri, 22 Oct 2004 23:24:25 -0400 debian/libgeos-c1.dirs0000644000000000000000000000001012312537734011774 0ustar usr/lib debian/libgeos-dev.dirs0000644000000000000000000000003412312537734012255 0ustar usr/bin usr/lib usr/include debian/libgeos-dev.README.Debian0000644000000000000000000000070412312537734013436 0ustar GEOS for Debian --------------- To compile programs against GEOS: CFLAGS += -I`geos-config --includes` LDFLAGS += `geos-config --libs` Headers: #include Example usage: The libgeos-doc package provides basic usage examples in /usr/share/doc/libgeos-doc/ Documentation: The libgeos-doc package provides API documentation in /usr/share/doc/libgeos-doc/ -- Steve Halasz (debian@adkgis.org), Fri, 5 Nov 2004 debian/NEWS0000644000000000000000000000167712312537734007707 0ustar geos (3.3.1-1) unstable; urgency=low GEOS provides a (stable) C API and an unstable C++ one. Most programs use the stable interface. See http://trac.osgeo.org/geos/wiki/Applications for details. Starting from this version we are trying to short the list of reverse build-deps that require erroneously linking both C/C++ and binary NMUs frequency. A program which depends on the C++ API has to b-depend on the libgeos++-dev which in turn depends on the right libgeos-VERSION lib. All other programs have to b-depend on the C libgeos-dev package, which depends strictly on the C stable interface (currently libgeos1). Note that geos-config has some problems on those regards, so current version also provides the C lib only for --clibs, with the same approach adopted by upstream. See http://trac.osgeo.org/geos/ticket/497 about that. -- Francesco Paolo Lovergine Wed, 30 Nov 2011 17:27:23 +0100 debian/libgeos-c++.dirs0000644000000000000000000000001012312537734012041 0ustar usr/lib debian/libgeos-dev.install0000644000000000000000000000015412312537734012765 0ustar usr/bin/geos-config usr/include/geos_c.h usr/include/geos/export.h usr/lib/libgeos_c.a usr/lib/libgeos_c.so debian/compat0000644000000000000000000000000212312537734010373 0ustar 8 debian/libgeos++-dev.dirs0000644000000000000000000000003112312537734012400 0ustar usr/lib usr/include/geos debian/ruby-geos.install0000644000000000000000000000003112312537734012473 0ustar usr/lib/*/*ruby/*/*/*.so debian/geos-config.10000644000000000000000000000142312312537734011457 0ustar .TH "geos-config" "1" "October 25, 2004" "geos-config" "User Commands" .SH "NAME" geos\-config \- returns information about installed GEOS libraries and binaries .SH "SYNOPSIS" .PP .B geos\-config [OPTIONS] .SH "DESCRIPTION" .PP The \fIgeos\-config\fP shell script displays configuration information for installed GEOS libraries and binaries. .SH "OPTIONS" .TP \fB\-\-prefix\fR print the prefix used by geos .TP \fB\-\-version\fR print the GEOS version .TP \fB\-\-libs\fR print the linker flags that are necessary to link to GEOS .TP \fB\-\-cflags\fR print the compiler flags that are necessary to compile a plug\-in .TP \fB\-\-includes\fR show location of C++ header files .TP \fB\-\-jtsport\fR show the version of the Java Topology Suite this version of GEOS was ported from debian/patches/0000755000000000000000000000000012312537734010624 5ustar debian/patches/TaggedLineStringSimplifier.h0000644000000000000000000000124712312537734016217 0ustar Description: Include cstddef and use std namespace. Fix a missing cstddef header file inclusion in some files and use of std namespace. This is required in current default gcc flavor. Author: Francesco Paolo Lovergine --- a/include/geos/simplify/TaggedLineStringSimplifier.h +++ b/include/geos/simplify/TaggedLineStringSimplifier.h @@ -28,6 +28,7 @@ #include #include #include +#include #ifdef _MSC_VER #pragma warning(push) @@ -53,6 +54,7 @@ namespace geos { namespace geos { namespace simplify { // geos::simplify +using namespace std; /** \brief * Simplifies a TaggedLineString, preserving topology debian/patches/geos-config0000644000000000000000000000062412312537734012751 0ustar Description: Fix library paths. Author: Francesco Paolo Lovergine --- a/tools/geos-config.in +++ b/tools/geos-config.in @@ -43,7 +43,7 @@ case $1 in --libs) # TODO: make an alias for --clibs # see http://trac.osgeo.org/geos/ticket/497 - echo -L${libdir} -lgeos + echo -L${libdir} -lgeos-@VERSION@ ;; --clibs) echo -L${libdir} -lgeos_c debian/patches/automake-am-cppflags0000644000000000000000000003571012312537734014553 0ustar Description: Rename INCLUDES to AM_CPPFLAGS. Author: Bas Couwenberg Applied-Upstream: http://trac.osgeo.org/geos/changeset/3973, http://trac.osgeo.org/geos/changeset/3974 --- a/capi/Makefile.am +++ b/capi/Makefile.am @@ -6,7 +6,7 @@ top_srcdir=@top_srcdir@ GEOS_CAPI_VERSION="@VERSION@-CAPI-@CAPI_VERSION@" GEOS_JTS_PORT="@JTS_PORT@" -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include capidir = $(includedir) @@ -21,7 +21,7 @@ DIR_SOURCES = \ $(NULL) libgeos_c_la_SOURCES = $(DIR_SOURCES) -libgeos_c_la_CPPFLAGS = -DGEOS_CAPI_VERSION='$(GEOS_CAPI_VERSION)' -DGEOS_JTS_PORT='$(GEOS_JTS_PORT)' +libgeos_c_la_CPPFLAGS = $(AM_CPPFLAGS) -DGEOS_CAPI_VERSION='$(GEOS_CAPI_VERSION)' -DGEOS_JTS_PORT='$(GEOS_JTS_PORT)' libgeos_c_la_LIBADD = $(top_builddir)/src/libgeos.la libgeos_c_la_LDFLAGS = \ -version-info @CAPI_INTERFACE_CURRENT@:@CAPI_INTERFACE_REVISION@:@CAPI_INTERFACE_AGE@ \ --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -12,7 +12,7 @@ LIBS = $(top_builddir)/src/libgeos.la example_SOURCES = example.cpp example_LDADD = $(LIBS) -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include DOXYGEN = doxygen --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ SUBDIRS = \ EXTRA_DIST = Makefile.vc dirlist.mk CMakeLists.txt info.plist.in -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libgeos.la --- a/src/algorithm/Makefile.am +++ b/src/algorithm/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = \ noinst_LTLIBRARIES = libalgorithm.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libalgorithm_la_SOURCES = \ Angle.cpp \ --- a/src/algorithm/distance/Makefile.am +++ b/src/algorithm/distance/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libdistance.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libdistance_la_SOURCES = \ DiscreteHausdorffDistance.cpp \ --- a/src/algorithm/locate/Makefile.am +++ b/src/algorithm/locate/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = liblocation.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include liblocation_la_SOURCES = \ IndexedPointInAreaLocator.cpp \ --- a/src/geom/Makefile.am +++ b/src/geom/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS=\ noinst_LTLIBRARIES = \ libgeom.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libgeom_la_SOURCES = \ Coordinate.cpp \ --- a/src/geom/prep/Makefile.am +++ b/src/geom/prep/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = libgeomprep.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include ## these are full inlined # PolygonExtracter.cpp --- a/src/geom/util/Makefile.am +++ b/src/geom/util/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = libgeomutil.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libgeomutil_la_SOURCES = \ ComponentCoordinateExtracter.cpp \ --- a/src/geomgraph/Makefile.am +++ b/src/geomgraph/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = index noinst_LTLIBRARIES = libgeomgraph.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libgeomgraph_la_SOURCES = \ Depth.cpp \ --- a/src/geomgraph/index/Makefile.am +++ b/src/geomgraph/index/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = libgeomgraphindex.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libgeomgraphindex_la_SOURCES = \ MonotoneChainEdge.cpp \ --- a/src/index/bintree/Makefile.am +++ b/src/index/bintree/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = libindexbintree.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libindexbintree_la_SOURCES = \ Bintree.cpp \ --- a/src/index/chain/Makefile.am +++ b/src/index/chain/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = libindexchain.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libindexchain_la_SOURCES = \ MonotoneChain.cpp \ --- a/src/index/intervalrtree/Makefile.am +++ b/src/index/intervalrtree/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = libintervalrtree.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libintervalrtree_la_SOURCES = \ IntervalRTreeBranchNode.cpp \ --- a/src/index/quadtree/Makefile.am +++ b/src/index/quadtree/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = libindexquadtree.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libindexquadtree_la_SOURCES = \ DoubleBits.cpp \ --- a/src/index/strtree/Makefile.am +++ b/src/index/strtree/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = libindexstrtree.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libindexstrtree_la_SOURCES = \ AbstractNode.cpp \ --- a/src/index/sweepline/Makefile.am +++ b/src/index/sweepline/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = libindexsweepline.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libindexsweepline_la_SOURCES = \ SweepLineEvent.cpp \ --- a/src/io/Makefile.am +++ b/src/io/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libio.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libio_la_SOURCES = \ ParseException.cpp \ --- a/src/linearref/Makefile.am +++ b/src/linearref/Makefile.am @@ -3,7 +3,7 @@ # noinst_LTLIBRARIES = liblinearref.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include liblinearref_la_SOURCES = \ ExtractLineByLocation.cpp \ --- a/src/noding/Makefile.am +++ b/src/noding/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = snapround noinst_LTLIBRARIES = libnoding.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libnoding_la_SOURCES = \ BasicSegmentString.cpp \ --- a/src/noding/snapround/Makefile.am +++ b/src/noding/snapround/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libsnapround.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libsnapround_la_SOURCES = \ HotPixel.cpp \ --- a/src/operation/Makefile.am +++ b/src/operation/Makefile.am @@ -15,7 +15,7 @@ SUBDIRS = \ noinst_LTLIBRARIES = liboperation.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include liboperation_la_SOURCES = \ GeometryGraphOperation.cpp \ --- a/src/operation/buffer/Makefile.am +++ b/src/operation/buffer/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libopbuffer.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libopbuffer_la_SOURCES = \ BufferBuilder.cpp \ --- a/src/operation/distance/Makefile.am +++ b/src/operation/distance/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libopdistance.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libopdistance_la_SOURCES = \ ConnectedElementLocationFilter.cpp \ --- a/src/operation/linemerge/Makefile.am +++ b/src/operation/linemerge/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = liboplinemerge.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include liboplinemerge_la_SOURCES = \ EdgeString.cpp \ --- a/src/operation/overlay/Makefile.am +++ b/src/operation/overlay/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS = noinst_LTLIBRARIES = libopoverlay.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libopoverlay_la_SOURCES = \ EdgeSetNoder.cpp \ --- a/src/operation/polygonize/Makefile.am +++ b/src/operation/polygonize/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = liboppolygonize.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include liboppolygonize_la_SOURCES = \ PolygonizeDirectedEdge.cpp \ --- a/src/operation/predicate/Makefile.am +++ b/src/operation/predicate/Makefile.am @@ -6,7 +6,7 @@ noinst_LTLIBRARIES = liboppredicate.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include liboppredicate_la_SOURCES = \ RectangleIntersects.cpp \ --- a/src/operation/relate/Makefile.am +++ b/src/operation/relate/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = liboprelate.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include liboprelate_la_SOURCES = \ EdgeEndBuilder.cpp \ --- a/src/operation/sharedpaths/Makefile.am +++ b/src/operation/sharedpaths/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libopsharedpaths.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libopsharedpaths_la_SOURCES = \ SharedPathsOp.cpp --- a/src/operation/union/Makefile.am +++ b/src/operation/union/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libopunion.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libopunion_la_SOURCES = \ CascadedPolygonUnion.cpp \ --- a/src/operation/valid/Makefile.am +++ b/src/operation/valid/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libopvalid.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include # NOTES: # --- a/src/planargraph/Makefile.am +++ b/src/planargraph/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS = noinst_LTLIBRARIES = libplanargraph.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libplanargraph_la_SOURCES = \ DirectedEdge.cpp \ --- a/src/precision/Makefile.am +++ b/src/precision/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libprecision.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libprecision_la_SOURCES = \ CommonBits.cpp \ --- a/src/simplify/Makefile.am +++ b/src/simplify/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libsimplify.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libsimplify_la_SOURCES = \ DouglasPeuckerLineSimplifier.cpp \ --- a/src/triangulate/Makefile.am +++ b/src/triangulate/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = \ noinst_LTLIBRARIES = libtriangulate.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libtriangulate_la_SOURCES = \ IncrementalDelaunayTriangulator.cpp \ --- a/src/triangulate/quadedge/Makefile.am +++ b/src/triangulate/quadedge/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libquadedge.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libquadedge_la_SOURCES = \ QuadEdge.cpp \ --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = noinst_LTLIBRARIES = libutil.la -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include libutil_la_SOURCES = \ Assert.cpp \ --- a/swig/ruby/Makefile.am +++ b/swig/ruby/Makefile.am @@ -17,7 +17,7 @@ BUILT_SOURCES = geos_wrap.cxx rubyextensiondirdir = $(RUBY_EXTENSION_DIR) # Setup includes -INCLUDES = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH) +AM_CPPFLAGS = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH) # Build Ruby module as shared library rubyextensiondir_LTLIBRARIES = geos.la @@ -25,7 +25,7 @@ geos_la_SOURCES = geos_wrap.cxx geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME) # Only need to grab the capi header files -geos_la_CPPFLAGS = -I$(top_builddir)/capi +geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi # Specify -module and -avoid-version so we can create a file called geos.dll/so which is what Ruby wants geos_la_LDFLAGS = -no-undefined -module -avoid-version -L$(RUBY_LIB_DIR) --- a/tests/bigtest/Makefile.am +++ b/tests/bigtest/Makefile.am @@ -17,8 +17,8 @@ TestSweepLineSpeed_LDADD = $(LIBS) bug234_SOURCES = bug234.cpp bug234_LDADD = $(LIBS) -INCLUDES = -I$(top_srcdir)/include -INCLUDES += -I$(top_srcdir)/src/io/markup +AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup EXTRA_DIST = CMakeLists.txt --- a/tests/geostest/Makefile.am +++ b/tests/geostest/Makefile.am @@ -1,7 +1,7 @@ # # This file is part of project GEOS (http://trac.osgeo.org/geos/) # -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi EXTRA_DIST = \ brokengrammar \ --- a/tests/perf/Makefile.am +++ b/tests/perf/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = \ operation \ capi -INCLUDES = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include noinst_PROGRAMS = ClassSizes --- a/tests/perf/capi/Makefile.am +++ b/tests/perf/capi/Makefile.am @@ -9,7 +9,7 @@ top_builddir=@top_builddir@ check_PROGRAMS = memleak_mp_prep LIBS = $(top_builddir)/capi/libgeos_c.la -INCLUDES = -I$(top_builddir)/capi -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include memleak_mp_prep_SOURCES = memleak_mp_prep.c memleak_mp_prep_LDADD = $(LIBS) --- a/tests/perf/operation/buffer/Makefile.am +++ b/tests/perf/operation/buffer/Makefile.am @@ -12,5 +12,5 @@ LIBS = $(top_builddir)/src/libgeos.la IteratedBufferStressTest_SOURCES = IteratedBufferStressTest.cpp IteratedBufferStressTest_LDADD = $(LIBS) -INCLUDES = -I$(top_srcdir)/include -INCLUDES += -I$(top_srcdir)/src/io/markup +AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup --- a/tests/perf/operation/predicate/Makefile.am +++ b/tests/perf/operation/predicate/Makefile.am @@ -12,5 +12,5 @@ LIBS = $(top_builddir)/src/libgeos.la RectangleIntersectsPerfTest_SOURCES = RectangleIntersectsPerfTest.cpp RectangleIntersectsPerfTest_LDADD = $(LIBS) -INCLUDES = -I$(top_srcdir)/include -INCLUDES += -I$(top_srcdir)/src/io/markup +AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup --- a/tests/thread/Makefile.am +++ b/tests/thread/Makefile.am @@ -1,7 +1,7 @@ # # This file is part of project GEOS (http://trac.osgeo.org/geos/) # -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi # TODO: Enable if sample input WKT file is provided #TESTS = threadtest badthreadtest --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi TESTS = geos_unit --- a/tests/xmltester/Makefile.am +++ b/tests/xmltester/Makefile.am @@ -134,8 +134,8 @@ XMLTester_LDADD = $(LIBS) # See http://trac.osgeo.org/geos/ticket/319 XMLTester_CXXFLAGS = $(INLINE_FLAGS) -INCLUDES = -I$(top_srcdir)/include -INCLUDES += -I$(top_srcdir)/src/io/tinyxml -DTIXML_USE_STL +AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/src/io/tinyxml -DTIXML_USE_STL static: $(CXX) $(CXXFLAGS) -I../include -o staticXMLTester XMLTester.cpp MarkupSTL.o ../../src/geom/.libs/libgeos.a debian/patches/DirectedEdgeStar.h0000644000000000000000000000131512312537734014137 0ustar Description: Include cstddef and use std namespace. Fix a missing cstddef header file inclusion in some files and use of std namespace. This is required in current default gcc flavor. Author: Francesco Paolo Lovergine --- a/include/geos/planargraph/DirectedEdgeStar.h +++ b/include/geos/planargraph/DirectedEdgeStar.h @@ -19,6 +19,7 @@ #include #include +#include #ifdef _MSC_VER #pragma warning(push) @@ -39,6 +40,8 @@ namespace geos { 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: debian/patches/TaggedLineString.cpp0000644000000000000000000000125212312537734014522 0ustar Description: Include cstddef and use std namespace. Fix a missing cstddef header file inclusion in some files and use of std namespace. This is required in current default gcc flavor. Author: Francesco Paolo Lovergine --- a/src/simplify/TaggedLineString.cpp +++ b/src/simplify/TaggedLineString.cpp @@ -26,6 +26,7 @@ #include #include +#include #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 @@ -41,6 +42,8 @@ using namespace std; namespace geos { namespace simplify { // geos::simplify +using namespace std; + /*public*/ TaggedLineString::TaggedLineString(const geom::LineString* nParentLine, std::size_t nMinimumSize) debian/patches/SimpleNestedRingTester.h0000644000000000000000000000137512312537734015406 0ustar Description: Include cstddef and use std namespace. Fix a missing cstddef header file inclusion in some files and use of std namespace. This is required in current default gcc flavor. Author: Francesco Paolo Lovergine --- a/include/geos/operation/valid/SimpleNestedRingTester.h +++ b/include/geos/operation/valid/SimpleNestedRingTester.h @@ -24,6 +24,7 @@ #include #include +#include #ifdef _MSC_VER #pragma warning(push) @@ -45,6 +46,8 @@ namespace geos { namespace operation { // geos::operation namespace valid { // geos::operation::valid +using namespace std; + /** \brief * Tests whether any of a set of {@link LinearRing}s are * nested inside another ring in the set, using a simple O(n^2) debian/patches/TaggedLineString.h0000644000000000000000000000114612312537734014171 0ustar Description: Include cstddef and use std namespace. Fix a missing cstddef header file inclusion in some files and use of std namespace. This is required in current default gcc flavor. Author: Francesco Paolo Lovergine --- a/include/geos/simplify/TaggedLineString.h +++ b/include/geos/simplify/TaggedLineString.h @@ -28,6 +28,7 @@ #include #include #include +#include #ifdef _MSC_VER #pragma warning(push) @@ -51,6 +52,7 @@ namespace geos { namespace geos { namespace simplify { // geos::simplify +using namespace std; /** \brief * debian/patches/Root.cpp0000644000000000000000000000201712312537734012253 0ustar Description: Include cstddef and use std namespace. Fix a missing cstddef header file inclusion in some files and use of std namespace. This is required in current default gcc flavor. Author: Francesco Paolo Lovergine --- a/src/index/bintree/Root.cpp +++ b/src/index/bintree/Root.cpp @@ -20,11 +20,14 @@ #include #include +#include namespace geos { namespace index { // geos.index namespace bintree { // geos.index.bintree +using namespace std; + double Root::origin=0.0; void --- a/src/index/quadtree/Root.cpp +++ b/src/index/quadtree/Root.cpp @@ -24,6 +24,7 @@ #include #include +#include #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 @@ -39,6 +40,8 @@ namespace geos { namespace index { // geos.index namespace quadtree { // geos.index.quadtree +using namespace std; + // the singleton root quad is centred at the origin. //Coordinate* Root::origin=new Coordinate(0.0, 0.0); const Coordinate Root::origin(0.0, 0.0); debian/patches/Node.cpp0000644000000000000000000000301712312537734012216 0ustar Description: Include cstddef and use std namespace. Fix a missing cstddef header file inclusion in some files and use of std namespace. This is required in current default gcc flavor. Author: Francesco Paolo Lovergine --- a/src/index/bintree/Node.cpp +++ b/src/index/bintree/Node.cpp @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -24,6 +25,8 @@ namespace geos { namespace index { // geos.index namespace bintree { // geos.index.bintree +using namespace std; + Node* Node::createNode(Interval *itemInterval) { --- a/src/geomgraph/Node.cpp +++ b/src/geomgraph/Node.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 @@ -41,12 +42,13 @@ #define COMPUTE_Z 1 #endif -using namespace std; using namespace geos::geom; namespace geos { namespace geomgraph { // geos.geomgraph +using namespace std; + /*public*/ Node::Node(const Coordinate& newCoord, EdgeEndStar* newEdges) : --- a/src/index/quadtree/Node.cpp +++ b/src/index/quadtree/Node.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 @@ -40,6 +41,8 @@ namespace geos { namespace index { // geos.index namespace quadtree { // geos.index.quadtree +using namespace std; + /* public static */ std::auto_ptr Node::createNode(const Envelope& env) debian/patches/configure.ac0000644000000000000000000010072612312537734013120 0ustar Description: Rename configure.in to configure.ac. Author: Bas Couwenberg Applied-Upstream: http://trac.osgeo.org/geos/changeset/3972 Bug: trac.osgeo.org/geos/ticket/683 --- /dev/null +++ b/configure.ac @@ -0,0 +1,537 @@ +dnl +dnl configure.in - autoconf input template to produce ./configure script +dnl +dnl version 2.52 is required for Cygwin libtool support +AC_PREREQ([2.52]) + +dnl local vars to hold user's preferences -------------------------------- +AC_INIT([include/geos.h]) +AC_CANONICAL_SYSTEM + +AC_CONFIG_MACRO_DIR([macros]) + +dnl -- JTS_PORT: the version of JTS this release is bound to +JTS_PORT=1.12.0 + +dnl -- Version info for the CAPI +CAPI_INTERFACE_CURRENT=9 +CAPI_INTERFACE_REVISION=2 +CAPI_INTERFACE_AGE=8 + +dnl +dnl -- Release versions / C++ library SONAME will use these +dnl -- encoding ABI break at every release +dnl +VERSION_MAJOR=3 +VERSION_MINOR=4 +VERSION_PATCH=2 +VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH" + +dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE)) +dnl the following should be more portable +CAPI_VERSION_MAJOR=`expr $CAPI_INTERFACE_CURRENT - $CAPI_INTERFACE_AGE` +CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE +CAPI_VERSION_PATCH=$CAPI_INTERFACE_REVISION +CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH" + +AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define]) +AM_MAINTAINER_MODE +AC_CONFIG_HEADERS([include/config.h] [include/geos/platform.h]) +AC_PROG_CC + +dnl use libtool ---------------------------------------------------------- +AC_LIBTOOL_DLOPEN +AC_LIBTOOL_WIN32_DLL +AC_PROG_LIBTOOL + +dnl check for programs ---------------------------------------------------- +AC_PROG_CXX +AC_ISC_POSIX +AC_PROG_INSTALL +AC_PROG_MAKE_SET + +dnl function checks ------------------------------------------------------ +AC_FUNC_CLOSEDIR_VOID +AC_FUNC_MEMCMP +AC_FUNC_STRFTIME +AC_FUNC_VPRINTF +AC_FUNC_ALLOCA +AC_HEADER_DIRENT +AC_HEADER_STDC +AC_CHECK_HEADERS([memory.h]) +AC_CHECK_HEADERS([unistd.h]) +AC_CHECK_HEADERS([ieeefp.h]) +AC_CHECK_HEADERS([sys/file.h]) +AC_CHECK_HEADERS([sys/time.h]) +AC_CHECK_FUNCS([strchr memcpy gettimeofday]) +AC_HEADER_STAT +AC_STRUCT_TM +AC_TYPE_SIZE_T +AC_C_CONST + +dnl -------------------------------------------------------------------- +dnl - Check for inline and cassert settings +dnl -------------------------------------------------------------------- + + +AC_ARG_ENABLE([inline], [ --disable-inline Disable inlining], + [case "${enableval}" in + yes) enable_inline=true ;; + no) enable_inline=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-inline);; + esac], + [enable_inline=true] +) + +AC_ARG_ENABLE([cassert], [ --disable-cassert Disable assertion checking], + [case "${enableval}" in + yes) enable_cassert=true ;; + no) enable_cassert=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-cassert);; + esac], + [enable_cassert=true] +) + +AC_ARG_ENABLE([glibcxx-debug], [ --enable-glibcxx-debug Enable libstdc++ debug mode], + [case "${enableval}" in + yes) enable_glibcxx_debug=true ;; + no) enable_glibcxx_debug=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-glibcxx-debug);; + esac], + [enable_glibcxx_debug=false] +) + + +AC_MSG_CHECKING([if requested to force inline functions]) +INLINE_FLAGS= +AC_SUBST(INLINE_FLAGS) +if test x"$enable_inline" = xtrue; then + INLINE_FLAGS="-DGEOS_INLINE" + AM_CXXFLAGS="$AM_CXXFLAGS $INLINE_FLAGS" + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi + +AC_MSG_CHECKING([if requested to enable assert macros]) +if test x"$enable_cassert" = xfalse; then + AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG" + AC_MSG_RESULT([no]) +else + AC_MSG_RESULT([yes]) +fi + +AC_MSG_CHECKING([if requested libstdc++ debug mode]) +if test x"$enable_glibcxx_debug" = xtrue; then + AM_CXXFLAGS="$AM_CXXFLAGS -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_DEBUG_PEDANTIC=1" + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi + +dnl -------------------------------------------------------------------- +dnl - Append default C++ and C flags +dnl -------------------------------------------------------------------- + +dnl In order for AC_LIBTOOL_COMPILER_OPTION to use +dnl the C compiler we need the hack below. +dnl It is likely a bug in the libtool macro file to +dnl require AC_LIBTOOL_LANG_CXX_CONFIG in *addition* +dnl to AC_LANG(CXX) or AC_LANG_PUSH(CXX)/AC_LANG_POP() +dnl +AC_LIBTOOL_LANG_CXX_CONFIG + +# Set default AM_CXXFLAGS and AM_CFLAGS +# -pedantic: ISO does not support long long +# we add -Wno-long-long to avoid those messages +WARNFLAGS="" +AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -pedantic], [dummy_cv_pedantic], [-pedantic], [], [WARNFLAGS="$WARNFLAGS -pedantic"], []) +AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wall], [dummy_cv_wall], [-Wall], [], [WARNFLAGS="$WARNFLAGS -Wall"], []) +AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ansi], [dummy_cv_ansi], [-ansi], [], [WARNFLAGS="$WARNFLAGS -ansi"], []) +AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wno-long-long], [dummy_cv_no_long_long], [-Wno-long-long], [], [WARNFLAGS="$WARNFLAGS -Wno-long-long"], []) + +# To make numerical computation more stable, we use --ffloat-store +NUMERICFLAGS="" +AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ffloat-store], [dummy_cv_ffloat_store], [-ffloat-store], [], [NUMERICFLAGS="$NUMERICFLAGS -ffloat-store"], []) + +DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS}" + +AM_CXXFLAGS="${AM_CXXFLAGS} ${DEFAULTFLAGS}" +AM_CFLAGS="${AM_CFLAGS} ${DEFAULTFLAGS}" +AC_SUBST(AM_CXXFLAGS) +AC_SUBST(AM_CFLAGS) + +dnl -------------------------------------------------------------------- +dnl - Look for finite and/or isfinite macros/functions +dnl -------------------------------------------------------------------- + +dnl These two tests need the math library or they won't link +dnl on OpenBSD, even if the functions exist. +save_LIBS=$LIBS +LIBS="$LIBS -lm" +AC_CACHE_CHECK([for finite], ac_cv_finite, + [AC_TRY_LINK([#include ], + [double x; int y; y = finite(x);], + ac_cv_finite=yes, + ac_cv_finite=no +)]) +if test x"$ac_cv_finite" = x"yes"; then + AC_DEFINE(HAVE_FINITE, [1], [Has finite]) +fi + +AC_CACHE_CHECK([for isfinite], ac_cv_isfinite, + [AC_TRY_LINK([#include ], + [double x; int y; y = isfinite(x);], + ac_cv_isfinite=yes, + ac_cv_isfinite=no +)]) +if test x"$ac_cv_isfinite" = x"yes"; then + AC_DEFINE(HAVE_ISFINITE, [1], [Has isfinite]) +fi + +dnl -------------------------------------------------------------------- +dnl Test for presence of isnan function when using C++ and +dnl This is for a particular bug in OS/X where drops the definition +dnl of isnan(). + +AC_LANG_PUSH([C++]) +AC_CACHE_CHECK([for isnan], ac_cv_isnan, + [AC_TRY_LINK([#include ], + [double x; int y; y = isnan(x);], + ac_cv_isnan=yes, + ac_cv_isnan=no +)]) +if test x"$ac_cv_isnan" = x"yes"; then + AC_DEFINE(HAVE_ISNAN, [1], [Has isnan]) +fi +AC_LANG_POP([C++]) + +dnl -------------------------------------------------------------------- + +LIBS=$save_LIBS + +dnl -------------------------------------------------------------------- +dnl - Look for a 64bit integer (do after CFLAGS is set) +dnl -------------------------------------------------------------------- + +dnl Find a working 64bit integer +PGAC_TYPE_64BIT_INT([int64_t]) +if test x"$HAVE_INT64_T_64" = x"no" ; then + PGAC_TYPE_64BIT_INT([long int]) + if test x"$HAVE_LONG_INT_64" = x"no" ; then + PGAC_TYPE_64BIT_INT([long long int]) + if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then + AC_MSG_WARN([Could not find a working 64bit int type, you may experience weird bugs (undefined behaviour)]); + fi + fi +fi + + + +dnl -------------------------------------------------------------------- +dnl - check whether python is required for the build +dnl -------------------------------------------------------------------- + +AC_ARG_ENABLE([python], [ --enable-python Enable build of python module], + [case "${enableval}" in + yes) use_python=true ;; + no) use_python=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;; + esac], + [use_python=false] +) + + +dnl -------------------------------------------------------------------- +dnl - check whether ruby is required for the build +dnl -------------------------------------------------------------------- + +AC_ARG_ENABLE([ruby], [ --enable-ruby Enable build of ruby module], + [case "${enableval}" in + yes) use_ruby=true ;; + no) use_ruby=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-ruby) ;; + esac], + [use_ruby=false] +) + +dnl -------------------------------------------------------------------- +dnl - check whether php is required for the build +dnl -------------------------------------------------------------------- + +AC_ARG_ENABLE([php], [ --enable-php Enable build of php module], + [case "${enableval}" in + yes) use_php=true ;; + no) use_php=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-php) ;; + esac], + [use_php=false] +) + + +dnl -------------------------------------------------------------------- +dnl - check for swig if python, ruby or php are enabled +dnl -------------------------------------------------------------------- + +use_swig=false +if test x"$use_python" = xtrue || + test x"$use_ruby" = xtrue; then + AC_PROG_SWIG(1.3.28) + if test x"$SWIG" != "x"; then + SWIG_ENABLE_CXX + AC_SUBST(SWIG) + + use_swig=true + fi +fi +AM_CONDITIONAL(ENABLE_SWIG, [ test x"$use_swig" = xtrue ]) + + +dnl -------------------------------------------------------------------- +dnl - check for python if enabled +dnl -------------------------------------------------------------------- + +if test x"$use_python" = xtrue; then + dnl Check for Python + AM_PATH_PYTHON + SWIG_PYTHON + + if test x"$PYTHON" = "x"; then + use_python=false + fi + + AC_SUBST(PYTHON) + AC_SUBST(SWIG_PYTHON_CPPFLAGS) + AC_SUBST(SWIG_PYTHON_OPT) +fi +AM_CONDITIONAL(ENABLE_PYTHON, [test x"$use_python" = xtrue]) + + +dnl -------------------------------------------------------------------- +dnl - check for ruby if enabled +dnl -------------------------------------------------------------------- + +if test x"$use_ruby" = xtrue; then + dnl Check for Ruby + AC_RUBY_DEVEL + + if test x"$RUBY" = x; then + use_ruby=false + fi + +fi +AM_CONDITIONAL(ENABLE_RUBY, [ test x"$use_ruby" = xtrue ]) + +dnl -------------------------------------------------------------------- +dnl - check for php if enabled +dnl -------------------------------------------------------------------- + +if test x"$use_php" = xtrue; then + dnl Check for PHP + AC_PATH_PROG(PHP_CONFIG, php-config) + + if test x"$PHP_CONFIG" = x; then + AC_MSG_WARN([php-config not found, php support disabled]) + use_php=false + else + + dnl TODO: check for version, we want PHP5 dev files + + AC_PATH_PROG(PHP, php) dnl for unit testing + AC_PATH_PROG(PHPUNIT, phpunit) dnl for unit testing + fi + + +fi +AM_CONDITIONAL(ENABLE_PHP, [ test x"$use_php" = xtrue ]) +AM_CONDITIONAL(HAVE_PHP, [ test x"$PHP" != x ]) +AM_CONDITIONAL(HAVE_PHP_UNIT, [ test x"$PHPUNIT" != x ]) + + +dnl -------------------------------------------------------------------- +dnl - do operating-system specific things +dnl -------------------------------------------------------------------- + +AC_MSG_CHECKING([OS-specific settings]) + +case "${host_os}" in + *darwin*) + AC_MSG_RESULT([${host_os}]) + AC_MSG_CHECKING([for OS/X version]) + kernel=`uname -r` + + # "Darwin 9.6.0" is Mac OSX 10.5.6 + # "Darwin 10.x" would presumably be Mac OS X 10.6.x + case "${kernel}" in + 8.*) + AC_MSG_RESULT([Mac OS X 10.4 Tiger]) + ;; + 9.*) + AC_MSG_RESULT([Mac OS X 10.5 Leopard]) + ;; + 10.*) +dnl AM_CXXFLAGS="$AM_CXXFLAGS -Wnon-virtual-dtor -Woverloaded-virtual" + AC_MSG_RESULT([Mac OS X 10.6 Snow Leopard]) + ;; + *) + AC_MSG_RESULT([Mac OS X (Darwin ${kernel} kernel)]) + ;; + esac + ;; +esac + +dnl -------------------------------------------------------------------- +dnl - check for boost +dnl -------------------------------------------------------------------- + +dnl -- AX_BOOST(1.32) +dnl -- if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then +dnl -- use_boost_utf=yes +dnl -- else +dnl -- use_boost_utf=no +dnl -- fi +dnl -- AM_CONDITIONAL(ENABLE_BOOST_UTF, [test "x$use_boost_utf" = "xyes"]) + +dnl things to substitute in output ---------------------------------------- +AC_SUBST(VERSION) +AC_SUBST(VERSION_MAJOR) +AC_SUBST(VERSION_MINOR) +AC_SUBST(VERSION_PATCH) +AC_SUBST(INTERFACE_CURRENT) +AC_SUBST(INTERFACE_REVISION) +AC_SUBST(INTERFACE_AGE) +AC_SUBST(JTS_PORT) +AC_SUBST(CAPI_VERSION) +AC_SUBST(CAPI_VERSION_MAJOR) +AC_SUBST(CAPI_VERSION_MINOR) +AC_SUBST(CAPI_VERSION_PATCH) +AC_SUBST(CAPI_INTERFACE_CURRENT) +AC_SUBST(CAPI_INTERFACE_REVISION) +AC_SUBST(CAPI_INTERFACE_AGE) + +dnl output stuff ---------------------------------------------------------- + +AC_OUTPUT([ + Makefile + capi/Makefile + capi/geos_c.h + doc/Doxyfile + doc/Makefile + macros/Makefile + src/Makefile + src/algorithm/Makefile + src/algorithm/locate/Makefile + src/algorithm/distance/Makefile + src/geom/Makefile + src/geom/prep/Makefile + src/geom/util/Makefile + src/geomgraph/Makefile + src/geomgraph/index/Makefile + include/Makefile + include/geos/Makefile + include/geos/algorithm/Makefile + include/geos/algorithm/locate/Makefile + include/geos/algorithm/distance/Makefile + include/geos/geom/Makefile + include/geos/geom/prep/Makefile + include/geos/geom/util/Makefile + include/geos/geomgraph/Makefile + include/geos/geomgraph/index/Makefile + include/geos/index/Makefile + include/geos/index/bintree/Makefile + include/geos/index/chain/Makefile + include/geos/index/intervalrtree/Makefile + include/geos/index/quadtree/Makefile + include/geos/index/strtree/Makefile + include/geos/index/sweepline/Makefile + include/geos/io/Makefile + include/geos/linearref/Makefile + include/geos/noding/Makefile + include/geos/noding/snapround/Makefile + include/geos/operation/Makefile + include/geos/operation/buffer/Makefile + include/geos/operation/distance/Makefile + include/geos/operation/linemerge/Makefile + include/geos/operation/overlay/Makefile + include/geos/operation/overlay/snap/Makefile + include/geos/operation/polygonize/Makefile + include/geos/operation/predicate/Makefile + include/geos/operation/relate/Makefile + include/geos/operation/sharedpaths/Makefile + include/geos/operation/union/Makefile + include/geos/operation/valid/Makefile + include/geos/planargraph/Makefile + include/geos/planargraph/algorithm/Makefile + include/geos/precision/Makefile + include/geos/simplify/Makefile + include/geos/triangulate/Makefile + include/geos/triangulate/quadedge/Makefile + include/geos/util/Makefile + include/geos/version.h + src/index/Makefile + src/index/bintree/Makefile + src/index/chain/Makefile + src/index/intervalrtree/Makefile + src/index/quadtree/Makefile + src/index/strtree/Makefile + src/index/sweepline/Makefile + src/io/Makefile + src/linearref/Makefile + src/noding/Makefile + src/noding/snapround/Makefile + src/operation/Makefile + src/operation/buffer/Makefile + src/operation/distance/Makefile + src/operation/linemerge/Makefile + src/operation/overlay/Makefile + src/operation/polygonize/Makefile + src/operation/predicate/Makefile + src/operation/relate/Makefile + src/operation/sharedpaths/Makefile + src/operation/union/Makefile + src/operation/valid/Makefile + src/planargraph/Makefile + src/precision/Makefile + src/simplify/Makefile + src/triangulate/Makefile + src/triangulate/quadedge/Makefile + src/util/Makefile + swig/geos.i + swig/Makefile + swig/python/Makefile + swig/python/tests/Makefile + swig/ruby/Makefile + swig/ruby/test/Makefile + php/Makefile + php/test/Makefile + tests/Makefile + tests/bigtest/Makefile + tests/unit/Makefile + tests/perf/Makefile + tests/perf/operation/Makefile + tests/perf/operation/buffer/Makefile + tests/perf/operation/predicate/Makefile + tests/perf/capi/Makefile + tests/xmltester/Makefile + tests/geostest/Makefile + tests/thread/Makefile + tools/Makefile + tools/geos-config + ]) + +dnl -- echo "---------------------------------------" +dnl -- echo "Boost UTF: $use_boost_utf" +echo "Swig: $use_swig" +echo "Python bindings: $use_python" +echo "Ruby bindings: $use_ruby" + +echo "PHP bindings: $use_php" +if test x"$use_php" = xtrue; then + echo " PHP: $PHP" + echo " PHPUNIT: $PHPUNIT" + if test x"$PHP" = x -o x"$PHPUNIT" = x; then + AC_MSG_WARN([PHP Unit testing disabled (missing PHP or PHPUNIT)]) + fi +fi + +dnl -- echo "---------------------------------------" --- a/configure.in +++ /dev/null @@ -1,537 +0,0 @@ -dnl -dnl configure.in - autoconf input template to produce ./configure script -dnl -dnl version 2.52 is required for Cygwin libtool support -AC_PREREQ([2.52]) - -dnl local vars to hold user's preferences -------------------------------- -AC_INIT([include/geos.h]) -AC_CANONICAL_SYSTEM - -AC_CONFIG_MACRO_DIR([macros]) - -dnl -- JTS_PORT: the version of JTS this release is bound to -JTS_PORT=1.12.0 - -dnl -- Version info for the CAPI -CAPI_INTERFACE_CURRENT=9 -CAPI_INTERFACE_REVISION=2 -CAPI_INTERFACE_AGE=8 - -dnl -dnl -- Release versions / C++ library SONAME will use these -dnl -- encoding ABI break at every release -dnl -VERSION_MAJOR=3 -VERSION_MINOR=4 -VERSION_PATCH=2 -VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH" - -dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE)) -dnl the following should be more portable -CAPI_VERSION_MAJOR=`expr $CAPI_INTERFACE_CURRENT - $CAPI_INTERFACE_AGE` -CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE -CAPI_VERSION_PATCH=$CAPI_INTERFACE_REVISION -CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH" - -AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define]) -AM_MAINTAINER_MODE -AC_CONFIG_HEADERS([include/config.h] [include/geos/platform.h]) -AC_PROG_CC - -dnl use libtool ---------------------------------------------------------- -AC_LIBTOOL_DLOPEN -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL - -dnl check for programs ---------------------------------------------------- -AC_PROG_CXX -AC_ISC_POSIX -AC_PROG_INSTALL -AC_PROG_MAKE_SET - -dnl function checks ------------------------------------------------------ -AC_FUNC_CLOSEDIR_VOID -AC_FUNC_MEMCMP -AC_FUNC_STRFTIME -AC_FUNC_VPRINTF -AC_FUNC_ALLOCA -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_CHECK_HEADERS([memory.h]) -AC_CHECK_HEADERS([unistd.h]) -AC_CHECK_HEADERS([ieeefp.h]) -AC_CHECK_HEADERS([sys/file.h]) -AC_CHECK_HEADERS([sys/time.h]) -AC_CHECK_FUNCS([strchr memcpy gettimeofday]) -AC_HEADER_STAT -AC_STRUCT_TM -AC_TYPE_SIZE_T -AC_C_CONST - -dnl -------------------------------------------------------------------- -dnl - Check for inline and cassert settings -dnl -------------------------------------------------------------------- - - -AC_ARG_ENABLE([inline], [ --disable-inline Disable inlining], - [case "${enableval}" in - yes) enable_inline=true ;; - no) enable_inline=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-inline);; - esac], - [enable_inline=true] -) - -AC_ARG_ENABLE([cassert], [ --disable-cassert Disable assertion checking], - [case "${enableval}" in - yes) enable_cassert=true ;; - no) enable_cassert=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-cassert);; - esac], - [enable_cassert=true] -) - -AC_ARG_ENABLE([glibcxx-debug], [ --enable-glibcxx-debug Enable libstdc++ debug mode], - [case "${enableval}" in - yes) enable_glibcxx_debug=true ;; - no) enable_glibcxx_debug=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-glibcxx-debug);; - esac], - [enable_glibcxx_debug=false] -) - - -AC_MSG_CHECKING([if requested to force inline functions]) -INLINE_FLAGS= -AC_SUBST(INLINE_FLAGS) -if test x"$enable_inline" = xtrue; then - INLINE_FLAGS="-DGEOS_INLINE" - AM_CXXFLAGS="$AM_CXXFLAGS $INLINE_FLAGS" - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -AC_MSG_CHECKING([if requested to enable assert macros]) -if test x"$enable_cassert" = xfalse; then - AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG" - AC_MSG_RESULT([no]) -else - AC_MSG_RESULT([yes]) -fi - -AC_MSG_CHECKING([if requested libstdc++ debug mode]) -if test x"$enable_glibcxx_debug" = xtrue; then - AM_CXXFLAGS="$AM_CXXFLAGS -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_DEBUG_PEDANTIC=1" - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -dnl -------------------------------------------------------------------- -dnl - Append default C++ and C flags -dnl -------------------------------------------------------------------- - -dnl In order for AC_LIBTOOL_COMPILER_OPTION to use -dnl the C compiler we need the hack below. -dnl It is likely a bug in the libtool macro file to -dnl require AC_LIBTOOL_LANG_CXX_CONFIG in *addition* -dnl to AC_LANG(CXX) or AC_LANG_PUSH(CXX)/AC_LANG_POP() -dnl -AC_LIBTOOL_LANG_CXX_CONFIG - -# Set default AM_CXXFLAGS and AM_CFLAGS -# -pedantic: ISO does not support long long -# we add -Wno-long-long to avoid those messages -WARNFLAGS="" -AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -pedantic], [dummy_cv_pedantic], [-pedantic], [], [WARNFLAGS="$WARNFLAGS -pedantic"], []) -AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wall], [dummy_cv_wall], [-Wall], [], [WARNFLAGS="$WARNFLAGS -Wall"], []) -AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ansi], [dummy_cv_ansi], [-ansi], [], [WARNFLAGS="$WARNFLAGS -ansi"], []) -AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wno-long-long], [dummy_cv_no_long_long], [-Wno-long-long], [], [WARNFLAGS="$WARNFLAGS -Wno-long-long"], []) - -# To make numerical computation more stable, we use --ffloat-store -NUMERICFLAGS="" -AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ffloat-store], [dummy_cv_ffloat_store], [-ffloat-store], [], [NUMERICFLAGS="$NUMERICFLAGS -ffloat-store"], []) - -DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS}" - -AM_CXXFLAGS="${AM_CXXFLAGS} ${DEFAULTFLAGS}" -AM_CFLAGS="${AM_CFLAGS} ${DEFAULTFLAGS}" -AC_SUBST(AM_CXXFLAGS) -AC_SUBST(AM_CFLAGS) - -dnl -------------------------------------------------------------------- -dnl - Look for finite and/or isfinite macros/functions -dnl -------------------------------------------------------------------- - -dnl These two tests need the math library or they won't link -dnl on OpenBSD, even if the functions exist. -save_LIBS=$LIBS -LIBS="$LIBS -lm" -AC_CACHE_CHECK([for finite], ac_cv_finite, - [AC_TRY_LINK([#include ], - [double x; int y; y = finite(x);], - ac_cv_finite=yes, - ac_cv_finite=no -)]) -if test x"$ac_cv_finite" = x"yes"; then - AC_DEFINE(HAVE_FINITE, [1], [Has finite]) -fi - -AC_CACHE_CHECK([for isfinite], ac_cv_isfinite, - [AC_TRY_LINK([#include ], - [double x; int y; y = isfinite(x);], - ac_cv_isfinite=yes, - ac_cv_isfinite=no -)]) -if test x"$ac_cv_isfinite" = x"yes"; then - AC_DEFINE(HAVE_ISFINITE, [1], [Has isfinite]) -fi - -dnl -------------------------------------------------------------------- -dnl Test for presence of isnan function when using C++ and -dnl This is for a particular bug in OS/X where drops the definition -dnl of isnan(). - -AC_LANG_PUSH([C++]) -AC_CACHE_CHECK([for isnan], ac_cv_isnan, - [AC_TRY_LINK([#include ], - [double x; int y; y = isnan(x);], - ac_cv_isnan=yes, - ac_cv_isnan=no -)]) -if test x"$ac_cv_isnan" = x"yes"; then - AC_DEFINE(HAVE_ISNAN, [1], [Has isnan]) -fi -AC_LANG_POP([C++]) - -dnl -------------------------------------------------------------------- - -LIBS=$save_LIBS - -dnl -------------------------------------------------------------------- -dnl - Look for a 64bit integer (do after CFLAGS is set) -dnl -------------------------------------------------------------------- - -dnl Find a working 64bit integer -PGAC_TYPE_64BIT_INT([int64_t]) -if test x"$HAVE_INT64_T_64" = x"no" ; then - PGAC_TYPE_64BIT_INT([long int]) - if test x"$HAVE_LONG_INT_64" = x"no" ; then - PGAC_TYPE_64BIT_INT([long long int]) - if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then - AC_MSG_WARN([Could not find a working 64bit int type, you may experience weird bugs (undefined behaviour)]); - fi - fi -fi - - - -dnl -------------------------------------------------------------------- -dnl - check whether python is required for the build -dnl -------------------------------------------------------------------- - -AC_ARG_ENABLE([python], [ --enable-python Enable build of python module], - [case "${enableval}" in - yes) use_python=true ;; - no) use_python=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;; - esac], - [use_python=false] -) - - -dnl -------------------------------------------------------------------- -dnl - check whether ruby is required for the build -dnl -------------------------------------------------------------------- - -AC_ARG_ENABLE([ruby], [ --enable-ruby Enable build of ruby module], - [case "${enableval}" in - yes) use_ruby=true ;; - no) use_ruby=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-ruby) ;; - esac], - [use_ruby=false] -) - -dnl -------------------------------------------------------------------- -dnl - check whether php is required for the build -dnl -------------------------------------------------------------------- - -AC_ARG_ENABLE([php], [ --enable-php Enable build of php module], - [case "${enableval}" in - yes) use_php=true ;; - no) use_php=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-php) ;; - esac], - [use_php=false] -) - - -dnl -------------------------------------------------------------------- -dnl - check for swig if python, ruby or php are enabled -dnl -------------------------------------------------------------------- - -use_swig=false -if test x"$use_python" = xtrue || - test x"$use_ruby" = xtrue; then - AC_PROG_SWIG(1.3.28) - if test x"$SWIG" != "x"; then - SWIG_ENABLE_CXX - AC_SUBST(SWIG) - - use_swig=true - fi -fi -AM_CONDITIONAL(ENABLE_SWIG, [ test x"$use_swig" = xtrue ]) - - -dnl -------------------------------------------------------------------- -dnl - check for python if enabled -dnl -------------------------------------------------------------------- - -if test x"$use_python" = xtrue; then - dnl Check for Python - AM_PATH_PYTHON - SWIG_PYTHON - - if test x"$PYTHON" = "x"; then - use_python=false - fi - - AC_SUBST(PYTHON) - AC_SUBST(SWIG_PYTHON_CPPFLAGS) - AC_SUBST(SWIG_PYTHON_OPT) -fi -AM_CONDITIONAL(ENABLE_PYTHON, [test x"$use_python" = xtrue]) - - -dnl -------------------------------------------------------------------- -dnl - check for ruby if enabled -dnl -------------------------------------------------------------------- - -if test x"$use_ruby" = xtrue; then - dnl Check for Ruby - AC_RUBY_DEVEL - - if test x"$RUBY" = x; then - use_ruby=false - fi - -fi -AM_CONDITIONAL(ENABLE_RUBY, [ test x"$use_ruby" = xtrue ]) - -dnl -------------------------------------------------------------------- -dnl - check for php if enabled -dnl -------------------------------------------------------------------- - -if test x"$use_php" = xtrue; then - dnl Check for PHP - AC_PATH_PROG(PHP_CONFIG, php-config) - - if test x"$PHP_CONFIG" = x; then - AC_MSG_WARN([php-config not found, php support disabled]) - use_php=false - else - - dnl TODO: check for version, we want PHP5 dev files - - AC_PATH_PROG(PHP, php) dnl for unit testing - AC_PATH_PROG(PHPUNIT, phpunit) dnl for unit testing - fi - - -fi -AM_CONDITIONAL(ENABLE_PHP, [ test x"$use_php" = xtrue ]) -AM_CONDITIONAL(HAVE_PHP, [ test x"$PHP" != x ]) -AM_CONDITIONAL(HAVE_PHP_UNIT, [ test x"$PHPUNIT" != x ]) - - -dnl -------------------------------------------------------------------- -dnl - do operating-system specific things -dnl -------------------------------------------------------------------- - -AC_MSG_CHECKING([OS-specific settings]) - -case "${host_os}" in - *darwin*) - AC_MSG_RESULT([${host_os}]) - AC_MSG_CHECKING([for OS/X version]) - kernel=`uname -r` - - # "Darwin 9.6.0" is Mac OSX 10.5.6 - # "Darwin 10.x" would presumably be Mac OS X 10.6.x - case "${kernel}" in - 8.*) - AC_MSG_RESULT([Mac OS X 10.4 Tiger]) - ;; - 9.*) - AC_MSG_RESULT([Mac OS X 10.5 Leopard]) - ;; - 10.*) -dnl AM_CXXFLAGS="$AM_CXXFLAGS -Wnon-virtual-dtor -Woverloaded-virtual" - AC_MSG_RESULT([Mac OS X 10.6 Snow Leopard]) - ;; - *) - AC_MSG_RESULT([Mac OS X (Darwin ${kernel} kernel)]) - ;; - esac - ;; -esac - -dnl -------------------------------------------------------------------- -dnl - check for boost -dnl -------------------------------------------------------------------- - -dnl -- AX_BOOST(1.32) -dnl -- if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then -dnl -- use_boost_utf=yes -dnl -- else -dnl -- use_boost_utf=no -dnl -- fi -dnl -- AM_CONDITIONAL(ENABLE_BOOST_UTF, [test "x$use_boost_utf" = "xyes"]) - -dnl things to substitute in output ---------------------------------------- -AC_SUBST(VERSION) -AC_SUBST(VERSION_MAJOR) -AC_SUBST(VERSION_MINOR) -AC_SUBST(VERSION_PATCH) -AC_SUBST(INTERFACE_CURRENT) -AC_SUBST(INTERFACE_REVISION) -AC_SUBST(INTERFACE_AGE) -AC_SUBST(JTS_PORT) -AC_SUBST(CAPI_VERSION) -AC_SUBST(CAPI_VERSION_MAJOR) -AC_SUBST(CAPI_VERSION_MINOR) -AC_SUBST(CAPI_VERSION_PATCH) -AC_SUBST(CAPI_INTERFACE_CURRENT) -AC_SUBST(CAPI_INTERFACE_REVISION) -AC_SUBST(CAPI_INTERFACE_AGE) - -dnl output stuff ---------------------------------------------------------- - -AC_OUTPUT([ - Makefile - capi/Makefile - capi/geos_c.h - doc/Doxyfile - doc/Makefile - macros/Makefile - src/Makefile - src/algorithm/Makefile - src/algorithm/locate/Makefile - src/algorithm/distance/Makefile - src/geom/Makefile - src/geom/prep/Makefile - src/geom/util/Makefile - src/geomgraph/Makefile - src/geomgraph/index/Makefile - include/Makefile - include/geos/Makefile - include/geos/algorithm/Makefile - include/geos/algorithm/locate/Makefile - include/geos/algorithm/distance/Makefile - include/geos/geom/Makefile - include/geos/geom/prep/Makefile - include/geos/geom/util/Makefile - include/geos/geomgraph/Makefile - include/geos/geomgraph/index/Makefile - include/geos/index/Makefile - include/geos/index/bintree/Makefile - include/geos/index/chain/Makefile - include/geos/index/intervalrtree/Makefile - include/geos/index/quadtree/Makefile - include/geos/index/strtree/Makefile - include/geos/index/sweepline/Makefile - include/geos/io/Makefile - include/geos/linearref/Makefile - include/geos/noding/Makefile - include/geos/noding/snapround/Makefile - include/geos/operation/Makefile - include/geos/operation/buffer/Makefile - include/geos/operation/distance/Makefile - include/geos/operation/linemerge/Makefile - include/geos/operation/overlay/Makefile - include/geos/operation/overlay/snap/Makefile - include/geos/operation/polygonize/Makefile - include/geos/operation/predicate/Makefile - include/geos/operation/relate/Makefile - include/geos/operation/sharedpaths/Makefile - include/geos/operation/union/Makefile - include/geos/operation/valid/Makefile - include/geos/planargraph/Makefile - include/geos/planargraph/algorithm/Makefile - include/geos/precision/Makefile - include/geos/simplify/Makefile - include/geos/triangulate/Makefile - include/geos/triangulate/quadedge/Makefile - include/geos/util/Makefile - include/geos/version.h - src/index/Makefile - src/index/bintree/Makefile - src/index/chain/Makefile - src/index/intervalrtree/Makefile - src/index/quadtree/Makefile - src/index/strtree/Makefile - src/index/sweepline/Makefile - src/io/Makefile - src/linearref/Makefile - src/noding/Makefile - src/noding/snapround/Makefile - src/operation/Makefile - src/operation/buffer/Makefile - src/operation/distance/Makefile - src/operation/linemerge/Makefile - src/operation/overlay/Makefile - src/operation/polygonize/Makefile - src/operation/predicate/Makefile - src/operation/relate/Makefile - src/operation/sharedpaths/Makefile - src/operation/union/Makefile - src/operation/valid/Makefile - src/planargraph/Makefile - src/precision/Makefile - src/simplify/Makefile - src/triangulate/Makefile - src/triangulate/quadedge/Makefile - src/util/Makefile - swig/geos.i - swig/Makefile - swig/python/Makefile - swig/python/tests/Makefile - swig/ruby/Makefile - swig/ruby/test/Makefile - php/Makefile - php/test/Makefile - tests/Makefile - tests/bigtest/Makefile - tests/unit/Makefile - tests/perf/Makefile - tests/perf/operation/Makefile - tests/perf/operation/buffer/Makefile - tests/perf/operation/predicate/Makefile - tests/perf/capi/Makefile - tests/xmltester/Makefile - tests/geostest/Makefile - tests/thread/Makefile - tools/Makefile - tools/geos-config - ]) - -dnl -- echo "---------------------------------------" -dnl -- echo "Boost UTF: $use_boost_utf" -echo "Swig: $use_swig" -echo "Python bindings: $use_python" -echo "Ruby bindings: $use_ruby" - -echo "PHP bindings: $use_php" -if test x"$use_php" = xtrue; then - echo " PHP: $PHP" - echo " PHPUNIT: $PHPUNIT" - if test x"$PHP" = x -o x"$PHPUNIT" = x; then - AC_MSG_WARN([PHP Unit testing disabled (missing PHP or PHPUNIT)]) - fi -fi - -dnl -- echo "---------------------------------------" debian/patches/automake-subdir-objects0000644000000000000000000000220612312537734015272 0ustar Description: Set automake option subdir-object to remain forward compatible. Author: Bas Couwenberg --- a/src/operation/overlay/Makefile.am +++ b/src/operation/overlay/Makefile.am @@ -1,6 +1,9 @@ # # This file is part of project GEOS (http://trac.osgeo.org/geos/) # + +AUTOMAKE_OPTIONS = subdir-objects + SUBDIRS = noinst_LTLIBRARIES = libopoverlay.la --- a/src/planargraph/Makefile.am +++ b/src/planargraph/Makefile.am @@ -1,6 +1,9 @@ # # This file is part of project GEOS (http://trac.osgeo.org/geos/) # + +AUTOMAKE_OPTIONS = subdir-objects + SUBDIRS = noinst_LTLIBRARIES = libplanargraph.la --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,6 +1,9 @@ # # This file is part of project GEOS (http://trac.osgeo.org/geos/) # + +AUTOMAKE_OPTIONS = subdir-objects + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi TESTS = geos_unit --- a/tests/xmltester/Makefile.am +++ b/tests/xmltester/Makefile.am @@ -5,6 +5,8 @@ #top_srcdir=@top_srcdir@ #top_builddir=@top_builddir@ +AUTOMAKE_OPTIONS = subdir-objects + TESTS = testrunner CLEANFILES = testrunner debian/patches/CoordinateSequenceFactory.h0000644000000000000000000000067512312537734016115 0ustar Description: Fix FTBFS due to a missing declaration. Author: Francesco Paolo Lovergine Bug-Debian: https://bugs.debian.org/624949 --- a/include/geos/geom/CoordinateSequenceFactory.h +++ b/include/geos/geom/CoordinateSequenceFactory.h @@ -23,7 +23,7 @@ #include #include -//#include +#include #include // Forward declarations debian/patches/DouglasPeuckerLineSimplifier.h0000644000000000000000000000135612312537734016553 0ustar Description: Include cstddef and use std namespace. Fix a missing cstddef header file inclusion in some files and use of std namespace. This is required in current default gcc flavor. Author: Francesco Paolo Lovergine --- a/include/geos/simplify/DouglasPeuckerLineSimplifier.h +++ b/include/geos/simplify/DouglasPeuckerLineSimplifier.h @@ -22,6 +22,7 @@ #include #include #include // for auto_ptr +#include #ifdef _MSC_VER #pragma warning(push) @@ -38,6 +39,8 @@ namespace geos { namespace geos { namespace simplify { // geos::simplify +using namespace std; + /** \brief * Simplifies a linestring (sequence of points) using * the standard Douglas-Peucker algorithm. debian/patches/series0000644000000000000000000000045212312537734012042 0ustar CoordinateSequenceFactory.h Node.cpp Root.cpp SimpleNestedRingTester.h DirectedEdgeStar.h DouglasPeuckerLineSimplifier.h TaggedLineString.cpp TaggedLineString.h TaggedLineStringSimplifier.h geos-config libruby automake-subdir-objects automake-am-cppflags configure.ac include-cmath-from-unit-tests debian/patches/libruby0000644000000000000000000000460312312537734012222 0ustar Description: Fix libtool in order to avoid a FTBFS. RUBY_EXTENSION_DIR fix by Christian Hofstaedtler . Author: Francesco Paolo Lovergine Bug-Debian: https://bugs.debian.org/735652 --- a/swig/ruby/Makefile.am +++ b/swig/ruby/Makefile.am @@ -22,7 +22,7 @@ INCLUDES = -I$(RUBY_INCLUDE_DIR) -I$(RUB # Build Ruby module as shared library rubyextensiondir_LTLIBRARIES = geos.la geos_la_SOURCES = geos_wrap.cxx -geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la -l$(RUBY_SO_NAME) +geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME) # Only need to grab the capi header files geos_la_CPPFLAGS = -I$(top_builddir)/capi --- a/swig/ruby/Makefile.in +++ b/swig/ruby/Makefile.in @@ -334,7 +334,7 @@ MAINTAINERCLEANFILES = geos_wrap.cxx # Build Ruby module as shared library @ENABLE_RUBY_TRUE@rubyextensiondir_LTLIBRARIES = geos.la @ENABLE_RUBY_TRUE@geos_la_SOURCES = geos_wrap.cxx -@ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la -l$(RUBY_SO_NAME) +@ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME) # Only need to grab the capi header files @ENABLE_RUBY_TRUE@geos_la_CPPFLAGS = -I$(top_builddir)/capi --- a/configure +++ b/configure @@ -17097,7 +17097,7 @@ fi RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["libdir"] || Config::CONFIG["libdir"]'` - RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"] || Config::CONFIG["sitearchdir"]'` + RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] || Config::CONFIG["vendorarchdir"]'` RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBY_SO"] || Config::CONFIG["RUBY_SO_NAME"]'` --- a/macros/ruby.m4 +++ b/macros/ruby.m4 @@ -35,7 +35,7 @@ AC_DEFUN([AC_RUBY_DEVEL], RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["libdir"]] || Config::CONFIG[["libdir"]]'` dnl Get Ruby extensions directory - RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["sitearchdir"]] || Config::CONFIG[["sitearchdir"]]'` + RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["vendorarchdir"]] || Config::CONFIG[["vendorarchdir"]]'` dnl Get Ruby shared library name, this does not include the lib prefix or extension name RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY_SO"]] || Config::CONFIG[["RUBY_SO_NAME"]]'` debian/patches/include-cmath-from-unit-tests0000644000000000000000000000110712312537734016341 0ustar Description: Some compilers require cmath for the proper definition of ISNAN Origin: http://trac.osgeo.org/geos/changeset/3975 Bug: http://trac.osgeo.org/geos/ticket/686 --- a/tests/unit/geom/CoordinateArraySequenceTest.cpp +++ b/tests/unit/geom/CoordinateArraySequenceTest.cpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace tut { --- a/tests/unit/io/WKBWriterTest.cpp +++ b/tests/unit/io/WKBWriterTest.cpp @@ -15,6 +15,7 @@ #include #include #include +#include namespace tut { debian/libgeos-c++.install0000644000000000000000000000002212312537734012551 0ustar usr/lib/libgeos-* debian/control0000644000000000000000000001162312312537734010603 0ustar Source: geos Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine , Bas Couwenberg Section: science Priority: optional Build-Depends: debhelper (>= 9), doxygen, swig, ruby, ruby-all-dev, dh-autoreconf Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/geos.git Vcs-Git: git://anonscm.debian.org/pkg-grass/geos.git Homepage: http://trac.osgeo.org/geos/ Package: libgeos-dev Architecture: any Section: libdevel Depends: libgeos-c1 (= ${binary:Version}), ${misc:Depends} Suggests: libgdal-doc Description: Geometry engine for GIS - Development files GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the headers and libraries needed to develop programs using GEOS. Package: libgeos++-dev Architecture: any Section: libdevel Depends: libgeos-3.4.2 (= ${binary:Version}), libgeos-dev, ${misc:Depends} Suggests: libgdal-doc Breaks: libgeos-dev (<< 3.3.1-1~) Description: Geometry engine for GIS - C++ development files GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the headers and libraries needed to develop programs using GEOS in C++. Note that third-parties programs should use the stable C API instead of the unstable C++ one. Package: libgeos-c1 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Geometry engine for Geographic Information Systems - C Library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. Functions provided include: . * spatial predicates (based on the DE-9IM model), * overlay functions (intersection, difference, union, symmetric difference), * buffer, * convex hull, * area and distance functions, and * topological validity checking . This package contains the C library. A C++ library is provided by the libgeos-* package. Package: libgeos-3.4.2 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Geometry engine for Geographic Information Systems - C++ Library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. Functions provided include: . * spatial predicates (based on the DE-9IM model), * overlay functions (intersection, difference, union, symmetric difference), * buffer, * convex hull, * area and distance functions, and * topological validity checking . This package contains the C++ library. A stable C library is provided by the libgeos-c* package and should be preferred by third-parties programs. Package: libgeos-doc Architecture: all Section: doc Depends: ${misc:Depends} Suggests: libgeos-dev (= ${binary:Version}) Description: Documentation for the GEOS GIS geometry engine library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the documentation for the GEOS API. Homepage: http://download.osgeo.org/geos/doxygen/ Package: libgeos-ruby1.8 Architecture: any Section: oldlibs Depends: ruby-geos, ${misc:Depends} Description: Transitional package from libgeos-ruby1.8 to ruby-geos This is a transitional dummy package to ease upgrades from the libgeos-ruby1.8 package to the ruby-geos package. It can safely be removed. Package: ruby-geos Architecture: any Section: ruby Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libgeos-ruby1.8 (<< 3.4.2-2~) Provides: libgeos-ruby1.8 Replaces: libgeos-ruby1.8 (<< 3.4.2-2~) Description: GEOS bindings for Ruby GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the Ruby bindings for GEOS. Package: libgeos-dbg Architecture: any Section: debug Priority: extra Depends: libgeos-3.4.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version}), ${misc:Depends} Description: Debugging symbols for the GEOS library GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL. . This package contains the debugging symbols for C/C++ GEOS library. debian/dirs0000644000000000000000000000003712312537734010061 0ustar usr/share/doc/libgeos-dev/html debian/libgeos-doc.doc-base0000644000000000000000000000036112312537734012763 0ustar Document: geos Title: GEOS - Geometry Engine Open Source Abstract: This manual describes the GEOS API. Section: Science/Geoscience Format: HTML Index: /usr/share/doc/libgeos-doc/html/index.html Files: /usr/share/doc/libgeos-doc/html/*.html debian/rules0000755000000000000000000000612612320333314010245 0ustar #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) # testrunner fails on some architectures DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) # Guessing geos version, which is required for C++ binding support VER_MAJOR=$(shell grep ^VERSION_MAJOR configure.*|cut -d= -f2) VER_MINOR=$(shell grep ^VERSION_MINOR configure.*|cut -d= -f2) VER_PATCH=$(shell grep ^VERSION_PATCH configure.*|cut -d= -f2|cut -dr -f1) VER=$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) ifeq (..,$(VER)) $(error configure.ac/configure.in not found or version cannot be guessed) else $(info Guessed geos version is $(VER)) endif CXX = g++ -fpermissive # catch both armel and armhf ifneq (,$(findstring arm-linux-gnueabi,$(DEB_HOST_GNU_TYPE))) CONFFLAGS += --disable-inline endif debian/control: @sed -e 's/@VERSION@/$(VER)/' debian/control.in >$@ %: dh $@ --with autoreconf --parallel override_dh_clean: dh_clean rm -f debian/libgeos-$(VER).install debian/libgeos-$(VER).dirs debian/libgeos++-dev.install override_dh_auto_configure: debian/control dh_auto_configure -- \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --enable-ruby \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ $(CONFFLAGS) \ CXX="$(CXX)" \ $(shell dpkg-buildflags --export=configure) cp debian/libgeos-c++.install debian/libgeos-$(VER).install cp debian/libgeos-c++.dirs debian/libgeos-$(VER).dirs override_dh_auto_build-arch: dh_auto_build --arch override_dh_auto_build-indep: $(MAKE) -C doc doxygen-html override_dh_auto_test: ifneq (,$(findstring $(DEB_BUILD_ARCH),"arm64 s390x powerpc powerpcspe ppc64 ppc64el")) # Skip tests else dh_auto_test endif override_dh_install-arch: # add C++ headers to C++ dev package install file cp debian/libgeos++-dev.install.in debian/libgeos++-dev.install find debian/tmp/usr/include/geos -name "*.h" -a ! -name "export.h" | sed -e 's/^debian\/tmp\///' >>debian/libgeos++-dev.install dh_install --same-arch # remove the library from the -dev package rm -f $(CURDIR)/debian/libgeos-dev/usr/lib/libgeos-*.so override_dh_install-indep: dh_install -i # Install doxygen html files install -m 644 doc/doxygen_docs/html/* debian/libgeos-doc/usr/share/doc/libgeos-doc/html # Install example program source install -m 644 doc/example.cpp debian/libgeos-doc/usr/share/doc/libgeos-doc/examples install -m 644 debian/Makefile.example debian/libgeos-doc/usr/share/doc/libgeos-doc/examples/Makefile override_dh_installman: dh_installman -plibgeos-dev debian/geos-config.1 override_dh_strip: dh_strip --dbg-package=libgeos-dbg override_dh_makeshlibs: dh_makeshlibs -V override_dh_gencontrol: for i in $$(grep ^Package: debian/control|cut -d' ' -f2); do \ echo "geos:Version=$(VER)" >> $$i.substvars; \ done dh_gencontrol debian/source/0000755000000000000000000000000012312537734010475 5ustar debian/source/format0000644000000000000000000000001412312537734011703 0ustar 3.0 (quilt) debian/gbp.conf0000644000000000000000000000100412312537734010607 0ustar [DEFAULT] # The default name for the upstream branch is "upstream". # Change it if the name is different (for instance, "master"). upstream-branch = upstream # The default name for the Debian branch is "master". # Change it if the name is different (for instance, "debian/unstable"). debian-branch = master # git-import-orig uses the following names for the upstream tags. # Change the value if you are not using git-import-orig upstream-tag = upstream/%(version)s # Always use pristine-tar. pristine-tar = True debian/libgeos-doc.dirs0000644000000000000000000000010212312537734012240 0ustar usr/share/doc/libgeos-doc/html usr/share/doc/libgeos-doc/examples debian/Makefile.example0000644000000000000000000000012612312537734012266 0ustar example: g++ -g -O -lgeos -o example example.cpp clean: rm example .PHONY: clean debian/watch0000644000000000000000000000040412312537734010224 0ustar version=3 opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \ http://download.osgeo.org/geos \ (?:|.*/)geos-(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) \ debian uupdate debian/libgeos++-dev.install.in0000644000000000000000000000004512312537734013517 0ustar usr/lib/libgeos.a usr/lib/libgeos.so debian/libgeos-3.4.2.lintian-overrides0000644000000000000000000000015012312537734014637 0ustar # Symbols are problematic for C++ libraries libgeos-3.4.2: no-symbols-control-file usr/lib/libgeos-*.so