CVS commit: pkgsrc/www/firefox

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Jun  4 09:26:35 UTC 2023

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo mozilla-common.mk
        pkgsrc/www/firefox/files: node-wrapper.sh
        pkgsrc/www/firefox/patches: patch-Cargo.lock
            patch-browser_app_profile_firefox.js patch-config_makefiles_rust.mk
Added Files:
        pkgsrc/www/firefox/patches:
            patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp
            patch-toolkit_xre_glxtest.cpp
Removed Files:
        pkgsrc/www/firefox/patches: patch-mozglue_misc_Uptime.cpp
            patch-third-party_rust_authenticator_src_transport_netbsd_device.rs

Log Message:
firefox: Update to 113.0.2

* Not tested under NetBSD/i386 and 9 for this commit. If you find problems,
  please report your failure to me.
* Disable WebGL for a while to avoid runtime errors under NetBSD.
* Do not pass '-j1 -j1' to cargo when MAKE_JOBS=1.
* Do not restrict cargo to unconditional -j1.
* Use ffmpeg6 instead of ffmpeg5.

Changelog:
113.0.2

Fixed

  * Fixed an issue which caused Picture-in-Picture windows to not be snappable
    on Windows 11 or on systems with the FancyZones PowerToy installed (bug
    1832331)

  * Fixed a video playback crash on some Windows systems with Intel graphics (
    bug 1831329)

  * Fixed a bug which could cause Firefox to freeze on some pages when loading
    them with the Developer Tools Web Console open (bug 1828026)

  * Fixed a bug which would cause the bookmarks and history sidebars to not
    properly react to the browser window being vertically resized (bug 1831535)

113.0.1

Fixed

  * Fixed incorrect colors for Windows users with installed monitor/display
    color profiles, particularly on wide gamut displays (bug 1832215)

  * Fixed borders being visible around fullscreen windows for some
    configurations (bug 1830721)

  * Fixed an issue which may cause users in some configurations to experience
    tearing when watching videos in fullscreen mode (bug 1830792)

113.0

New

  * Say hello to enhanced Picture-in-Picture! Rewind, check video duration, and
    effortlessly switch to full-screen mode on the web's most popular video
    websites.

  * Firefox's address bar is already a great place to search for what you're
    looking for. Now you'll always be able to see your web search terms and
    refine them while viewing your search's results - no additional scrolling
    needed! Also, a new result menu has been added making it easier to remove
    history results and dismiss sponsored Firefox Suggest entries.
    Image demonstrating search terms persisting in the address bar after
    hitting Enter for easier editing

  * Private windows now protect users even better by blocking third-party
    cookies and storage of content trackers.

  * Passwords automatically generated by Firefox now include special
    characters, giving users more secure passwords by default.

  * Firefox 113 introduces a redesigned accessibility engine which
    significantly improves the speed, responsiveness, and stability of Firefox
    when used with:

      + Screen readers, as well as certain other accessibility software;
      + East Asian input methods;
      + Enterprise single sign-on software; and
      + Other applications which use accessibility frameworks to access
        information.
  * Importing bookmarks from Safari or a Chrome-based browser? The favicons for
    those bookmarks will now also be imported by default to make them easier to
    identify.

  * Firefox 113 now supports AV1 Image Format files containing animations
    (AVIS), improving support for AVIF images across the web.

  * The Windows GPU sandbox first shipped in the Firefox 110 release has been
    tightened to enhance the security benefits it provides.

  * A 13-year-old feature request was fulfilled and Firefox now supports files
    being drag-and-dropped directly from Microsoft Outlook. A special thanks to
    volunteer contributor Marco Spiess for helping to get this across the
    finish line!

  * Users on macOS can now access the Services sub-menu directly from Firefox
    context menus.

  * On Windows, the elastic overscroll effect has been enabled by default. When
    two-finger scrolling on the touchpad or scrolling on the touchscreen, you
    will now see a bouncing animation when scrolling past the edge of a scroll
    container.

  * Firefox is now available in the Tajik (tg) language.

Fixed

  * Various security fixes.

Changed

  * The long-deprecated mozRTCPeerConnection, mozRTCIceCandidate, and
    mozRTCSessionDescription WebRTC interfaces have been removed. Sites should
    utilize the non-prefixed versions instead.

Security fixes:
#CVE-2023-32205: Browser prompts could have been obscured by popups
#CVE-2023-32206: Crash in RLBox Expat driver
#CVE-2023-32207: Potential permissions request bypass via clickjacking
#CVE-2023-32208: Leak of script base URL in service workers via import()
#CVE-2023-32209: Persistent DoS via favicon image
#CVE-2023-32210: Incorrect principal object ordering
#CVE-2023-32211: Content process crash due to invalid wasm code
#CVE-2023-32212: Potential spoof due to obscured address bar
#CVE-2023-32213: Potential memory corruption in FileReader::DoReadData()
#MFSA-TMP-2023-0002: Race condition in dav1d decoding
#CVE-2023-32214: Potential DoS via exposed protocol handlers
#CVE-2023-32215: Memory safety bugs fixed in Firefox 113 and Firefox ESR 102.11
#CVE-2023-32216: Memory safety bugs fixed in Firefox 113


To generate a diff of this commit:
cvs rdiff -u -r1.557 -r1.558 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.496 -r1.497 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.252 -r1.253 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/firefox/files/node-wrapper.sh
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox/patches/patch-Cargo.lock
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/www/firefox/patches/patch-mozglue_misc_Uptime.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/firefox/patches/patch-third-party_rust_authenticator_src_transport_netbsd_device.rs
cvs rdiff -u -r0 -r1.6 \
    pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.557 pkgsrc/www/firefox/Makefile:1.558
--- pkgsrc/www/firefox/Makefile:1.557   Fri Jun  2 18:47:20 2023
+++ pkgsrc/www/firefox/Makefile Sun Jun  4 09:26:35 2023
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.557 2023/06/02 18:47:20 wiz Exp $
+# $NetBSD: Makefile,v 1.558 2023/06/04 09:26:35 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            112.0
-MOZ_BRANCH_MINOR=      .1
+MOZ_BRANCH=            113.0
+MOZ_BRANCH_MINOR=      .2
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
-PKGREVISION=   5
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
 
-NODEJSKIT=             nodejs-output-111.0.tgz
+NODEJSKIT=             nodejs-output-113.0.2.tgz
 DISTFILES=             ${DEFAULT_DISTFILES} ${NODEJSKIT}
 SITES.${NODEJSKIT}=    ${MASTER_SITE_LOCAL}
 
@@ -46,8 +45,6 @@ LICENSE=      mpl-1.1
 #
 # -----------------------------------------------------------------------
 
-UNLIMIT_RESOURCES+=    datasize virtualsize
-
 WRKSRC=                ${WRKDIR}/firefox-${FIREFOX_VER:C/b.*//}
 
 MOZILLA_DIR=   # empty

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.496 pkgsrc/www/firefox/distinfo:1.497
--- pkgsrc/www/firefox/distinfo:1.496   Fri Apr 28 18:56:22 2023
+++ pkgsrc/www/firefox/distinfo Sun Jun  4 09:26:35 2023
@@ -1,18 +1,19 @@
-$NetBSD: distinfo,v 1.496 2023/04/28 18:56:22 maya Exp $
+$NetBSD: distinfo,v 1.497 2023/06/04 09:26:35 ryoon Exp $
 
-BLAKE2s (firefox-112.0.1.source.tar.xz) = e0ea6615a9eb3b64e8888527ab2b17d1ea530bbd9f98aae36981dc8f51cc7aef
-SHA512 (firefox-112.0.1.source.tar.xz) = 23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50
-Size (firefox-112.0.1.source.tar.xz) = 506649248 bytes
-BLAKE2s (nodejs-output-111.0.tgz) = 5e61c766822fdb7f5ef9e358de2ed00ba1c5074a2dad1e1d491772532f2bfe09
-SHA512 (nodejs-output-111.0.tgz) = 79ff7d122c48453a10312918b315acbe8dff6695042311be1b4aaa69c59fb77c7c14affc4f24fe23d9a6707d4c4dccf90c063e0f3af7de5807cdc45df5d0829e
-Size (nodejs-output-111.0.tgz) = 208870 bytes
-SHA1 (patch-Cargo.lock) = 36e15ec468dda2102469354276cb9e46b1a734ac
+BLAKE2s (firefox-113.0.2.source.tar.xz) = b9ec55cc7b6cd65a375d70a5491a255e8b01b739c42fa541f61f05c0ab17b47f
+SHA512 (firefox-113.0.2.source.tar.xz) = 7b1ff7d547fda02901f54a2593e03598a830698192003d833e27b85db0e00571ff66e03ebd4089e76fa65b09df000cbb2542450beeabb0b310875910603e6743
+Size (firefox-113.0.2.source.tar.xz) = 500503164 bytes
+BLAKE2s (nodejs-output-113.0.2.tgz) = da79ce7a5ab44378ac326caaa496dc5592bfb645b24b09f11c241933dc8ebb86
+SHA512 (nodejs-output-113.0.2.tgz) = 83c7f21ec8bd1af66aa7ffa4d0ab442c41946f470918100ae50c7792182ed94afc588161a5142cdfbc71b85049beb3c660fce22444fca736a326810cfd8c1d4b
+Size (nodejs-output-113.0.2.tgz) = 216297 bytes
+SHA1 (patch-Cargo.lock) = 6cedfbc82aa0af21e99e8b1035a9d17a28be3d62
 SHA1 (patch-Cargo.toml) = e5478a9268b5891b42573b1954ff584877c75bc1
-SHA1 (patch-browser_app_profile_firefox.js) = 18041d7fe211d61578863cfc53349278925f8e56
+SHA1 (patch-browser_app_profile_firefox.js) = 3b01cf7e37ea39bdd358fb14de5ce382b945ae39
 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a
-SHA1 (patch-config_makefiles_rust.mk) = 188178b184d79737247ed3770cc8f4370cd7f6c0
+SHA1 (patch-config_makefiles_rust.mk) = 38c613cd87a9c3f868179caaab6e8a029eafd65f
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
+SHA1 (patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp) = b93b4c6367bd2fb3d1868ab7d97ca56c100be414
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = b2adce9e65662283a11b6dcff40e95523e940045
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
@@ -29,10 +30,8 @@ SHA1 (patch-media_ffvpx_libavutil_arm_bs
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
 SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f
 SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e
-SHA1 (patch-mozglue_misc_Uptime.cpp) = daefe25ef1ebc8e4d3735017b9e8ac68c4710a00
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = b0d1f6a6e0eb852b0fd0238ad3f8ed3166c60a50
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
-SHA1 (patch-third-party_rust_authenticator_src_transport_netbsd_device.rs) = cb914efb0bd1b9a46dde1661230c7e09e49fc9e0
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
 SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc) = 455be625b5de2f6f1f4b2dbb6c8cb33ca16c2583
 SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4l2.cc) = 8848fb05c1e8b45234f74db71602a8a84c0404a4
@@ -43,6 +42,7 @@ SHA1 (patch-toolkit_components_terminato
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 2303b753066298305ccae80d72765dbc4da5e0dc
 SHA1 (patch-toolkit_moz.configure) = c183f8b1566ffed0df17bf856f693b3a288affeb
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
+SHA1 (patch-toolkit_xre_glxtest.cpp) = 8a6cf6976615130dcbf8c63d9c7d79cd47351894
 SHA1 (patch-widget_gtk_DMABufSurface.cpp) = b07836c49c0c9c85e7923d3297ad674453165522
 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 81d43a046fcef6bf6717d52485686ba8e8738254

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.252 pkgsrc/www/firefox/mozilla-common.mk:1.253
--- pkgsrc/www/firefox/mozilla-common.mk:1.252  Fri Jun  2 18:47:20 2023
+++ pkgsrc/www/firefox/mozilla-common.mk        Sun Jun  4 09:26:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.252 2023/06/02 18:47:20 wiz Exp $
+# $NetBSD: mozilla-common.mk,v 1.253 2023/06/04 09:26:35 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -135,6 +135,20 @@ SUBST_MESSAGE.fix-libpci-soname=   Fixing 
 SUBST_FILES.fix-libpci-soname+=                ${MOZILLA_DIR}toolkit/xre/glxtest.cpp
 SUBST_SED.fix-libpci-soname+=          -e 's,"libpci.so, "lib${PCIUTILS_LIBNAME}.so,'
 
+# Do not pass '-j1 -j1' for MAKE_JOBS=1 for NetBSD 9.3 or rearlier.
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090400
+RUST_MAKE_JOBS=                # empty by default
+.  if ${MAKE_JOBS} > 1
+RUST_MAKE_JOBS=                -j1 # for MAKE_JOBS=1, RUST_MAKE_JOBS should be empty.
+.  endif
+.endif
+
+SUBST_CLASSES+=                njobs
+SUBST_STAGE.njobs=     pre-configure
+SUBST_MESSAGE.njobs=   Setting MAKE_JOBS for cairo
+SUBST_FILES.njobs+=    ${MOZILLA_DIR}config/makefiles/rust.mk
+SUBST_VARS.njobs+=     RUST_MAKE_JOBS
+
 # Workaround for link of libxul.so as of 96.0.
 # There are too many -ldl under third_paty/libwebrtc.
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/www/firefox/files/node-wrapper.sh
diff -u pkgsrc/www/firefox/files/node-wrapper.sh:1.6 pkgsrc/www/firefox/files/node-wrapper.sh:1.7
--- pkgsrc/www/firefox/files/node-wrapper.sh:1.6        Wed Apr  5 14:22:35 2023
+++ pkgsrc/www/firefox/files/node-wrapper.sh    Sun Jun  4 09:26:35 2023
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-VERS=v19.7.0
+VERS=v20.2.0
 
 if [ "$1" = "-v" ] || [ "$1" = "--version" ]; then
        printf "${VERS}\n"

Index: pkgsrc/www/firefox/patches/patch-Cargo.lock
diff -u pkgsrc/www/firefox/patches/patch-Cargo.lock:1.1 pkgsrc/www/firefox/patches/patch-Cargo.lock:1.2
--- pkgsrc/www/firefox/patches/patch-Cargo.lock:1.1     Fri Apr 28 18:56:22 2023
+++ pkgsrc/www/firefox/patches/patch-Cargo.lock Sun Jun  4 09:26:35 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-Cargo.lock,v 1.1 2023/04/28 18:56:22 maya Exp $
+$NetBSD: patch-Cargo.lock,v 1.2 2023/06/04 09:26:35 ryoon Exp $
 
 Enable patching authenticator-rs
 
---- Cargo.lock.orig    2023-04-14 16:27:56.000000000 +0000
+--- Cargo.lock.orig    2023-04-27 21:16:08.000000000 +0000
 +++ Cargo.lock
-@@ -380,8 +380,6 @@ dependencies = [
+@@ -321,8 +321,6 @@ dependencies = [
  [[package]]
  name = "authenticator"
- version = "0.4.0-alpha.10"
+ version = "0.4.0-alpha.11"
 -source = "registry+https://github.com/rust-lang/crates.io-index";
--checksum = "2238116278e3a069a5148ce1efaa73d750a0d7341e011235a0ddb3e7079cb1be"
+-checksum = "e73e25e6ae754b553f930c48af8f0e5ca71e641c419151e95bafd5644ff6e21b"
  dependencies = [
   "base64",
-  "bitflags",
+  "bitflags 1.3.2",

Index: pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js
diff -u pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js:1.18 pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js:1.19
--- pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js:1.18        Sat Jan  7 23:36:39 2023
+++ pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js     Sun Jun  4 09:26:35 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-browser_app_profile_firefox.js,v 1.18 2023/01/07 23:36:39 ryoon Exp $
+$NetBSD: patch-browser_app_profile_firefox.js,v 1.19 2023/06/04 09:26:35 ryoon Exp $
 
 This patch modifies default Firefox settings - see the comments above
 each one.
 
---- browser/app/profile/firefox.js.orig        2022-12-15 22:31:34.000000000 +0000
+--- browser/app/profile/firefox.js.orig        2023-05-22 16:53:55.000000000 +0000
 +++ browser/app/profile/firefox.js
-@@ -2099,7 +2099,11 @@ pref("reader.pocket.ctaVersion", "");
+@@ -2120,7 +2120,11 @@ pref("reader.pocket.ctaVersion", "");
  
  pref("view_source.tab", true);
  
@@ -18,7 +18,7 @@ each one.
  
  // Enable Push API.
  pref("dom.push.enabled", true);
-@@ -2279,6 +2283,27 @@ pref("app.normandy.onsync_skew_sec", 600
+@@ -2329,6 +2333,30 @@ pref("app.normandy.onsync_skew_sec", 600
  pref("toolkit.coverage.enabled", false);
  pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org";);
  
@@ -43,6 +43,9 @@ each one.
 +pref("midi.prompt.testing", true);
 +pref("media.navigator.permission.disabled", true);
 +
++// DIsable WebGL for NetBSD systems
++pref("webgl.disabled", true);
++
  // Discovery prefs
  pref("browser.discovery.enabled", true);
  pref("browser.discovery.containers.enabled", true);

Index: pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk
diff -u pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk:1.10 pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk:1.11
--- pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk:1.10      Tue Jun 14 16:44:29 2022
+++ pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk   Sun Jun  4 09:26:35 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_makefiles_rust.mk,v 1.10 2022/06/14 16:44:29 ryoon Exp $
+$NetBSD: patch-config_makefiles_rust.mk,v 1.11 2023/06/04 09:26:35 ryoon Exp $
 
 NetBSD doesn't get along with parallel rust builds (it causes issues
 with ld.so) which are the default. Force -j1.
@@ -13,7 +13,7 @@ From: https://bugzilla.mozilla.org/show_
  RUSTFLAGS += -Zsanitizer=thread
  endif
 +ifeq ($(OS_ARCH),NetBSD)
-+cargo_build_flags += -j1
++cargo_build_flags += @RUST_MAKE_JOBS@
 +endif
  
  rustflags_sancov =

Added files:

Index: pkgsrc/www/firefox/patches/patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp:1.1
--- /dev/null   Sun Jun  4 09:26:35 2023
+++ pkgsrc/www/firefox/patches/patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp  Sun Jun  4 09:26:35 2023
@@ -0,0 +1,40 @@
+$NetBSD: patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp,v 1.1 2023/06/04 09:26:35 ryoon Exp $
+
+--- dom/webtransport/api/WebTransportDatagramDuplexStream.cpp.orig     2023-04-23 21:17:18.000000000 +0000
++++ dom/webtransport/api/WebTransportDatagramDuplexStream.cpp
+@@ -62,7 +62,7 @@ void WebTransportDatagramDuplexStream::S
+                                                          ErrorResult& aRv) {
+   // https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-incomingmaxage
+   // Step 1
+-  if (isnan(aMaxAge) || aMaxAge < 0.) {
++  if (std::isnan(aMaxAge) || aMaxAge < 0.) {
+     aRv.ThrowRangeError("Invalid IncomingMaxAge");
+     return;
+   }
+@@ -78,7 +78,7 @@ void WebTransportDatagramDuplexStream::S
+                                                          ErrorResult& aRv) {
+   // https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-outgoingmaxage
+   // Step 1
+-  if (isnan(aMaxAge) || aMaxAge < 0.) {
++  if (std::isnan(aMaxAge) || aMaxAge < 0.) {
+     aRv.ThrowRangeError("Invalid OutgoingMaxAge");
+     return;
+   }
+@@ -94,7 +94,7 @@ void WebTransportDatagramDuplexStream::S
+     double aWaterMark, ErrorResult& aRv) {
+   // https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-incominghighwatermark
+   // Step 1
+-  if (isnan(aWaterMark) || aWaterMark < 0.) {
++  if (std::isnan(aWaterMark) || aWaterMark < 0.) {
+     aRv.ThrowRangeError("Invalid OutgoingMaxAge");
+     return;
+   }
+@@ -110,7 +110,7 @@ void WebTransportDatagramDuplexStream::S
+     double aWaterMark, ErrorResult& aRv) {
+   // https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-outgoinghighwatermark
+   // Step 1
+-  if (isnan(aWaterMark) || aWaterMark < 0.) {
++  if (std::isnan(aWaterMark) || aWaterMark < 0.) {
+     aRv.ThrowRangeError("Invalid OutgoingHighWaterMark");
+     return;
+   }

Index: pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.cpp:1.6
--- /dev/null   Sun Jun  4 09:26:35 2023
+++ pkgsrc/www/firefox/patches/patch-toolkit_xre_glxtest.cpp    Sun Jun  4 09:26:35 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-toolkit_xre_glxtest.cpp,v 1.6 2023/06/04 09:26:35 ryoon Exp $
+
+* Do not test Linux-specific entry for non-Linux.
+
+--- toolkit/xre/glxtest.cpp.orig       2023-04-14 16:28:10.000000000 +0000
++++ toolkit/xre/glxtest.cpp
+@@ -289,11 +289,15 @@ static void close_logging() {
+ #define PCI_BASE_CLASS_DISPLAY 0x03
+ 
+ static void get_pci_status() {
++#if defined(__linux__)
+   if (access("/sys/bus/pci/", F_OK) != 0 &&
+       access("/sys/bus/pci_express/", F_OK) != 0) {
+     record_warning("cannot access /sys/bus/pci");
+     return;
+   }
++#else
++  return;
++#endif
+ 
+   void* libpci = dlopen("libpci.so.3", RTLD_LAZY);
+   if (!libpci) {