Received: by mail.netbsd.org (Postfix, from userid 605) id E397484F2B; Wed, 22 Jun 2022 11:40:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2722B84F25 for ; Wed, 22 Jun 2022 11:40:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id xJSU9FTp1ked for ; Wed, 22 Jun 2022 11:40:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8675884CEA for ; Wed, 22 Jun 2022 11:40:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 193F6FB1A; Wed, 22 Jun 2022 11:42:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1655898143258020" MIME-Version: 1.0 Date: Wed, 22 Jun 2022 11:42:23 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/geography/geos To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20220622114223.193F6FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1655898143258020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Wed Jun 22 11:42:23 UTC 2022 Modified Files: pkgsrc/geography/geos: Makefile distinfo Added Files: pkgsrc/geography/geos/patches: patch-src_noding_snap_SnappingNoder.cpp Log Message: geography/geos: Add workaround for Solaris compiler The smartos bulk build reported a failure due to not resolving sqrt(5). Add a patch which is part of a change upstream just merged to deal with this: change 5 to 5.0. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 pkgsrc/geography/geos/Makefile cvs rdiff -u -r1.43 -r1.44 pkgsrc/geography/geos/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/geography/geos/patches/patch-src_noding_snap_SnappingNoder.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1655898143258020 Content-Disposition: inline Content-Length: 2564 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/geography/geos/Makefile diff -u pkgsrc/geography/geos/Makefile:1.42 pkgsrc/geography/geos/Makefile:1.43 --- pkgsrc/geography/geos/Makefile:1.42 Fri Jun 3 20:01:32 2022 +++ pkgsrc/geography/geos/Makefile Wed Jun 22 11:42:22 2022 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2022/06/03 20:01:32 gdt Exp $ +# $NetBSD: Makefile,v 1.43 2022/06/22 11:42:22 gdt Exp $ DISTNAME= geos-3.10.3 +PKGREVISION= 1 CATEGORIES= geography MASTER_SITES= http://download.osgeo.org/geos/ EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/geography/geos/distinfo diff -u pkgsrc/geography/geos/distinfo:1.43 pkgsrc/geography/geos/distinfo:1.44 --- pkgsrc/geography/geos/distinfo:1.43 Fri Jun 3 20:01:32 2022 +++ pkgsrc/geography/geos/distinfo Wed Jun 22 11:42:22 2022 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.43 2022/06/03 20:01:32 gdt Exp $ +$NetBSD: distinfo,v 1.44 2022/06/22 11:42:22 gdt Exp $ BLAKE2s (geos-3.10.3.tar.bz2) = 6453d24761e52d77ec4f3c5c3ccc4784f274c614a235af7fbdee629e2fc800de SHA512 (geos-3.10.3.tar.bz2) = d6df49193ab006e8d0ddc86c58cfd3d3ee8f42c0a1b325fbe3f77e4d98abce8e7cce283343b81355aa96a5212b740fe04f7cbaca0106b02a9688e9fa78818e34 Size (geos-3.10.3.tar.bz2) = 6720568 bytes SHA1 (patch-ae) = 253ae5cf5c2705a80d89d996507e3e94f2a11296 +SHA1 (patch-src_noding_snap_SnappingNoder.cpp) = 9d9cc766750b9d546f2c42cb011dbd483f2e31fc SHA1 (patch-util_geosop_cxxopts.hpp) = 6da706852b026df7275be0a3caddadd1315f6e81 Added files: Index: pkgsrc/geography/geos/patches/patch-src_noding_snap_SnappingNoder.cpp diff -u /dev/null pkgsrc/geography/geos/patches/patch-src_noding_snap_SnappingNoder.cpp:1.1 --- /dev/null Wed Jun 22 11:42:23 2022 +++ pkgsrc/geography/geos/patches/patch-src_noding_snap_SnappingNoder.cpp Wed Jun 22 11:42:22 2022 @@ -0,0 +1,19 @@ +$NetBSD: patch-src_noding_snap_SnappingNoder.cpp,v 1.1 2022/06/22 11:42:22 gdt Exp $ + +Work around Solaris compiler behavior, which fails to resolve the +C++-required sqrt for integral types, by changing 5 to 5.0. + +Reported upstream via email, and a larger fix has been merged: + https://github.com/libgeos/geos/pull/641 + +--- src/noding/snap/SnappingNoder.cpp.orig 2022-06-03 16:04:49.000000000 +0000 ++++ src/noding/snap/SnappingNoder.cpp +@@ -63,7 +63,7 @@ SnappingNoder::snapVertices(std::vector< + void + SnappingNoder::seedSnapIndex(std::vector& segStrings) + { +- double PHI_INV = (sqrt(5) - 1.0) / 2.0; ++ double PHI_INV = (sqrt(5.0) - 1.0) / 2.0; + + for (SegmentString* ss: segStrings) { + CoordinateSequence* cs = ss->getCoordinates(); --_----------=_1655898143258020--