CVS commit: pkgsrc/www/firefox140

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Dec 15 21:04:49 UTC 2025

Modified Files:
        pkgsrc/www/firefox140: distinfo
        pkgsrc/www/firefox140/patches:
            patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc

Log Message:
firefox140: fix builds with NetBSD >= 11.99.4


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/firefox140/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox140/patches/patch-third__party_abseil-cpp_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/www/firefox140/distinfo
diff -u pkgsrc/www/firefox140/distinfo:1.3 pkgsrc/www/firefox140/distinfo:1.4
--- pkgsrc/www/firefox140/distinfo:1.3  Thu Dec 11 11:05:21 2025
+++ pkgsrc/www/firefox140/distinfo      Mon Dec 15 21:04:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2025/12/11 11:05:21 leot Exp $
+$NetBSD: distinfo,v 1.4 2025/12/15 21:04:49 gutteridge Exp $
 
 BLAKE2s (firefox-140.6.0esr.source.tar.xz) = 7a8bd60f08fdd421ac94fa13ff776eff21cba8f432d85a60fce3a2c0c57066d6
 SHA512 (firefox-140.6.0esr.source.tar.xz) = ed66657bd4b2d94791892261d7c0c0d950b4f630d12ab28a777d93393427451a9aa125e5a01ee15f2ac0ff378d0be074a08583dcffd35609112ba4e6f9ada798
@@ -32,7 +32,7 @@ SHA1 (patch-netwerk_protocol_http_nsHttp
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 753fd4d62088c870aefe7c4b739286259848446e
 SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = 5be4183d9075f5a3a3c6b3e0338473af185fb50e
 SHA1 (patch-python_mozbuild_mozbuild_frontend_reader.py) = 57cad432ccc18e790e2cf00732f499116c79f4c1
-SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc) = 2b5955027add79d1b8709667b0433b2d19fbd1bc
+SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc) = 3c015fe094aa1d4e8259a7cda08ce06e0ae506f0
 SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_vdso__support.cc) = f9c44d0d6fd952296f23c24f56053958b30d8e5c
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
 SHA1 (patch-third__party_libwebrtc_modules_audio__device_audio__device__impl.cc) = 47ba1a2b88b3fdfd16cd29da3eb1e4a218ecada8

Index: pkgsrc/www/firefox140/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc
diff -u pkgsrc/www/firefox140/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc:1.1 
pkgsrc/www/firefox140/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc:1.2
--- pkgsrc/www/firefox140/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc:1.1  Sun Oct 19 11:56:56 2025
+++ pkgsrc/www/firefox140/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc      Mon Dec 15 21:04:49 2025
@@ -1,8 +1,9 @@
-$NetBSD: patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc,v 1.1 2025/10/19 11:56:56 leot Exp $
+$NetBSD: patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc,v 1.2 2025/12/15 21:04:49 gutteridge Exp $
 
 * NetBSD has no DT_GNU_HASH definition.
+* Fix builds with NetBSD >= 11.99.4, where ELF definitions were changed.
 
---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc.orig       2025-03-05 13:29:06.318414617 +0000
+--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc.orig       2025-12-01 18:15:45.000000000 +0000
 +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
 @@ -221,6 +221,10 @@ void ElfMemImage::Init(const void *base)
    for (; dynamic_entry->d_tag != DT_NULL; ++dynamic_entry) {
@@ -15,3 +16,12 @@ $NetBSD: patch-third__party_abseil-cpp_a
      switch (dynamic_entry->d_tag) {
        case DT_HASH:
          sysv_hash = reinterpret_cast<uint32_t *>(value);
+@@ -377,7 +381,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;