CVS commit: pkgsrc/mail/thunderbird

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Nov 22 01:07:07 UTC 2025

Modified Files:
        pkgsrc/mail/thunderbird: distinfo mozilla-common.mk
        pkgsrc/mail/thunderbird/patches:
            patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc

Log Message:
mail/thunderbird: Fix build under NetBSD 10 at least

* Internal botan-3.8.1 requires GCC 11. Bump GCC_REQD again.
  Fix my build under NetBSD/amd64 10.


To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.290 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/thunderbird/mozilla-common.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/mail/thunderbird/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/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.289 pkgsrc/mail/thunderbird/distinfo:1.290
--- pkgsrc/mail/thunderbird/distinfo:1.289      Fri Nov 14 17:28:39 2025
+++ pkgsrc/mail/thunderbird/distinfo    Sat Nov 22 01:07:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.289 2025/11/14 17:28:39 ryoon Exp $
+$NetBSD: distinfo,v 1.290 2025/11/22 01:07:07 ryoon Exp $
 
 BLAKE2s (thunderbird-145.0.source.tar.xz) = 88880f965a7105fb87e159f77ad613af79c59dc343a69606b3bb23caf78e949b
 SHA512 (thunderbird-145.0.source.tar.xz) = f33835e4d740b32d072ac915124d988ef9d4cbe55d7c972c817991d19b64e8bc95b75b503ad3cb9abf4fd1d220fc7cb61720ea84dc49482faa13da1690d7d80e
@@ -37,7 +37,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-security_nss_lib_freebl_mpi_mpi.c) = 6cac13bc120d52b2c3628938d2fc1cba628b3a31
-SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc) = 4691eb3ad88134c9f6336b257246f1361f6a20a7
+SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc) = cc68e46f1b98bbcc064a4c61fc96a3c7ede8e6ba
 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) = 927532138175f99f96433d24060f65a2a919d2d1

Index: pkgsrc/mail/thunderbird/mozilla-common.mk
diff -u pkgsrc/mail/thunderbird/mozilla-common.mk:1.23 pkgsrc/mail/thunderbird/mozilla-common.mk:1.24
--- pkgsrc/mail/thunderbird/mozilla-common.mk:1.23      Fri Nov 14 17:28:39 2025
+++ pkgsrc/mail/thunderbird/mozilla-common.mk   Sat Nov 22 01:07:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.23 2025/11/14 17:28:39 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.24 2025/11/22 01:07:07 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -22,8 +22,9 @@ OVERRIDE_DIRDEPTH=            4
 
 USE_LANGUAGES+=                c c++
 
-# XXX: As of 145.0
-GCC_REQD+=             10
+# XXX: As of 145.0, Mozilla source code requires GCC 10.
+# XXX: Hoewever internal botan 3.8.1 requires GCC 11.
+GCC_REQD+=             11
 # To find vscanf, vfscanf, isblank and so on under NetBSD 9.
 CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
 

Index: pkgsrc/mail/thunderbird/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc
diff -u pkgsrc/mail/thunderbird/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc:1.2 
pkgsrc/mail/thunderbird/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc:1.3
--- pkgsrc/mail/thunderbird/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc:1.2        Fri Nov 14 17:28:39 2025
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc    Sat Nov 22 01:07:07 2025
@@ -1,20 +1,9 @@
-$NetBSD: patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc,v 1.2 2025/11/14 17:28:39 ryoon Exp $
+$NetBSD: patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc,v 1.3 2025/11/22 01:07:07 ryoon Exp $
 
 * NetBSD has no DT_GNU_HASH definition.
 
 --- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc.orig       2025-11-06 22:07:37.000000000 +0000
 +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
-@@ -25,6 +25,10 @@
- #include <cstddef>
- #include <cstdint>
- 
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "absl/base/config.h"
- #include "absl/base/internal/raw_logging.h"
- 
 @@ -221,6 +225,10 @@ void ElfMemImage::Init(const void *base)
    for (; dynamic_entry->d_tag != DT_NULL; ++dynamic_entry) {
      const auto value =
@@ -31,7 +20,7 @@ $NetBSD: patch-third__party_abseil-cpp_a
    ABSL_RAW_CHECK(symbol && version_symbol, "");
    const char *const symbol_name = image->GetDynstr(symbol->st_name);
 -#if defined(__NetBSD__)
-+#if defined(__NetBSD__) && __NetBSD_Version__ < 1199000400
++#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;