diff options
author | gdt <gdt@pkgsrc.org> | 2017-09-28 00:24:41 +0000 |
---|---|---|
committer | gdt <gdt@pkgsrc.org> | 2017-09-28 00:24:41 +0000 |
commit | c6c99ecf1833935b8eb49e3e7dafefdbe63cce44 (patch) | |
tree | cd38fe9db2c1b6abdd266b505b97c31a0231487c /geography | |
parent | fa49820cfd803235a4a639b2deebc22ef5d2d76a (diff) | |
download | pkgsrc-c6c99ecf1833935b8eb49e3e7dafefdbe63cce44.tar.gz |
Update to 3.6.2
Changes in 3.6.2
2017-07-25
- Bug fixes / improvements
- Fix exception in UnaryUnion of collection of touching polygons (#837)
- Allow building against python 3 (#774)
- Fix build with android-ndk and other compilers (#799)
- Allows compiling with -Wpointer-bool-conversion (#638)
- Fix unhandled exception on invalid fp operation (#811)
- Fix overloaded virtual print in DirectedEdge* (#812)
- AppVeyor CI build added (#813)
- Clean up numerous MSVC warnings, notably C4275 and C4589 (#814)
- Bump CMake version to 3.0.0 (#817)
- Fix leaks in WKT parser (#830)
Changes in 3.6.1
2016-12-24
- Bug fixes / improvements
- Fix GEOSSTRtree_nearest_r signature and add implementation (#796)
- Fix --static-clibs and --static-cclibs returns from geos-config
- Fix WKB representation of empty polygon (#680).
- Fix empty GEOSSimplify return on inner ring collapse (#741)
Changes in 3.6.0
2016-10-25
- Important / Breaking Changes:
- The PHP binding moved to its own repository:
http://git.osgeo.org/gogs/geos/php-geos (#765)
- New things:
- CAPI: GEOSGeom_{get,set}UserData (Rashad Kanavath)
- CAPI: GEOSGeom_{set,get}Precision (#713)
- CAPI: GEOSMinimumRotatedRectangle and GEOSMinimumWidth
(#729, Nyall Dawson)
- CAPI: GEOSSTRtree_nearest (#768, Dan Baston)
- CAPI: GEOSMinimumClearance and GEOSMinimumClearanceLine
(#776, Dan Baston)
- C++ API changes:
- Automatic memory management for GeometryFactory objects
Diffstat (limited to 'geography')
-rw-r--r-- | geography/geos/Makefile | 20 | ||||
-rw-r--r-- | geography/geos/PLIST | 8 | ||||
-rw-r--r-- | geography/geos/distinfo | 12 | ||||
-rw-r--r-- | geography/geos/patches/patch-ae | 14 |
4 files changed, 27 insertions, 27 deletions
diff --git a/geography/geos/Makefile b/geography/geos/Makefile index 2e583a1f5cf..1e96ccb5eac 100644 --- a/geography/geos/Makefile +++ b/geography/geos/Makefile @@ -1,12 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2017/01/22 23:44:47 gdt Exp $ - -# Do not update to 3.6, because there is serious ABI breakage which -# prevents osm2pgsql from working, and may well cause other programs -# to have issues. osm2pgsql plans to stop using geos, and it seems -# better to have slightly old geos in pkgsrc then to have a bunch of -# broken other programs. Please email me if you have a problem with -# this. -- gdt, 20170122 -DISTNAME= geos-3.5.1 +# $NetBSD: Makefile,v 1.30 2017/09/28 00:24:41 gdt Exp $ + +DISTNAME= geos-3.6.2 CATEGORIES= geography MASTER_SITES= http://download.osgeo.org/geos/ EXTRACT_SUFX= .tar.bz2 @@ -22,10 +16,10 @@ EXTRACT_SUFX= .tar.bz2 # geos shlib name changes. However, people on the geos list dispute # this characterization. -# The following packages either incorrectly (from the geos -# READMEviewpoint) or suboptimally (from some comments ont he list) -# link directly against -lgeos and should be revbumped on every update -# (and perhaps fixed not to use -lgeos): +# The following packages either incorrectly (from the geos README +# viewpoint) or suboptimally (from some comments on the list) link +# directly against -lgeos and should be revbumped on every update (and +# perhaps fixed not to use -lgeos): # geography/gdal-lib # geoggraph/osm2pgsql # https://github.com/openstreetmap/osm2pgsql/issues/634 diff --git a/geography/geos/PLIST b/geography/geos/PLIST index 4cd294323b8..c068010127a 100644 --- a/geography/geos/PLIST +++ b/geography/geos/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2015/09/06 19:45:44 gdt Exp $ +@comment $NetBSD: PLIST,v 1.14 2017/09/28 00:24:41 gdt Exp $ bin/geos-config include/geos.h include/geos/algorithm/Angle.h @@ -163,8 +163,11 @@ include/geos/index/quadtree/Root.h include/geos/index/strtree/AbstractNode.h include/geos/index/strtree/AbstractSTRtree.h include/geos/index/strtree/Boundable.h +include/geos/index/strtree/BoundablePair.h +include/geos/index/strtree/GeometryItemDistance.h include/geos/index/strtree/Interval.h include/geos/index/strtree/ItemBoundable.h +include/geos/index/strtree/ItemDistance.h include/geos/index/strtree/SIRtree.h include/geos/index/strtree/STRtree.h include/geos/index/sweepline/SweepLineEvent.h @@ -261,6 +264,8 @@ include/geos/operation/buffer/SubgraphDepthLocater.h include/geos/operation/distance/ConnectedElementLocationFilter.h include/geos/operation/distance/ConnectedElementPointFilter.h include/geos/operation/distance/DistanceOp.h +include/geos/operation/distance/FacetSequence.h +include/geos/operation/distance/FacetSequenceTreeBuilder.h include/geos/operation/distance/GeometryLocation.h include/geos/operation/intersection/Rectangle.h include/geos/operation/intersection/RectangleIntersection.h @@ -336,6 +341,7 @@ include/geos/precision/CommonBitsOp.h include/geos/precision/CommonBitsRemover.h include/geos/precision/EnhancedPrecisionOp.h include/geos/precision/GeometryPrecisionReducer.h +include/geos/precision/MinimumClearance.h include/geos/precision/PrecisionReducerCoordinateOperation.h include/geos/precision/SimpleGeometryPrecisionReducer.h include/geos/profiler.h diff --git a/geography/geos/distinfo b/geography/geos/distinfo index 2952a468b3e..186a0e73b99 100644 --- a/geography/geos/distinfo +++ b/geography/geos/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.26 2016/10/25 23:31:39 gdt Exp $ +$NetBSD: distinfo,v 1.27 2017/09/28 00:24:41 gdt Exp $ -SHA1 (geos-3.5.1.tar.bz2) = 83373542335c2f20c22d5420ba01d99f645f0c61 -RMD160 (geos-3.5.1.tar.bz2) = fff59826bfeca3e6519caad3551522a67ad29cca -SHA512 (geos-3.5.1.tar.bz2) = 6a05dbb401b963a7721dc03b1649a18ff5d0ab74ba1cfa7c000429c99bba7fe75b3bdc3abfd0839a93ce99d7c6c301b252172a3f7bdb49a2413d8d065ea0fae7 -Size (geos-3.5.1.tar.bz2) = 1930928 bytes -SHA1 (patch-ae) = 01ffd15e3562ff8fb191608dc12a2ee6918154b0 +SHA1 (geos-3.6.2.tar.bz2) = b9d0578c6b5308cf05a3dd8873802f9862c04291 +RMD160 (geos-3.6.2.tar.bz2) = 6efa217f1bfe5bb4a3de82e1899a97b3a8c90b9e +SHA512 (geos-3.6.2.tar.bz2) = 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016 +Size (geos-3.6.2.tar.bz2) = 2030705 bytes +SHA1 (patch-ae) = f4befa15f66a6e5b30dce57f0abb34af4c3264c8 SHA1 (patch-capi_geos__ts__c.cpp) = 0c266de00722606bcb9637f21f5c3c458f12cb47 diff --git a/geography/geos/patches/patch-ae b/geography/geos/patches/patch-ae index 458d3d5aa04..4c1964228dd 100644 --- a/geography/geos/patches/patch-ae +++ b/geography/geos/patches/patch-ae @@ -1,10 +1,10 @@ -$NetBSD: patch-ae,v 1.4 2013/08/18 11:06:25 gdt Exp $ +$NetBSD: patch-ae,v 1.5 2017/09/28 00:24:41 gdt Exp $ TODO: explain what's in LDFLAGS. TODO: explain why --libs has -L in the first place (vs --ldflags). TODO: report upstream. ---- tools/geos-config.in.orig 2013-08-11 04:23:41.000000000 +0000 +--- tools/geos-config.in.orig 2016-11-22 10:49:08.000000000 +0000 +++ tools/geos-config.in @@ -43,22 +43,22 @@ case $1 in --libs) @@ -22,16 +22,16 @@ TODO: report upstream. + echo -L${libdir} @LDFLAGS@ -lgeos ;; --static-clibs) -- echo -L${libdir} -lgeos_c -lgeos -m -+ echo -L${libdir} @LDFLAGS@ -lgeos_c -lgeos -m +- echo -L${libdir} -lgeos_c -lgeos -lm ++ echo -L${libdir} @LDFLAGS@ -lgeos_c -lgeos -lm ;; --static-cclibs) -- echo -L${libdir} -lgeos -m -+ echo -L${libdir} @LDFLAGS@ -lgeos -m +- echo -L${libdir} -lgeos -lm ++ echo -L${libdir} @LDFLAGS@ -lgeos -lm ;; --ldflags) - echo -L${libdir} -+ echo @LDFLAGS@ -L${libdir} ++ echo -L${libdir} @LDFLAGS@ ;; --includes) echo ${prefix}/include |