<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b2d7ad44c4491b30191c29bbddc3dfdeccf81a6b">https://github.com/macports/macports-ports/commit/b2d7ad44c4491b30191c29bbddc3dfdeccf81a6b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b2d7ad44c44 s2geometry: update to 0.11.1
</span>b2d7ad44c44 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b2d7ad44c4491b30191c29bbddc3dfdeccf81a6b
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Feb 19 21:36:37 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> s2geometry: update to 0.11.1
</span>---
math/s2geometry/Portfile | 20 ++++++++++++--------
math/s2geometry/files/patch-fix-build.diff | 16 ----------------
2 files changed, 12 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/s2geometry/Portfile b/math/s2geometry/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8681e510635..3fa52894a9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/s2geometry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/s2geometry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,18 +7,17 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup google s2geometry 7773d518b1f29caa1c2045eb66ec519e025be108
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup google s2geometry 0.11.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math science
license Apache-2
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
description Computational geometry and spatial indexing on the sphere
long_description {*}${description}
homepage https://s2geometry.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f4d412b134d0879a7bd2284f571b3f64066b1a1a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 36998cb5fd5309c4d42008591ce7946a53cef8dffb25a04c09673ac616ac9820 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1179957
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cd62ef9c3318960abc1e5c8b1b20e6f8e078824b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c1ceec31e6258688c72b243e48b040b650cdb71c59d4bc36231822ef6bd63655 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1180916
</span>
# clock_gettime needed for abseil
# https://github.com/macports/macports-ports/pull/19905#issuecomment-1680281240
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +28,8 @@ depends_lib-append port:abseil
</span> # https://github.com/google/s2geometry/issues/315
patchfiles patch-fix-build.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The following is correct, i.e. not only for Darwin:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The following is correct, i.e. not only for Darwin.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/google/s2geometry/issues/279
</span> platform powerpc {
patchfiles-append \
patch-ppc-constexpr.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,8 @@ compiler.cxx_standard 2014
</span>
configure.args-append \
-DBUILD_SHARED_LIBS=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_EXAMPLES=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_EXAMPLES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTS=OFF
</span>
if {[string match *gcc* ${configure.compiler}]} {
configure.ldflags-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +56,9 @@ variant tests description "Enable testing" {
</span> port:gtest
require_active_variants gtest shared_libs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTS=OFF -DBUILD_TESTS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DGOOGLETEST_ROOT=${prefix}/src
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/s2geometry/files/patch-fix-build.diff b/math/s2geometry/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d10f233d8b..d2091b7fa1c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/s2geometry/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/s2geometry/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,19 +16,3 @@
</span>
// Load/Store for float.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/s2/value_lexicon.h.orig 2023-05-19 00:29:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/s2/value_lexicon.h 2023-05-19 00:30:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,12 +29,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "s2/util/gtl/dense_hash_set.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class S2Point;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace absl {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace hash_internal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--template <typename T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--struct Hash;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--} // namespace hash_internal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--} // namespace absl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // ValueLexicon is a class that maps distinct values to sequentially numbered
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // integer identifiers. It automatically eliminates duplicates and uses a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>