CVS commit: pkgsrc/geography/geos

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Jun  5 22:33:56 UTC 2024

Modified Files:
        pkgsrc/geography/geos: Makefile PLIST distinfo
Removed Files:
        pkgsrc/geography/geos/patches: patch-util_geosop_cxxopts.hpp

Log Message:
geography/geos: Update to 3.12.2

packaging changes:
  Our patch about __sun collides with upstream choosing illumos.
  Simply accept upstream, because our patch was not filed upstream as
  is documented in the guide.

upstream changes:
  bug fixes and minor improvements

tests pass on netbsd-10 amd64


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/geography/geos/Makefile \
    pkgsrc/geography/geos/distinfo
cvs rdiff -u -r1.26 -r1.27 pkgsrc/geography/geos/PLIST
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/geography/geos/patches/patch-util_geosop_cxxopts.hpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/geos/Makefile
diff -u pkgsrc/geography/geos/Makefile:1.49 pkgsrc/geography/geos/Makefile:1.50
--- pkgsrc/geography/geos/Makefile:1.49 Sun Nov 12 12:00:24 2023
+++ pkgsrc/geography/geos/Makefile      Wed Jun  5 22:33:56 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2023/11/12 12:00:24 gdt Exp $
+# $NetBSD: Makefile,v 1.50 2024/06/05 22:33:56 gdt Exp $
 
-VERSION_BASE=  3.12.1
+VERSION_BASE=  3.12.2
 # Accomodate testing unreleased versions.
 #VERSION_RC=   beta2
 VERSION=       ${VERSION_BASE}${VERSION_RC}
Index: pkgsrc/geography/geos/distinfo
diff -u pkgsrc/geography/geos/distinfo:1.49 pkgsrc/geography/geos/distinfo:1.50
--- pkgsrc/geography/geos/distinfo:1.49 Sun Nov 12 12:00:24 2023
+++ pkgsrc/geography/geos/distinfo      Wed Jun  5 22:33:56 2024
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.49 2023/11/12 12:00:24 gdt Exp $
+$NetBSD: distinfo,v 1.50 2024/06/05 22:33:56 gdt Exp $
 
-BLAKE2s (geos-3.12.1.tar.bz2) = 72246a13734124841566cf00c95ab7532594535eb0eb61127149a116504ec0f2
-SHA512 (geos-3.12.1.tar.bz2) = 192eba83c651e935b3c9a5cc19321285e4d28b9da9d7a1fa15d9471803027e630db7a7ecea96343d9c5f9846d279062ca3694fe47916a4ebf5698ae66dd5210d
-Size (geos-3.12.1.tar.bz2) = 6727199 bytes
+BLAKE2s (geos-3.12.2.tar.bz2) = 8a21dc07a95e61888443bc1ac0c1c6dfe4d2eab0b2b4484409172c16bf136201
+SHA512 (geos-3.12.2.tar.bz2) = af9b0eb2475c81407f0c7e2a61667bc4d90e862798b155ee40a59e7fde3d38488ef10f930e9cf309a83e436fb80e26e85e0f1d61b375b98110bbb1062645fb5d
+Size (geos-3.12.2.tar.bz2) = 6756010 bytes
 SHA1 (patch-ae) = 253ae5cf5c2705a80d89d996507e3e94f2a11296
-SHA1 (patch-util_geosop_cxxopts.hpp) = 6da706852b026df7275be0a3caddadd1315f6e81

Index: pkgsrc/geography/geos/PLIST
diff -u pkgsrc/geography/geos/PLIST:1.26 pkgsrc/geography/geos/PLIST:1.27
--- pkgsrc/geography/geos/PLIST:1.26    Sun Nov 12 12:00:24 2023
+++ pkgsrc/geography/geos/PLIST Wed Jun  5 22:33:56 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2023/11/12 12:00:24 gdt Exp $
+@comment $NetBSD: PLIST,v 1.27 2024/06/05 22:33:56 gdt Exp $
 bin/geos-config
 bin/geosop
 include/geos.h
@@ -49,6 +49,7 @@ include/geos/coverage/Corner.h
 include/geos/coverage/CoverageBoundarySegmentFinder.h
 include/geos/coverage/CoverageEdge.h
 include/geos/coverage/CoverageGapFinder.h
+include/geos/coverage/CoveragePolygon.h
 include/geos/coverage/CoveragePolygonValidator.h
 include/geos/coverage/CoverageRing.h
 include/geos/coverage/CoverageRingEdges.h
@@ -417,6 +418,7 @@ include/geos/profiler.h
 include/geos/shape/fractal/HilbertCode.h
 include/geos/shape/fractal/HilbertEncoder.h
 include/geos/shape/fractal/MortonCode.h
+include/geos/simplify/ComponentJumpChecker.h
 include/geos/simplify/DouglasPeuckerLineSimplifier.h
 include/geos/simplify/DouglasPeuckerSimplifier.h
 include/geos/simplify/LineSegmentIndex.h
@@ -477,8 +479,8 @@ lib/cmake/GEOS/geos-config.cmake
 lib/cmake/GEOS/geos-targets-release.cmake
 lib/cmake/GEOS/geos-targets.cmake
 lib/libgeos.so
-lib/libgeos.so.3.12.1
+lib/libgeos.so.3.12.2
 lib/libgeos_c.so
 lib/libgeos_c.so.1
-lib/libgeos_c.so.1.18.1
+lib/libgeos_c.so.1.18.2
 lib/pkgconfig/geos.pc