CVS commit: pkgsrc/mail/thunderbird

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Jul 23 13:52:24 UTC 2026

Modified Files:
        pkgsrc/mail/thunderbird: Makefile distinfo
        pkgsrc/mail/thunderbird/patches:
            patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp
            patch-python_sites_build.txt
            patch-third__party_sqlite3_ext_moz.build
Added Files:
        pkgsrc/mail/thunderbird/patches: patch-mozglue_misc_Now.cpp
            patch-third__party_rust_mtu_src_bindings_netbsd.rs
Removed Files:
        pkgsrc/mail/thunderbird/patches: patch-config_system-headers.mozbuild

Log Message:
mail/thunderbird: Update to 153.0

Changelog:
153.0:
What's New

new
Unified folders now display account color indicator with account name tooltip

new
OAuth login for mail accounts now opens in default web browser

new
Thundermail services can now be used without installing an add-on

new
OAuth responses now verify issuer fields and reject missing required issuers

What's Changed

changed
Removed Odnoklassniki chat setup and directed users to XMPP configuration

What's Fixed

fixed
Ctrl+S did not save PDF attachments opened in Thunderbird tabs

fixed
TLS errors incorrectly reported all unknown failures as untrusted certificates

fixed
Thunderbird could crash during shutdown

fixed
Thunderbird could crash when copying an empty list of messages

fixed
New mail alerts incorrectly sized or positioned on some multi-monitor setups

fixed
Old IMAP profile migration deleted INBOX and other mailbox files

fixed
Space bar did not scroll in PDF attachments opened from emails

fixed
'Search Messages' shortcut (Ctrl+Shift+F) failed in standalone message window

fixed
Folder location widget used non-localised name

fixed
Empty confirmation dialog when more messages opened in tabs than
mailnews.open_tab_warning

fixed
Removing tags from IMAP messages could fail and tags reappeared after refresh

fixed
Folder pane could not be horizontally resized in additional 3-pane tabs

fixed
Global search failed to display inaccessible messages found in local folders

fixed
Numeric subfolders were sorted alphabetically instead of naturally

fixed
Virtual folder folder-picker showed unlabeled IM account as selectable folder

fixed
Virtual folders failed to preserve the online search setting

fixed

Apple Mail OpenPGP emails failed to decrypt due to hidden recipient key ID

fixed
OpenPGP import of public key with experimental packets failed with unclear
error

fixed
Performance issue when decrypting encrypted messages

fixed
Opening messages with OpenPGP keys was slow and blocked the UI for large
keyrings

fixed
OpenPGP key refresh failed when fingerprint lookup returned multiple results

fixed
Invalid S/MIME encryption certificate caused misleading send errors

fixed
Esc cleared quick filter pin after changing folder

fixed
Dragging email address between compose windows failed to add recipients

fixed
Thunderbird could crash when using Find and Replace All

fixed
Sending Message dialog got stuck on "Filter complete." after successful send

fixed
Compose with PDF attachments opened PDFs instead of creating a new email

fixed
Attachments opened via -compose on Windows could use incorrect filenames

fixed
Ctrl+Enter opened attachment instead of sending the message

fixed
Compose window remained open when delayed sending was enabled

fixed
Account hub showed connection security instead of actual authentication method

fixed
Account Hub GSSAPI autoconfiguration incorrectly prompted for a password

fixed
New identity dialog lacked reply-matching and end-to-end encryption settings

fixed
Account Hub manual EWS setup lacked OAuth authentication option

fixed
Thunderbird could fail to shut down cleanly during active OAuth requests

fixed
Account Hub kept OAuth selected after changing to hostname without OAuth
support

fixed
Account Hub showed a false error when returning from EWS manual configuration

fixed
Account Hub autodetect wrongly prompted for a password when auth was
unavailable

fixed
QR exports with SMTP passwords generated invalid data for Thunderbird for
Android

fixed
Message Filters 'Run Now' button remained disabled after filter run or mail
check

fixed
Redirected CardDAV URLs resolved relative URLs against the wrong host

fixed
Thunderbird could crash when completing folder copy/move

fixed
Forwarding some Apple Mail messages incorrectly attached inline text as a file

fixed
Auto-compaction could corrupt database and cause crashes during syncs

fixed
NNTP server with invalid TLS certificate could not be added to certificate
exceptions

fixed
Sent message in EWS account showed message as unread in the sent items folder

fixed
EWS NTLM authentication triggered login failures despite successful syncs

fixed
Saving inline Exchange images used incorrect filenames and file types

fixed
Cancelled message send could not be retried and hung with SMTP timeout errors

fixed
EWS folders failed to show new mail notifications until the folder was selected

fixed
Corrupted NNTP account data caused excessive memory use and startup crash

fixed
Multiple selected IMAP folders could not be moved or deleted together

fixed
Non-Latin IMAP keywords were lowercased and encoded incorrectly as MUTF-7

fixed
Message tags were lost when moving folder from local folder to IMAP folder

fixed
Reply All button was missing for some EWS messages with multiple recipients

fixed
EWS users could not permanently delete individual Trash messages

fixed
Removing a chat account threw an exception and failed to clear the UI

fixed
Primary Password policy was detected but not enforced for saved account
passwords

fixed
Copying one recurring event occurrence failed to set the date when pasted

fixed
Calendar invites were incorrectly marked processed after calendar sync
completed

fixed
ICS event comments were not displayed in Thunderbird event details

fixed
Visual and UX improvements


To generate a diff of this commit:
cvs rdiff -u -r1.364 -r1.365 pkgsrc/mail/thunderbird/Makefile
cvs rdiff -u -r1.297 -r1.298 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/mail/thunderbird/patches/patch-config_system-headers.mozbuild
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/thunderbird/patches/patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp \
    pkgsrc/mail/thunderbird/patches/patch-python_sites_build.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/thunderbird/patches/patch-mozglue_misc_Now.cpp \
    pkgsrc/mail/thunderbird/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/mail/thunderbird/patches/patch-third__party_sqlite3_ext_moz.build

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/Makefile
diff -u pkgsrc/mail/thunderbird/Makefile:1.364 pkgsrc/mail/thunderbird/Makefile:1.365
--- pkgsrc/mail/thunderbird/Makefile:1.364      Wed Jul 22 15:46:00 2026
+++ pkgsrc/mail/thunderbird/Makefile    Thu Jul 23 13:52:23 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.364 2026/07/22 15:46:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.365 2026/07/23 13:52:23 ryoon Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird-${TB_VER:S/esr//}
-TB_VER=                152.0.1
+TB_VER=                153.0
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.297 pkgsrc/mail/thunderbird/distinfo:1.298
--- pkgsrc/mail/thunderbird/distinfo:1.297      Wed Jul 22 15:46:00 2026
+++ pkgsrc/mail/thunderbird/distinfo    Thu Jul 23 13:52:23 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.297 2026/07/22 15:46:00 ryoon Exp $
+$NetBSD: distinfo,v 1.298 2026/07/23 13:52:23 ryoon Exp $
 
-BLAKE2s (thunderbird-152.0.1.source.tar.xz) = 5b97fd14b612319e48de5f2c1b9170f96f662626c6fdb6da10d238b422ebc900
-SHA512 (thunderbird-152.0.1.source.tar.xz) = f66c87de4dd73c3c45e420a55d76c3cb6ac091a61794ccf58ba59d1a40cf8001dee19a6a7f4c6bef7d36ea94ed4e4f677449d3006b2004abbd3fab42ad1c9228
-Size (thunderbird-152.0.1.source.tar.xz) = 936225660 bytes
+BLAKE2s (thunderbird-153.0.source.tar.xz) = 96434fcfe727fd8036e9342911cab7bfe048619db0e6fd16a28023668bb43baf
+SHA512 (thunderbird-153.0.source.tar.xz) = f77bde3dd0933dd35870a889386c41d55ff0cbe276ec3373b27e9885f7db7e35529e7ecc2fc149ae4f8c5ae53eddb3ad444e7499a850a59a82b8940c7a4c7747
+Size (thunderbird-153.0.source.tar.xz) = 944561040 bytes
 SHA1 (patch-browser_app_profile_firefox.js) = 1eaa674c0aa8279e2f9dc2eda582650a08156d65
 SHA1 (patch-build_gn__processor.py) = 078f773104bf4c1b30584564aefe365db6ba6daf
 SHA1 (patch-build_moz.configure_init.configure) = 65deb3c233df0aab81eb1fca05d708e5a4ed169a
@@ -13,9 +13,8 @@ SHA1 (patch-comm_third__party_libgcrypt_
 SHA1 (patch-comm_third__party_openpgp.configure) = 674e8a741d82f576549aa0bb44465d3a2577a212
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = af24d07b6852caa6f1f2c8f5da3cd31e9446b6cf
 SHA1 (patch-config_makefiles_rust.mk) = 25eb2d4c99ace2b215917490f28ceb90ab90145f
-SHA1 (patch-config_system-headers.mozbuild) = 8a628765291085efe6a22da28c0ff99fbc3c5e6f
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
-SHA1 (patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp) = b7f8d8b82e4545b97643fbbea7fa72a4cc2ecaf8
+SHA1 (patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp) = 2f471067387bb63d530ba1299f0542d3b3a785b6
 SHA1 (patch-dom_media_webrtc_libwebrtc__overrides_moz.build) = a2ff7cf1e6aaf888ee78581d89c7e658f46c3fcd
 SHA1 (patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp) = b93b4c6367bd2fb3d1868ab7d97ca56c100be414
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
@@ -37,10 +36,11 @@ SHA1 (patch-js_src_vm_TypedArrayObject-i
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = d0bdc30d23447bd56185eb9dc5c86de591f9cc02
 SHA1 (patch-media_libpng_pngpriv.h) = ee952a703ee08e8ff2269c7178e55e00b12faa29
 SHA1 (patch-memory_build_mozjemalloc__types.h) = af87ef935653cb845a6b702af2f5645a6ada27db
+SHA1 (patch-mozglue_misc_Now.cpp) = 760724be1bdc4ca6e19edaf2c8df6dd84192d93f
 SHA1 (patch-netwerk_protocol_http_nsHttpHandler.cpp) = 67493b4635041d21ff9fbfda80b3197fed542a26
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 753fd4d62088c870aefe7c4b739286259848446e
 SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = 5be4183d9075f5a3a3c6b3e0338473af185fb50e
-SHA1 (patch-python_sites_build.txt) = f60f28480179edb47c8dcf84e3247aa6704c2610
+SHA1 (patch-python_sites_build.txt) = f03f059bbe79bfdf7f1db5475279edb3c9d6ebed
 SHA1 (patch-python_sites_mach.txt) = f1568a4a7e65a6811e97f8c9c76148c9cdb7e02a
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = 6cac13bc120d52b2c3628938d2fc1cba628b3a31
 SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc) = cc68e46f1b98bbcc064a4c61fc96a3c7ede8e6ba
@@ -57,7 +57,8 @@ SHA1 (patch-third__party_libwebrtc_rtc__
 SHA1 (patch-third__party_libwebrtc_rtc__base_physical__socket__server.cc) = 6909c4da9e7b3785252e5bce9be0ff47ebb87e01
 SHA1 (patch-third__party_libwebrtc_rtc__base_platform__thread__types.cc) = 8ae75100775037347008d168eedc151e0e993b0f
 SHA1 (patch-third__party_python_dlmanager_check.py) = 69054522d8ced8cb47e65e5a8b1a87ed5ce6708e
-SHA1 (patch-third__party_sqlite3_ext_moz.build) = 53248ac4ba98983362b173d7644f1001f5127b3c
+SHA1 (patch-third__party_rust_mtu_src_bindings_netbsd.rs) = c22e6994a925fbcccf54ac8a7308382e54bd5d0c
+SHA1 (patch-third__party_sqlite3_ext_moz.build) = 4d94ea324617a20b3524016dd02fb717e518ece1
 SHA1 (patch-third__party_sqlite3_src_moz.build) = b26856a4b87aa12211575d9982f62dc899474b52
 SHA1 (patch-third__party_wasm2c_src_c-writer.cc) = 38eb2ee0e00722aa1380540b83648b43723719aa
 SHA1 (patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc) = 99d0db944f0c2d0c623460991efd423d9127c988

Index: pkgsrc/mail/thunderbird/patches/patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp
diff -u pkgsrc/mail/thunderbird/patches/patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp:1.1 
pkgsrc/mail/thunderbird/patches/patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp:1.2
--- pkgsrc/mail/thunderbird/patches/patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp:1.1       Thu Jan 22 19:41:09 2026
+++ pkgsrc/mail/thunderbird/patches/patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp   Thu Jul 23 13:52:23 2026
@@ -1,13 +1,13 @@
-$NetBSD: patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp,v 1.1 2026/01/22 19:41:09 ryoon Exp $
+$NetBSD: patch-dom_media_mediacapabilities_MediaCapabilitiesValidation.cpp,v 1.2 2026/07/23 13:52:23 ryoon Exp $
 
---- dom/media/mediacapabilities/MediaCapabilitiesValidation.cpp.orig   2026-01-03 09:52:49.089840762 +0000
+--- dom/media/mediacapabilities/MediaCapabilitiesValidation.cpp.orig   2026-07-13 13:09:12.000000000 +0000
 +++ dom/media/mediacapabilities/MediaCapabilitiesValidation.cpp
-@@ -199,7 +199,7 @@ ValidationResult IsValidVideoConfiguration(const Video
+@@ -263,7 +263,7 @@ ValidationResult IsValidVideoConfiguration(const Video
  
    // Step 1: If framerate is not finite or is not greater than 0,
    // return false and abort these steps.
 -  if (!isfinite(aConfig.mFramerate) || !(aConfig.mFramerate > 0)) {
 +  if (!std::isfinite(aConfig.mFramerate) || !(aConfig.mFramerate > 0)) {
      ValidationResult err = Err(ValidationError::FramerateInvalid);
-     LOG(("[Invalid VideoConfiguration (Framerate, %s) #1] Rejecting '%s'\n",
+     LOG(("[Invalid VideoConfiguration (Framerate, {}) #1] Rejecting '{}'\n",
           EnumValueToString(err.unwrapErr()),
Index: pkgsrc/mail/thunderbird/patches/patch-python_sites_build.txt
diff -u pkgsrc/mail/thunderbird/patches/patch-python_sites_build.txt:1.1 pkgsrc/mail/thunderbird/patches/patch-python_sites_build.txt:1.2
--- pkgsrc/mail/thunderbird/patches/patch-python_sites_build.txt:1.1    Sat Jun  6 14:51:30 2026
+++ pkgsrc/mail/thunderbird/patches/patch-python_sites_build.txt        Thu Jul 23 13:52:23 2026
@@ -1,15 +1,15 @@
-$NetBSD: patch-python_sites_build.txt,v 1.1 2026/06/06 14:51:30 ryoon Exp $
+$NetBSD: patch-python_sites_build.txt,v 1.2 2026/07/23 13:52:23 ryoon Exp $
 
 * We are offline, so do not try to download from pypi.
   No need to wait a timeout.
 
---- python/sites/build.txt.orig        2026-04-20 11:41:31.080178018 +0000
+--- python/sites/build.txt.orig        2026-07-13 13:09:21.000000000 +0000
 +++ python/sites/build.txt
 @@ -1,6 +1,6 @@ pth:third_party/python/vsdownload
  requires-python:>=3.9
  pth:third_party/python/vsdownload
--pypi-optional:taskcluster-taskgraph==20.0.0:toolchain artifacts will not be bootstrapped
-+#pypi-optional:taskcluster-taskgraph==20.0.0:toolchain artifacts will not be bootstrapped
+-pypi-optional:taskcluster-taskgraph==24.1.1:toolchain artifacts will not be bootstrapped
++#pypi-optional:taskcluster-taskgraph==24.1.1:toolchain artifacts will not be bootstrapped
  vendored:testing/web-platform/tests/tools/third_party/h2/src
  vendored:testing/web-platform/tests/tools/third_party/hpack/src
  vendored:testing/web-platform/tests/tools/third_party/html5lib

Index: pkgsrc/mail/thunderbird/patches/patch-third__party_sqlite3_ext_moz.build
diff -u pkgsrc/mail/thunderbird/patches/patch-third__party_sqlite3_ext_moz.build:1.2 pkgsrc/mail/thunderbird/patches/patch-third__party_sqlite3_ext_moz.build:1.3
--- pkgsrc/mail/thunderbird/patches/patch-third__party_sqlite3_ext_moz.build:1.2        Wed Jul 23 19:18:45 2025
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_sqlite3_ext_moz.build    Thu Jul 23 13:52:23 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_sqlite3_ext_moz.build,v 1.2 2025/07/23 19:18:45 ryoon Exp $
+$NetBSD: patch-third__party_sqlite3_ext_moz.build,v 1.3 2026/07/23 13:52:23 ryoon Exp $
 
---- third_party/sqlite3/ext/moz.build.orig     2025-07-02 01:08:50.000000000 +0000
+--- third_party/sqlite3/ext/moz.build.orig     2026-07-13 13:09:31.000000000 +0000
 +++ third_party/sqlite3/ext/moz.build
-@@ -21,7 +21,7 @@ SOURCES += [
-     "sqlite-vec/sqlite-vec.c",
- ]
+@@ -30,7 +30,7 @@ DEFINES["SQLITE_VEC_ENABLE_DISKANN"] = 0
+ # In this release we're not using DISKANN so remove to save space
+ DEFINES["SQLITE_VEC_ENABLE_DISKANN"] = 0
  
 -if CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "Android":
 +if CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "Android" or CONFIG["OS_TARGET"] == "FreeBSD" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD":

Added files:

Index: pkgsrc/mail/thunderbird/patches/patch-mozglue_misc_Now.cpp
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-mozglue_misc_Now.cpp:1.1
--- /dev/null   Thu Jul 23 13:52:24 2026
+++ pkgsrc/mail/thunderbird/patches/patch-mozglue_misc_Now.cpp  Thu Jul 23 13:52:23 2026
@@ -0,0 +1,27 @@
+$NetBSD: patch-mozglue_misc_Now.cpp,v 1.1 2026/07/23 13:52:23 ryoon Exp $
+
+* If CLOCK_BOOTTIME is not available, return 0 instead of Nothing().
+  This fixes incorrect assert at AudioSessionManager.cpp:57 introduced
+  in 153.0.
+
+--- mozglue/misc/Now.cpp.orig  2026-07-23 01:36:06.678846874 +0000
++++ mozglue/misc/Now.cpp
+@@ -89,16 +89,13 @@ Maybe<uint64_t> NowIncludingSuspendMs() {
+ }
+ 
+ Maybe<uint64_t> NowIncludingSuspendMs() {
+-#  ifndef CLOCK_BOOTTIME
+-  return Nothing();
+-#  else
+   struct timespec ts = {0};
+-
++#  ifdef CLOCK_BOOTTIME
+   if (clock_gettime(CLOCK_BOOTTIME, &ts)) {
+     return Nothing();
+   }
+-  return Some(TimespecToMilliseconds(ts));
+ #  endif
++  return Some(TimespecToMilliseconds(ts));
+ }
+ 
+ #else  // catch all
Index: pkgsrc/mail/thunderbird/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs:1.1
--- /dev/null   Thu Jul 23 13:52:24 2026
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs  Thu Jul 23 13:52:23 2026
@@ -0,0 +1,69 @@
+$NetBSD: patch-third__party_rust_mtu_src_bindings_netbsd.rs,v 1.1 2026/07/23 13:52:23 ryoon Exp $
+
+* Fix build under NetBSD/i386 10.
+
+--- third_party/rust/mtu/src/bindings/netbsd.rs.orig   2026-07-06 16:26:59.000000000 +0000
++++ third_party/rust/mtu/src/bindings/netbsd.rs
+@@ -5,8 +5,8 @@ pub const RTM_GET: u32 = 4;
+ pub const RTA_DST: u32 = 1;
+ pub const RTA_IFP: u32 = 16;
+ pub const RTAX_MAX: u32 = 9;
+-pub type __int32_t = ::std::os::raw::c_int;
+-pub type __int64_t = ::std::os::raw::c_long;
++pub type __int32_t = i32;
++pub type __int64_t = i64;
+ pub type __pid_t = __int32_t;
+ pub type u_char = ::std::os::raw::c_uchar;
+ pub type u_short = ::std::os::raw::c_ushort;
+@@ -19,8 +19,14 @@ pub struct timespec {
+ }
+ #[allow(clippy::unnecessary_operation, clippy::identity_op)]
+ const _: () = {
++    #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+     ["Size of timespec"][::std::mem::size_of::<timespec>() - 16usize];
++    #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "64")))]
++    ["Size of timespec"][::std::mem::size_of::<timespec>() - 12usize];
++    #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+     ["Alignment of timespec"][::std::mem::align_of::<timespec>() - 8usize];
++    #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "64")))]
++    ["Alignment of timespec"][::std::mem::align_of::<timespec>() - 4usize];
+     ["Offset of field: timespec::tv_sec"][::std::mem::offset_of!(timespec, tv_sec) - 0usize];
+     ["Offset of field: timespec::tv_nsec"][::std::mem::offset_of!(timespec, tv_nsec) - 8usize];
+ };
+@@ -50,8 +56,14 @@ pub struct if_data {
+ }
+ #[allow(clippy::unnecessary_operation, clippy::identity_op)]
+ const _: () = {
++    #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+     ["Size of if_data"][::std::mem::size_of::<if_data>() - 136usize];
++    #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "64")))]
++    ["Size of if_data"][::std::mem::size_of::<if_data>() - 132usize];
++    #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+     ["Alignment of if_data"][::std::mem::align_of::<if_data>() - 8usize];
++    #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "64")))]
++    ["Alignment of if_data"][::std::mem::align_of::<if_data>() - 4usize];
+     ["Offset of field: if_data::ifi_type"][::std::mem::offset_of!(if_data, ifi_type) - 0usize];
+     ["Offset of field: if_data::ifi_addrlen"]
+         [::std::mem::offset_of!(if_data, ifi_addrlen) - 1usize];
+@@ -102,7 +114,10 @@ pub struct rt_metrics {
+ #[allow(clippy::unnecessary_operation, clippy::identity_op)]
+ const _: () = {
+     ["Size of rt_metrics"][::std::mem::size_of::<rt_metrics>() - 80usize];
++    #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+     ["Alignment of rt_metrics"][::std::mem::align_of::<rt_metrics>() - 8usize];
++    #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "64")))]
++    ["Alignment of rt_metrics"][::std::mem::align_of::<rt_metrics>() - 4usize];
+     ["Offset of field: rt_metrics::rmx_locks"]
+         [::std::mem::offset_of!(rt_metrics, rmx_locks) - 0usize];
+     ["Offset of field: rt_metrics::rmx_mtu"][::std::mem::offset_of!(rt_metrics, rmx_mtu) - 8usize];
+@@ -143,7 +158,10 @@ pub struct rt_msghdr {
+ #[allow(clippy::unnecessary_operation, clippy::identity_op)]
+ const _: () = {
+     ["Size of rt_msghdr"][::std::mem::size_of::<rt_msghdr>() - 120usize];
++    #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+     ["Alignment of rt_msghdr"][::std::mem::align_of::<rt_msghdr>() - 8usize];
++    #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "64")))]
++    ["Alignment of rt_msghdr"][::std::mem::align_of::<rt_msghdr>() - 4usize];
+     ["Offset of field: rt_msghdr::rtm_msglen"]
+         [::std::mem::offset_of!(rt_msghdr, rtm_msglen) - 0usize];
+     ["Offset of field: rt_msghdr::rtm_version"]