CVS commit: pkgsrc/www/firefox
"Tobias Nygren" <[email protected]> Thu, 6 Aug 2026 18:17:21 +0000
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc
Committed By: tnn
Date: Thu Aug 6 18:17:21 UTC 2026
Modified Files:
pkgsrc/www/firefox: distinfo mozilla-common.mk
pkgsrc/www/firefox/patches:
patch-third__party_rust_mtu_src_bindings_netbsd.rs
Log Message:
firefox: remove target_arch=x86_64 cfg attr in patch
Fixes aarch64 build.
(target_pointer_width=64 should suffice here, NetBSD does not have x32
ABI for x86_64.)
To generate a diff of this commit:
cvs rdiff -u -r1.588 -r1.589 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.319 -r1.320 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/www/firefox/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed)
(text/x-diff, 7.4 KB)
Modified files:
Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.588 pkgsrc/www/firefox/distinfo:1.589
--- pkgsrc/www/firefox/distinfo:1.588 Wed Jul 29 13:58:19 2026
+++ pkgsrc/www/firefox/distinfo Thu Aug 6 18:17:20 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.588 2026/07/29 13:58:19 ryoon Exp $
+$NetBSD: distinfo,v 1.589 2026/08/06 18:17:20 tnn Exp $
BLAKE2s (firefox-153.0.1.source.tar.xz) = 6f1f0f7801c8fdb23a8b8f200e90134a3a957948dc571ef0b7220dada197db54
SHA512 (firefox-153.0.1.source.tar.xz) = 310d1aa27b7902ef5e052962e3b7d2819d0f5f6e596fddeafee53f09e9390d4801f5b654f4ca1e9fd4c15c71241fc31844afaa4d086f82c51b516a401fbe7f40
@@ -56,7 +56,7 @@ 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_rust_mtu_src_bindings_netbsd.rs) = c22e6994a925fbcccf54ac8a7308382e54bd5d0c
+SHA1 (patch-third__party_rust_mtu_src_bindings_netbsd.rs) = dc28ab3a4b6a5bee76ea6fd2485e34b9d6f1b195
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
Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.319 pkgsrc/www/firefox/mozilla-common.mk:1.320
--- pkgsrc/www/firefox/mozilla-common.mk:1.319 Tue Jul 21 15:25:01 2026
+++ pkgsrc/www/firefox/mozilla-common.mk Thu Aug 6 18:17:21 2026
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.319 2026/07/21 15:25:01 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.320 2026/08/06 18:17:21 tnn Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -45,7 +45,7 @@ CFLAGS+= -msse2
CKSUM_CRATES+= third_party/rust/mtu
CKSUMS+= 9fbb89ab042627182477b35adc61eed71cffada9d3d5d522766d6d369ad02d80
-CKSUMS+= 4c8629a6f530ccd50005ca6f8ee054d8e75f343ecf01849e40b16582309a19e1
+CKSUMS+= 986f84f01a44521224c7a7c1b1883cc6a4f89cbcb24b36844bfffea5f285747e
SUBST_CLASSES+= cksum
SUBST_STAGE.cksum= pre-configure
Index: pkgsrc/www/firefox/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs
diff -u pkgsrc/www/firefox/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs:1.2 pkgsrc/www/firefox/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs:1.3
--- pkgsrc/www/firefox/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs:1.2 Thu Jul 16 15:18:46 2026
+++ pkgsrc/www/firefox/patches/patch-third__party_rust_mtu_src_bindings_netbsd.rs Thu Aug 6 18:17:21 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_rust_mtu_src_bindings_netbsd.rs,v 1.2 2026/07/16 15:18:46 ryoon Exp $
+$NetBSD: patch-third__party_rust_mtu_src_bindings_netbsd.rs,v 1.3 2026/08/06 18:17:21 tnn 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.orig 2026-07-27 13:13:31.000000000 +0000
+++ third_party/rust/mtu/src/bindings/netbsd.rs
-@@ -5,8 +5,8 @@ pub const RTM_GET: u32 = 4;
+@@ -5,8 +5,8 @@ pub const RTAX_MAX: u32 = 9;
pub const RTA_DST: u32 = 1;
pub const RTA_IFP: u32 = 16;
pub const RTAX_MAX: u32 = 9;
@@ -15,54 +15,54 @@ $NetBSD: patch-third__party_rust_mtu_src
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 {
+@@ -19,8 +19,14 @@ const _: () = {
}
#[allow(clippy::unnecessary_operation, clippy::identity_op)]
const _: () = {
-+ #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
++ #[cfg(target_pointer_width = "64")]
["Size of timespec"][::std::mem::size_of::<timespec>() - 16usize];
-+ #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "64")))]
++ #[cfg(not(target_pointer_width = "64"))]
+ ["Size of timespec"][::std::mem::size_of::<timespec>() - 12usize];
-+ #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
++ #[cfg(target_pointer_width = "64")]
["Alignment of timespec"][::std::mem::align_of::<timespec>() - 8usize];
-+ #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "64")))]
++ #[cfg(not(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 {
+@@ -50,8 +56,14 @@ const _: () = {
}
#[allow(clippy::unnecessary_operation, clippy::identity_op)]
const _: () = {
-+ #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
++ #[cfg(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")))]
++ #[cfg(not(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"))]
++ #[cfg(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")))]
++ #[cfg(not(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 {
+@@ -102,7 +114,10 @@ const _: () = {
#[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"))]
++ #[cfg(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")))]
++ #[cfg(not(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 {
+@@ -143,7 +158,10 @@ const _: () = {
#[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"))]
++ #[cfg(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")))]
++ #[cfg(not(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];