From cc215b865294243144a946dc1e220f170a193975 Mon Sep 17 00:00:00 2001
From: John McQuah <jmcquah@disroot.org>
Date: Sun, 19 May 2024 23:29:53 +0000
Subject: [PATCH] firefox: updated to version 126.0

---
 firefox/.signature |  6 +++---
 firefox/Pkgfile    | 14 ++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/firefox/.signature b/firefox/.signature
index b779b6d15..a166c5ca1 100644
--- a/firefox/.signature
+++ b/firefox/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31Fn0/E15o31bEcwv+pxlRPDFVmSJCVJa7z7RwNcWqrpv7vYgMTCCkmYhJrKWSLVW7Lxkt2rEuOP54J0/dIrxA8=
-SHA256 (Pkgfile) = f8775ebbf8e01f8ee257b9428b3862b19f90073aa187656b9970c44a5429eb9f
+RWSagIOpLGJF3+oeA3D5TG6bFF5xNMKcEU5O8taoCupH/ux0wgSp7XQbMo9DEbKJ1umiQ8IQJTS9oWUhKvTl1cgYKvnxTnxY+AU=
+SHA256 (Pkgfile) = b94ca8f4c7c2e6f22a68c94c86730a46cfe2401f97ebf84e155a9ba40ef89426
 SHA256 (.footprint) = c6149f123c43d45e03a0d84332c26a699352ffb2a6fc005dd4d69efd6a056cf8
-SHA256 (firefox-125.0.3.source.tar.xz) = 461c66b85e4a0345dcce422d3b66212489f3cca8f22a9a8f43a07a0c98bd5616
+SHA256 (firefox-126.0.source.tar.xz) = 910e82a1999ec229e5bc5090a39cec9c575e8bafcac2c54f9bb5c699bd868526
 SHA256 (firefox.desktop) = 05bd1a4e283bc68f525f87cabf35ad0a59e5e63e107ce3901a4ac73e3d16ef33
 SHA256 (icu-linebreak-classes.patch) = bdfd2a93be5eed5c723ae67b308c4c2d9ed91d3173839fe560a7ca47946c7813
 SHA256 (node-stdout-nonblocking-wrapper) = bb8c503015e49ed1b152225bdc56cf502cd831f35962d113dcbb9121967f3523
diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index b13fe5d80..ccd818be0 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -5,7 +5,7 @@
 # Optional: apulse jack pulseaudio pipewire sndio sccache lld wasi-libc++ wayland
 
 name=firefox
-version=125.0.3
+version=126.0
 release=1
 source=(https://ftp.mozilla.org/pub/$name/releases/$version/source/$name-$version.source.tar.xz
   firefox.desktop
@@ -20,8 +20,8 @@ build() {
   done
 
   if [ "$(/usr/bin/python3 -c "import sys; print(sys.stdout.encoding)")" != 'utf-8' ]; then
-  	printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n"
-  	exit 1
+    printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n"
+    exit 1
   fi
 
   prt-get isinst sccache && export RUSTC_WRAPPER='/usr/bin/sccache'
@@ -47,7 +47,6 @@ cat <<- EOF > .mozconfig
   ac_add_options --enable-system-pixman
   ac_add_options --enable-optimize
   ac_add_options --enable-release
-  ac_add_options --enable-rust-simd
   ac_add_options --enable-sandbox
   ac_add_options --enable-official-branding
   ac_add_options --with-distribution-id=nu.crux
@@ -61,6 +60,13 @@ cat <<- EOF > .mozconfig
   ac_add_options --disable-elf-hack
 EOF
 
+  # disable packed_simd with rust >= 1.78.0, because the bundled crate in this tarball 
+  # relies on a deprecated API (see https://bugzilla.mozilla.org/show_bug.cgi?id=1896958).
+  # But keep enabling the simd speedup for users who locked rust to an older version.
+  local rustVer=$(rustc --version | cut -d' ' -f2 | sed 's/\.[[:digit:]]*$//')
+  awk -v rV=$rustVer 'BEGIN { if ( rV < 1.78 ) print "ac_add_options --enable-rust-simd" }' \
+         >> .mozconfig
+
   # audio
   PKGMK_FFAUDIO="alsa"
   [ -e /usr/lib/libpulse.so -o -e /usr/lib/apulse/libpulse.so ] && PKGMK_FFAUDIO+=",pulseaudio"