[Git][debian-gis-team/geos][upstream] New upstream version 3.7.0~rc2
Bas Couwenberg
gitlab at salsa.debian.org
Tue Sep 4 06:39:58 BST 2018
Bas Couwenberg pushed to branch upstream at Debian GIS Project / geos
Commits:
fa36e8f8 by Bas Couwenberg at 2018-09-04T05:11:52Z
New upstream version 3.7.0~rc2
- - - - -
13 changed files:
- + .editorconfig
- ChangeLog
- Makefile.am
- Makefile.in
- NEWS
- capi/geos_c.h
- configure
- configure.ac
- doc/Doxyfile
- geos_revision.h
- swig/geos.i
- tests/unit/capi/GEOSGeomFromWKBTest.cpp
- tests/unit/geom/CoordinateArraySequenceFactoryTest.cpp
Changes:
=====================================
.editorconfig
=====================================
@@ -0,0 +1,62 @@
+# http://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# every file needs these
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+# C++ files want tab indentation
+[*.{h,cpp}]
+indent_style = tab
+indent_size = 2
+
+# Makefiles want tab indentation
+[Makefile.am]
+indent_style = tab
+indent_size = 2
+
+# YML files want space indentation
+[*.yml]
+indent_style = space
+indent_size = 2
+
+# appveyor.yml is meant for windows (mloskot said)
+[appveyor.yml]
+end_of_line = crlf
+
+# Visual-C files want carriage returns too
+[*.{vc,opt}]
+end_of_line = crlf
+
+# CMake configuration files
+[CMakeLists.txt]
+indent_style = space
+indent_size = 2
+
+# CMake modules
+[*.cmake]
+indent_style = space
+indent_size = 2
+
+# operation/union directories were found to be using spaces
+[src/operation/union/*.cpp]
+indent_style = space
+indent_size = 2
+[include/geos/operation/union/*.{h,inl}]
+indent_style = space
+indent_size = 2
+
+# XMLTester.cpp wants 2-space indent
+[tests/xmltester/XMLTester.cpp]
+indent_style = space
+indent_size = 4
+
+# Stackwalker.cpp wants 4-space indent
+[tests/xmltester/Stackwalker.cpp]
+indent_style = space
+indent_size = 2
=====================================
ChangeLog
=====================================
@@ -1,3 +1,71 @@
+2018-09-03 Regina Obe <lr at pcorp.us>
+
+ * NEWS, tests/unit/geom/CoordinateArraySequenceFactoryTest.cpp,
+ tests/unit/util/UniqueCoordinateArrayFilterTest.cpp: Change to
+ ignore failure in CoordinateArraySequenceFactoryTest. Put back
+ UniqueCoordinateArrayFilterTest.
+
+2018-09-03 Regina Obe <lr at pcorp.us>
+
+ * NEWS, configure.ac: Prep for 3.7.0rc2 release
+
+2018-09-03 Regina Obe <lr at pcorp.us>
+
+ * .gitignore: Add platform.h.disabled to git ignore so doesn't
+ accidentally get committed again
+
+2018-09-03 Regina Obe <lr at pcorp.us>
+
+ * include/geos/platform.h.disabled: Remove accidentally committed
+ file and add to gitignore
+
+2018-09-03 Regina Obe <lr at pcorp.us>
+
+ * NEWS, include/geos/platform.h.disabled,
+ tests/unit/capi/GEOSGeomFromWKBTest.cpp,
+ tests/unit/util/UniqueCoordinateArrayFilterTest.cpp,
+ tools/ci/bessie.sh: Take out failing test on FreeBSD/macOS Clang.
+ References #894 Revert previous change (was wrong test) Will revisit
+ in 3.8. Put back use of autotools on bessie
+
+2018-09-02 Regina Obe <lr at pcorp.us>
+
+ * tools/ci/bessie.sh: Revise bessies to use cmake
+
+2018-09-02 Regina Obe <lr at pcorp.us>
+
+ * tests/unit/capi/GEOSGeomFromWKBTest.cpp: Take out failing test on
+ FreeBSD/macOS Clang. References #894 Will revisit in 3.8
+
+2018-09-02 Regina Obe <lr at pcorp.us>
+
+ * tests/unit/capi/GEOSGeomFromWKBTest.cpp: Take out failing test on
+ FreeBSD/macOS Clang. References #894 Will revisit in 3.8
+
+2018-09-02 Regina Obe <lr at pcorp.us>
+
+ * NEWS: Take out failing test on FreeBSD/macOS Clang. References
+ #894 Will revisit in 3.8
+
+2018-09-02 Regina Obe <lr at pcorp.us>
+
+ * tests/unit/capi/GEOSGeomFromWKBTest.cpp: Take out failing test on
+ FreeBSD/macOS Clang. References #894 Will revisit in 3.8
+
+2018-08-27 Regina Obe <lr at pcorp.us>
+
+ * NEWS: Clarify reason for sed change. References #317
+
+2018-08-27 Regina Obe <lr at pcorp.us>
+
+ * NEWS, configure.ac: revise sed check for parsing version so works
+ on all sed per Greg Troxel and Bas Cowenberg. Closes #917 for 3.7.0 Update NEWS credits
+
+2018-08-23 Regina Obe <lr at pcorp.us>
+
+ * Makefile.am: Add .editorconfig to distribution, references #920
+ for geos 3.7.0
+
2018-08-19 Regina Obe <lr at pcorp.us>
* NEWS, configure.ac: Prepping for geos 3.7.0rc1 release
=====================================
Makefile.am
=====================================
@@ -24,7 +24,7 @@ SUBDIRS = \
BUILT_SOURCES = geos_revision.h
-EXTRA_DIST = acsite.m4 makefile.vc nmake.opt autogen.bat CMakeLists.txt \
+EXTRA_DIST = acsite.m4 .editorconfig makefile.vc nmake.opt autogen.bat CMakeLists.txt \
cmake/modules/CheckPrototypeExists.cmake \
cmake/modules/COPYING-CMAKE-SCRIPTS \
cmake/modules/GenerateSourceGroups.cmake \
=====================================
Makefile.in
=====================================
@@ -414,7 +414,7 @@ SUBDIRS = \
tools
BUILT_SOURCES = geos_revision.h
-EXTRA_DIST = acsite.m4 makefile.vc nmake.opt autogen.bat CMakeLists.txt \
+EXTRA_DIST = acsite.m4 .editorconfig makefile.vc nmake.opt autogen.bat CMakeLists.txt \
cmake/modules/CheckPrototypeExists.cmake \
cmake/modules/COPYING-CMAKE-SCRIPTS \
cmake/modules/GenerateSourceGroups.cmake \
=====================================
NEWS
=====================================
@@ -1,3 +1,14 @@
+Changes in 3.7.0rc2
+2018-09-03
+Fixes / enhancements since 3.7.0rc1
+ - Drop ? from extended regular expression,
+ so that the expression strictly conforms to the POSIX ERE rules.
+ (#917, Greg Troxel, Bas Couwenberg)
+ - include .editorconfig in tar ball,
+ fixes Cmake on VS (#920, Jeff Mckenna, Regina Obe)
+ - Ignore error in CoordinateArraySequenceFactoryTest
+ failing on FreeBSD/macOS Clang (#894)
+
Changes in 3.7.0rc1
2018-08-19
Fixes / enhancements since 3.7.0beta2
=====================================
capi/geos_c.h
=====================================
@@ -70,10 +70,10 @@ extern "C" {
#define GEOS_VERSION_MINOR 7
#endif
#ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 0rc1
+#define GEOS_VERSION_PATCH 0rc2
#endif
#ifndef GEOS_VERSION
-#define GEOS_VERSION "3.7.0rc1"
+#define GEOS_VERSION "3.7.0rc2"
#endif
#ifndef GEOS_JTS_PORT
#define GEOS_JTS_PORT "1.13.0"
@@ -82,7 +82,7 @@ extern "C" {
#define GEOS_CAPI_VERSION_MAJOR 1
#define GEOS_CAPI_VERSION_MINOR 11
#define GEOS_CAPI_VERSION_PATCH 0
-#define GEOS_CAPI_VERSION "3.7.0rc1-CAPI-1.11.0"
+#define GEOS_CAPI_VERSION "3.7.0rc2-CAPI-1.11.0"
#endif
#define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR
=====================================
configure
=====================================
@@ -2632,9 +2632,9 @@ CAPI_INTERFACE_AGE=11
VERSION_MAJOR=3
VERSION_MINOR=7
-VERSION_PATCH=0rc1
+VERSION_PATCH=0rc2
VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
-VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*?$/\1/'`
+VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/'`
CAPI_VERSION_MAJOR=`expr $CAPI_INTERFACE_CURRENT - $CAPI_INTERFACE_AGE`
CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE
=====================================
configure.ac
=====================================
@@ -24,9 +24,9 @@ dnl -- encoding ABI break at every release
dnl
VERSION_MAJOR=3
VERSION_MINOR=7
-VERSION_PATCH=0rc1
+VERSION_PATCH=0rc2
VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
-VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*?$/\1/'`
+VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*$/\1/'`
dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
dnl the following should be more portable
=====================================
doc/Doxyfile
=====================================
@@ -23,7 +23,7 @@ PROJECT_NAME = GEOS
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 3.7.0rc1
+PROJECT_NUMBER = 3.7.0rc2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
=====================================
geos_revision.h
=====================================
@@ -1 +1 @@
-#define GEOS_REVISION "49f66217"
+#define GEOS_REVISION "2644482d"
=====================================
swig/geos.i
=====================================
@@ -29,8 +29,8 @@
the whole c api. */
#define GEOS_VERSION_MAJOR 3
#define GEOS_VERSION_MINOR 7
-#define GEOS_VERSION_PATCH 0rc1
-#define GEOS_VERSION "3.7.0rc1"
+#define GEOS_VERSION_PATCH 0rc2
+#define GEOS_VERSION "3.7.0rc2"
#define GEOS_JTS_PORT "1.13.0"
#define GEOS_CAPI_VERSION_MAJOR 1
@@ -38,7 +38,7 @@
#define GEOS_CAPI_VERSION_PATCH 0
#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.7.0rc1-CAPI-1.11.0"
+#define GEOS_CAPI_VERSION "3.7.0rc2-CAPI-1.11.0"
/* Supported geometry types */
enum GEOSGeomTypes {
=====================================
tests/unit/capi/GEOSGeomFromWKBTest.cpp
=====================================
@@ -81,7 +81,6 @@ namespace tut
//
// Test Cases
//
-
template<>
template<>
void object::test<1>()
=====================================
tests/unit/geom/CoordinateArraySequenceFactoryTest.cpp
=====================================
@@ -56,7 +56,9 @@ namespace tut
}
catch (std::exception& e)
{
- fail( e.what() );
+ /** ignore failure. TODO figure out why this fails on BSD/Clang
+ * https://trac.osgeo.org/geos/ticket/894 and then put back**/
+ //fail( e.what() );
}
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/commit/fa36e8f84f7b42c72571919a6c853d0ecf1cbabe
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/commit/fa36e8f84f7b42c72571919a6c853d0ecf1cbabe
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180904/fbf55581/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list