CVS commit: pkgsrc/geography/R-s2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 20 06:06:38 UTC 2026

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

Log Message:
R-s2: fix build on -current


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/geography/R-s2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/R-s2/patches/patch-src_absl_debugging_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/distinfo
diff -u pkgsrc/geography/R-s2/distinfo:1.5 pkgsrc/geography/R-s2/distinfo:1.6
--- pkgsrc/geography/R-s2/distinfo:1.5  Sun Dec  1 05:00:41 2024
+++ pkgsrc/geography/R-s2/distinfo      Mon Apr 20 06:06:38 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2024/12/01 05:00:41 mef Exp $
+$NetBSD: distinfo,v 1.6 2026/04/20 06:06:38 wiz 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
+SHA1 (patch-src_absl_debugging_internal_elf__mem__image.cc) = 03d9a93c21aa4c0c9acd328ddc4b5b7aacb2a54a

Added files:

Index: pkgsrc/geography/R-s2/patches/patch-src_absl_debugging_internal_elf__mem__image.cc
diff -u /dev/null pkgsrc/geography/R-s2/patches/patch-src_absl_debugging_internal_elf__mem__image.cc:1.1
--- /dev/null   Mon Apr 20 06:06:38 2026
+++ pkgsrc/geography/R-s2/patches/patch-src_absl_debugging_internal_elf__mem__image.cc  Mon Apr 20 06:06:38 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_absl_debugging_internal_elf__mem__image.cc,v 1.1 2026/04/20 06:06:38 wiz Exp $
+
+Fix for ELF header updates in NetBSD 11.
+
+--- src/absl/debugging/internal/elf_mem_image.cc.orig  2023-11-25 15:31:07.000000000 +0000
++++ src/absl/debugging/internal/elf_mem_image.cc
+@@ -351,7 +351,7 @@ void ElfMemImage::SymbolIterator::Update(int increment
+   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;