CVS commit: pkgsrc/geography/R-s2

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Fri Jun 12 13:07:51 UTC 2026

Modified Files:
        pkgsrc/geography/R-s2: Makefile distinfo
Added Files:
        pkgsrc/geography/R-s2/patches:
            patch-tools_vendor_abseil-cpp_absl_debbuging_internal_elf__mem__image.cc
Removed Files:
        pkgsrc/geography/R-s2/patches:
            patch-src_absl_debugging_internal_elf__mem__image.cc

Log Message:
(geography/R-s2) Updated 1.1.7 to 1.1.9

# s2 (development version)

* Fix code to help gcc-ubsan understand the region coverer (#275)
* Inspect `S2_FORCE_BUNDLED_ABSEIL` in `conifigure`: if non-empty, any system
  install of Abseil is ignored (e.g., if using a non-standard compiler on a
  system where system Abseil is available via pkg-config) (#275)
* Disable optimization in compact_array.h that confused compilers when compiling
  with `-Wpedantic` (#275).
* Add `cmake` to SystemReqirements. Even though this is technically optional
  (system Abseil can be used), adding to requirements helps some installers
  automatically install the dependency (#277).

# s2 1.1.8

* `s2_buffer_cells()` recycles `max_dist` and `min_level` arguments, allowing
   to specify these by feature (#264 and
   https://github.com/r-spatial/sf/issues/2488).
* The internal version of s2geometry is now 0.11.1 (#257, #263).
* The Abseil dependency is resolved using pkg-config where possible.
  Where this is not possible, a vendored version of Abseil will be built using
  CMake (#258).


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/geography/R-s2/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/R-s2/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/geography/R-s2/patches/patch-src_absl_debugging_internal_elf__mem__image.cc
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/R-s2/patches/patch-tools_vendor_abseil-cpp_absl_debbuging_internal_elf__mem__image.cc

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

Modified files:

Index: pkgsrc/geography/R-s2/Makefile
diff -u pkgsrc/geography/R-s2/Makefile:1.8 pkgsrc/geography/R-s2/Makefile:1.9
--- pkgsrc/geography/R-s2/Makefile:1.8  Tue May 26 12:28:05 2026
+++ pkgsrc/geography/R-s2/Makefile      Fri Jun 12 13:07:51 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2026/05/26 12:28:05 mef Exp $
+# $NetBSD: Makefile,v 1.9 2026/06/12 13:07:51 mef Exp $
 
 R_PKGNAME=     s2
-R_PKGVER=      1.1.7
+R_PKGVER=      1.1.9
 CATEGORIES=    geography
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/geography/R-s2/distinfo
diff -u pkgsrc/geography/R-s2/distinfo:1.7 pkgsrc/geography/R-s2/distinfo:1.8
--- pkgsrc/geography/R-s2/distinfo:1.7  Tue May 26 12:28:05 2026
+++ pkgsrc/geography/R-s2/distinfo      Fri Jun 12 13:07:51 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2026/05/26 12:28:05 mef Exp $
+$NetBSD: distinfo,v 1.8 2026/06/12 13:07:51 mef Exp $
 
-BLAKE2s (R/s2_1.1.7.tar.gz) = ac2d079302b55e2ed7df820b597ff9056f859822b8f18297f8db17b9d92bb775
-SHA512 (R/s2_1.1.7.tar.gz) = 3c2b6b83a11b8979781cfc56c58fd6d788fda62cdc8a7d635b84219f4cf530eea06068b5418a07e3e04ed3455ec2d7b3e1d7a8d91b133514e94d31dab2be477a
-Size (R/s2_1.1.7.tar.gz) = 2381288 bytes
+BLAKE2s (R/s2_1.1.9.tar.gz) = 995f1119d21785f0c5d22912c8bf7880fd5607895dfad98ef7d274deb65c0fa1
+SHA512 (R/s2_1.1.9.tar.gz) = e57aa0bfb3bba8383519839a371c8965a014fab93be158764bcac0a9326478092873121d9d9c28c24887b705f138f4182e4146f6bbabe2f2b038da3331143db0
+Size (R/s2_1.1.9.tar.gz) = 2967364 bytes
 SHA1 (patch-src_Makevars.in) = f1011a77c3fdf016f1592955d1f4374f68efad73
 SHA1 (patch-src_absl_debugging_internal_elf__mem__image.cc) = 03d9a93c21aa4c0c9acd328ddc4b5b7aacb2a54a

Added files:

Index: pkgsrc/geography/R-s2/patches/patch-tools_vendor_abseil-cpp_absl_debbuging_internal_elf__mem__image.cc
diff -u /dev/null pkgsrc/geography/R-s2/patches/patch-tools_vendor_abseil-cpp_absl_debbuging_internal_elf__mem__image.cc:1.1
--- /dev/null   Fri Jun 12 13:07:51 2026
+++ pkgsrc/geography/R-s2/patches/patch-tools_vendor_abseil-cpp_absl_debbuging_internal_elf__mem__image.cc      Fri Jun 12 13:07:51 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_vendor_abseil-cpp_absl_debbuging_internal_elf__mem__image.cc,v 1.1 2026/06/12 13:07:51 mef Exp $
+
+Fix for ELF header updates in NetBSD 11.
+
+--- tools/vendor/abseil-cpp/absl/debugging/internal/elf_mem_image.cc.orig      2026-06-12 21:57:03.074022311 +0900
++++ tools/vendor/abseil-cpp/absl/debugging/internal/elf_mem_image.cc   2026-06-12 21:58:19.429281523 +0900
+@@ -350,7 +350,7 @@ void ElfMemImage::SymbolIterator::Update
+   const ElfW(Versym) *version_symbol = image->GetVersym(index_);
+   ABSL_RAW_CHECK(symbol && version_symbol, "");
+   const char *const symbol_name = image->GetDynstr(symbol->st_name);
+-#if defined(__NetBSD__)
++#if defined(__NetBSD__) && (_SYS_EXEC_ELF_H_ + 0) < 2
+   const int version_index = version_symbol->vs_vers & VERSYM_VERSION;
+ #else
+   const ElfW(Versym) version_index = version_symbol[0] & VERSYM_VERSION;