Skip to content
Commits on Source (5)
Show whitespace changes
Inline Side-by-side
ChangeLog
View file @ 080b6c6e
2019-10-10 Paul Ramsey <pramsey@cleverelephant.ca>
* NEWS, Version.txt: Release version numbers and NEWS
2019-10-09 Paul Ramsey <pramsey@cleverelephant.ca>
* README.md: MD edit
2019-10-08 Daniel Baston <dbaston@gmail.com>
* tests/xmltester/CMakeLists.txt, tests/xmltester/XMLTester.cpp:
Provide more XML test output on failure
2019-10-08 Paul Ramsey <pramsey@cleverelephant.ca>
* Version.txt: Bump versions after release
2019-10-08 Paul Ramsey <pramsey@cleverelephant.ca>
* tests/xmltester/Makefile.am: Add new XML tests to autoconf build
2019-10-08 Daniel Baston <dbaston@gmail.com>
 
* src/operation/union/OverlapUnion.cpp,
NEWS
View file @ 080b6c6e
Changes in 3.8.0
2019-MM-DD
2019-10-10
- New things:
- CAPI: GEOSBuildArea (#952, Even Rouault)
......
README.md
View file @ 080b6c6e
......@@ -14,8 +14,8 @@ More information is available the [project homepage](https://trac.osgeo.org/geos
| branch / CI | Debbie | Winnie | Dronie | Travis CI | GitLab CI | AppVeyor | Bessie | Bessie32 |
|:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |
| master | [![debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Master/) | [![winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/) | [![dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?branch=master)](https://dronie.osgeo.org/geos/geos?branch=master) | [![travis](https://travis-ci.com/libgeos/geos.svg?branch=master)](https://travis-ci.com/libgeos/geos?branch=master) | [![gitlab-ci](https://gitlab.com/geos/libgeos/badges/master/build.svg)](https://gitlab.com/geos/libgeos/commits/master) | [![appveyor](https://ci.appveyor.com/api/projects/status/62aplwst722b89au/branch/master?svg=true)](https://ci.appveyor.com/project/dbaston/geos/branch/master) | [![bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&BRANCH=master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie) | [![bessie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&BRANCH=master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) ||
| 3.7 | [![debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.7)](https://debbie.postgis.net/view/GEOS/job/GEOS_Branch_3.7/) | [![winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/) | [![dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?branch=3.7)](https://dronie.osgeo.org/geos/geos?branch=3.7) | [![travis](https://travis-ci.com/libgeos/geos.svg?branch=3.7)](https://travis-ci.com/libgeos/geos?branch=3.7) | [![gitlab-ci](https://gitlab.com/geos/libgeos/badges/svn-3.7/build.svg)](https://gitlab.com/geos/libgeos/commits/3.7) | [![appveyor](https://ci.appveyor.com/api/projects/status/62aplwst722b89au/branch/3.7?svg=true)](https://ci.appveyor.com/project/dbaston/geos/branch/3.7) ||
| master | [![debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Master/) | [![winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/) | [![dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?branch=master)](https://dronie.osgeo.org/geos/geos?branch=master) | [![travis](https://travis-ci.com/libgeos/geos.svg?branch=master)](https://travis-ci.com/libgeos/geos?branch=master) | [![gitlab-ci](https://gitlab.com/geos/libgeos/badges/master/build.svg)](https://gitlab.com/geos/libgeos/commits/master) | [![appveyor](https://ci.appveyor.com/api/projects/status/62aplwst722b89au/branch/master?svg=true)](https://ci.appveyor.com/project/dbaston/geos/branch/master) | [![bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&BRANCH=master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie) | [![bessie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&BRANCH=master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) |
| 3.7 | [![debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.7)](https://debbie.postgis.net/view/GEOS/job/GEOS_Branch_3.7/) | [![winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/) | [![dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?branch=3.7)](https://dronie.osgeo.org/geos/geos?branch=3.7) | [![travis](https://travis-ci.com/libgeos/geos.svg?branch=3.7)](https://travis-ci.com/libgeos/geos?branch=3.7) | [![gitlab-ci](https://gitlab.com/geos/libgeos/badges/svn-3.7/build.svg)](https://gitlab.com/geos/libgeos/commits/3.7) | [![appveyor](https://ci.appveyor.com/api/projects/status/62aplwst722b89au/branch/3.7?svg=true)](https://ci.appveyor.com/project/dbaston/geos/branch/3.7) |
| 3.6 | [![debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.6)](https://debbie.postgis.net/view/GEOS/job/GEOS_Branch_3.6/) | [![winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.6/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.6/) | [![dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?branch=svn-3.6)](https://dronie.osgeo.org/geos/geos?branch=svn-3.6) | [![travis](https://travis-ci.com/libgeos/geos.svg?branch=svn-3.6)](https://travis-ci.com/libgeos/geos?branch=svn-3.6) | [![gitlab-ci](https://gitlab.com/geos/libgeos/badges/svn-3.6/build.svg)](https://gitlab.com/geos/libgeos/commits/svn-3.6) | [![appveyor](https://ci.appveyor.com/api/projects/status/62aplwst722b89au/branch/svn-3.6?svg=true)](https://ci.appveyor.com/project/dbaston/geos/branch/svn-3.6) |
## Build/install
......
Version.txt
View file @ 080b6c6e
......@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=8
GEOS_VERSION_PATCH=0
# OPTIONS: "", "dev", "rc1" etc.
GEOS_PATCH_WORD=rc3
GEOS_PATCH_WORD=
# GEOS CAPI Versions
#
......
capi/geos_c.h
View file @ 080b6c6e
......@@ -58,10 +58,10 @@ extern "C" {
#define GEOS_VERSION_MINOR 8
#endif
#ifndef GEOS_VERSION_PATCH
#define GEOS_VERSION_PATCH 0rc3
#define GEOS_VERSION_PATCH 0
#endif
#ifndef GEOS_VERSION
#define GEOS_VERSION "3.8.0rc3"
#define GEOS_VERSION "3.8.0"
#endif
#ifndef GEOS_JTS_PORT
#define GEOS_JTS_PORT "1.13.0"
......@@ -70,7 +70,7 @@ extern "C" {
#define GEOS_CAPI_VERSION_MAJOR 1
#define GEOS_CAPI_VERSION_MINOR 13
#define GEOS_CAPI_VERSION_PATCH 1
#define GEOS_CAPI_VERSION "3.8.0rc3-CAPI-1.13.1"
#define GEOS_CAPI_VERSION "3.8.0-CAPI-1.13.1"
#define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR
#define GEOS_CAPI_LAST_INTERFACE (GEOS_CAPI_VERSION_MAJOR+GEOS_CAPI_VERSION_MINOR)
......
debian/changelog
View file @ 080b6c6e
geos (3.8.0-1~exp1) experimental; urgency=medium
* New upstream release.
* Drop ruby package, has no users in popcon.
-- Bas Couwenberg <sebastic@debian.org> Fri, 11 Oct 2019 06:50:28 +0200
geos (3.8.0~rc3-1~exp1) experimental; urgency=medium
* New upstream release candidate.
......
debian/control
View file @ 080b6c6e
......@@ -7,9 +7,7 @@ Priority: optional
Build-Depends: debhelper (>= 9.20160114),
dh-autoreconf,
doxygen,
pkg-kde-tools,
ruby-all-dev,
swig
pkg-kde-tools
Standards-Version: 4.4.1
Vcs-Browser: https://salsa.debian.org/debian-gis-team/geos
Vcs-Git: https://salsa.debian.org/debian-gis-team/geos.git -b experimental
......@@ -108,20 +106,3 @@ Description: Documentation for the GEOS GIS geometry engine library
OpenGIS Consortium Simple Features Specification for SQL.
.
This package contains the documentation for the GEOS API.
Package: ruby-geos
Architecture: any
Multi-Arch: same
Section: ruby
Pre-Depends: ${misc:Pre-Depends}
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.
debian/patches/libruby deleted 100644 → 0
View file @ 19477937
Description: RUBY_EXTENSION_DIR fix, use vendorarchdir for Debian package.
Author: Christian Hofstaedtler <zeha@debian.org>
Bug-Debian: https://bugs.debian.org/735652
Forwarded: not-needed
--- a/configure
+++ b/configure
@@ -18681,7 +18681,7 @@ fi
RUBY_ARCH_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["archlibdir"] || Config::CONFIG["archlibdir"]'`
- 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["RUBY_SO_NAME"] || Config::CONFIG["RUBY_SO_NAME"]'`
--- a/macros/ruby.m4
+++ b/macros/ruby.m4
@@ -41,7 +41,7 @@ AC_DEFUN([AC_RUBY_DEVEL],
RUBY_ARCH_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["archlibdir"]] || Config::CONFIG[["archlibdir"]]'`
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[["RUBY_SO_NAME"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
debian/rules
View file @ 080b6c6e
......@@ -39,7 +39,6 @@ override_dh_auto_configure:
dh_auto_configure -- \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--enable-ruby \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
$(CONFFLAGS) \
......@@ -74,9 +73,6 @@ override_dh_install-arch:
# Remove .la files
find debian/tmp/usr/lib -name '*.la' -delete
# Remove static library for Ruby
rm -f debian/tmp/usr/lib/*/ruby/*/*/*.a
dh_install -a --list-missing
# remove the library from the -dev package
......
doc/Doxyfile
View file @ 080b6c6e
......@@ -38,7 +38,7 @@ PROJECT_NAME = GEOS
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 3.8.0rc3
PROJECT_NUMBER = 3.8.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
......
swig/geos.i
View file @ 080b6c6e
......@@ -29,8 +29,8 @@
the whole c api. */
#define GEOS_VERSION_MAJOR 3
#define GEOS_VERSION_MINOR 8
#define GEOS_VERSION_PATCH 0rc3
#define GEOS_VERSION "3.8.0rc3"
#define GEOS_VERSION_PATCH 0
#define GEOS_VERSION "3.8.0"
#define GEOS_JTS_PORT "1.13.0"
#define GEOS_CAPI_VERSION_MAJOR 1
......@@ -38,7 +38,7 @@
#define GEOS_CAPI_VERSION_PATCH 1
#define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR
#define GEOS_CAPI_LAST_INTERFACE (GEOS_CAPI_VERSION_MAJOR+GEOS_CAPI_VERSION_MINOR)
#define GEOS_CAPI_VERSION "3.8.0rc3-CAPI-1.13.1"
#define GEOS_CAPI_VERSION "3.8.0-CAPI-1.13.1"
/* Supported geometry types */
enum GEOSGeomTypes {
......
tests/xmltester/CMakeLists.txt
View file @ 080b6c6e
......@@ -28,7 +28,7 @@ foreach(_testdir general issue misc robust validate)
file(GLOB_RECURSE _testfiles ${CMAKE_CURRENT_LIST_DIR}/tests/${_testdir}/*.xml CONFIGURE_DEPEND)
foreach(_testfile ${_testfiles})
get_filename_component(_testname ${_testfile} NAME_WE)
add_test(NAME ${_testdir}-${_testname} COMMAND test_xmltester --test-valid-output ${_testfile})
add_test(NAME ${_testdir}-${_testname} COMMAND test_xmltester -v --test-valid-output ${_testfile})
endforeach()
endforeach()
unset(_testdir)
......
tests/xmltester/XMLTester.cpp
View file @ 080b6c6e
......@@ -367,8 +367,9 @@ XMLTester::printTest(bool success, const std::string& expected_result, const std
std::cout << ": " << (success ? "ok." : "failed.");
std::cout << " (" << std::setprecision(15) << java_math_round(prof.getTot() / 1000) << " ms)" << std::endl;
// print geometry etc for -v -v and above
if (verbose > 1) {
// print geometry on failure for -v
// print geometry no matter what for -v -v and above
if (verbose > 1 || (verbose == 1 && !success)) {
std::cout << "\tDescription: " << curr_case_desc << std::endl;
if(gA) {
......