[pkgsrc/trunk]: pkgsrc/www/firefox firefox: Update to 101.0.1

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff70d9207f92
branches:  trunk
changeset: 380764:ff70d9207f92
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Jun 14 16:44:29 2022 +0000

description:
firefox: Update to 101.0.1

* Fix build under NetBSD/i386 with thiner LTO option.

Changelog:
Fixed

  * Fixed Firefox clearing the clipboard when closing on macOS (bug 1771823)

  * Fixed a compatibility issue causing severely impaired functionality with
    win32k lockdown enabled on some Windows systems (bug 1769845)

  * Fixed context menus not appearing when right-clicking Picture-in-Picture
    windows on some Linux systems (bug 1771914)

  * Various stability fixes

diffstat:

 www/firefox/Makefile                               |      9 +-
 www/firefox/distinfo                               |     12 +-
 www/firefox/patches/patch-config_makefiles_rust.mk |     17 +-
 www/firefox/patches/patch-libwebrtc.diff           |  12648 ++++++++++--------
 4 files changed, 7136 insertions(+), 5550 deletions(-)

diffs (truncated from 16602 to 300 lines):

diff -r add24396aa83 -r ff70d9207f92 www/firefox/Makefile
--- a/www/firefox/Makefile      Tue Jun 14 14:18:45 2022 +0000
+++ b/www/firefox/Makefile      Tue Jun 14 16:44:29 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.522 2022/06/06 20:59:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.523 2022/06/14 16:44:29 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            101.0
-MOZ_BRANCH_MINOR=      
+MOZ_BRANCH_MINOR=      .1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
@@ -74,11 +74,6 @@
 NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox-bin
 .endif
 
-# As of 101.0, rustc consumes all available RAM and swap by default.
-.if ${MACHINE_ARCH} == "i386"
-MAKE_ENV+=     RUSTFLAGS="-C opt-level=1 -C codegen-units=1"
-.endif
-
 # Avoid ld "invalid section index" errors.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-fdata-sections
 BUILDLINK_TRANSFORM.SunOS+=    rm:-ffunction-sections
diff -r add24396aa83 -r ff70d9207f92 www/firefox/distinfo
--- a/www/firefox/distinfo      Tue Jun 14 14:18:45 2022 +0000
+++ b/www/firefox/distinfo      Tue Jun 14 16:44:29 2022 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.469 2022/06/06 20:59:39 ryoon Exp $
+$NetBSD: distinfo,v 1.470 2022/06/14 16:44:29 ryoon Exp $
 
-BLAKE2s (firefox-101.0.source.tar.xz) = 21e95ea9927612144a36f5b56fc95272fb63b7b1f31813c72eba5f7ca4d7bfba
-SHA512 (firefox-101.0.source.tar.xz) = fffe7e0940c1443fcdc5b205677764cb4e04b29f33fcfafb2857d383700584f309806b81fc4989efb56cc12a3cca1ff7d451b647050c43e98777b5c952ed5d56
-Size (firefox-101.0.source.tar.xz) = 490975228 bytes
+BLAKE2s (firefox-101.0.1.source.tar.xz) = 8e4588e1557fda73bc529a3f5470f3bcfb06a2ed7efb700f464eaa4350dcb61b
+SHA512 (firefox-101.0.1.source.tar.xz) = 435a7f6013582933e75c41e554a45beda30b5affd7d3ed7d2876026609ba7f17b2c20b507d9d0c9ce2379e335ec09b021257ba30ac55fabf02dca54b03ea70b4
+Size (firefox-101.0.1.source.tar.xz) = 486021240 bytes
 BLAKE2s (nodejs-output-95.0.tgz) = c44b37d3605524a49157002f01c29f568f04194b0e635bc312de7ffdeb9a74c9
 SHA512 (nodejs-output-95.0.tgz) = 2faf326f4e100b66f8597c365cc2eb5d0eee26aae92a7e2446891f2178041aa71ba16eae37000acacd43a657025ec11c18db73b112f5c49cc21cdb882da6d798
 Size (nodejs-output-95.0.tgz) = 200627 bytes
 SHA1 (patch-browser_app_profile_firefox.js) = 7f6b4361fe62ccc2d1c092a5ace97ea2085727bf
 SHA1 (patch-build_moz.configure_rust.configure) = 25ddfacd29cebbc6db005dbe61a2a7446d480678
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 9d1f15ff487efa9202114d19ed5668b4e7aa032a
-SHA1 (patch-config_makefiles_rust.mk) = fa9f0f59a179cae2562a76110fada49039490fb8
+SHA1 (patch-config_makefiles_rust.mk) = 188178b184d79737247ed3770cc8f4370cd7f6c0
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 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
@@ -22,7 +22,7 @@
 SHA1 (patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp) = fdc522e3fb626b1b8a2ebf19ad60bfc25dfa4183
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
 SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 0501fdcae11568ae4ea78e0d2f6b3750b7a67d47
-SHA1 (patch-libwebrtc.diff) = dd36ac8c3449d876ac179e00238e50ebef468a8e
+SHA1 (patch-libwebrtc.diff) = 16f4e68adca7f6dc11cfd527a13b3e50d175d277
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 2ef11da83c90c41490db4c0d9809c3e1826b488a
 SHA1 (patch-media_libcubeb_src_cubeb__jack.cpp) = fc546c5e6582fd5eda64ba83287dfbbb3c9e229f
diff -r add24396aa83 -r ff70d9207f92 www/firefox/patches/patch-config_makefiles_rust.mk
--- a/www/firefox/patches/patch-config_makefiles_rust.mk        Tue Jun 14 14:18:45 2022 +0000
+++ b/www/firefox/patches/patch-config_makefiles_rust.mk        Tue Jun 14 16:44:29 2022 +0000
@@ -1,9 +1,12 @@
-$NetBSD: patch-config_makefiles_rust.mk,v 1.9 2021/12/11 14:10:01 ryoon Exp $
+$NetBSD: patch-config_makefiles_rust.mk,v 1.10 2022/06/14 16:44:29 ryoon Exp $
 
 NetBSD doesn't get along with parallel rust builds (it causes issues
 with ld.so) which are the default. Force -j1.
 
---- config/makefiles/rust.mk.orig      2021-11-25 21:18:06.000000000 +0000
+Use less memory to fix build under NetBSD/i386.
+From: https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+
+--- config/makefiles/rust.mk.orig      2022-06-08 14:10:19.000000000 +0000
 +++ config/makefiles/rust.mk
 @@ -58,6 +58,9 @@ ifdef MOZ_TSAN
  cargo_build_flags += -Zbuild-std=std,panic_abort
@@ -15,3 +18,13 @@
  
  rustflags_sancov =
  ifdef LIBFUZZER
+@@ -90,7 +93,8 @@ ifndef rustflags_sancov
+ # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045.
+ ifndef MOZ_CODE_COVERAGE
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff -r add24396aa83 -r ff70d9207f92 www/firefox/patches/patch-libwebrtc.diff
--- a/www/firefox/patches/patch-libwebrtc.diff  Tue Jun 14 14:18:45 2022 +0000
+++ b/www/firefox/patches/patch-libwebrtc.diff  Tue Jun 14 16:44:29 2022 +0000
@@ -1,57 +1,61 @@
-diff -ur firefox-101.0.orig/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build firefox-101.0/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
---- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build  2022-05-20 10:22:43.000000000 +0900
-+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build  2022-05-20 19:55:59.515941068 +0900
-@@ -67,14 +67,17 @@
-     DEFINES["__STDC_CONSTANT_MACROS"] = True
-     DEFINES["__STDC_FORMAT_MACROS"] = True
- 
--if CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD":
- 
-     DEFINES["USE_AURA"] = "1"
-     DEFINES["USE_GLIB"] = "1"
-     DEFINES["USE_NSS_CERTS"] = "1"
-     DEFINES["USE_OZONE"] = "1"
-     DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_LINUX"] = True
-+    if CONFIG["OS_TARGET"] == "Linux":
-+        DEFINES["WEBRTC_LINUX"] = True
-+    else:
-+        DEFINES["WEBRTC_BSD"] = True
-     DEFINES["WEBRTC_POSIX"] = True
-     DEFINES["_FILE_OFFSET_BITS"] = "64"
-     DEFINES["_GNU_SOURCE"] = True
-@@ -152,7 +155,7 @@
- 
-     DEFINES["_FORTIFY_SOURCE"] = "2"
- 
--if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
-+if not CONFIG["MOZ_DEBUG"] and (CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD"):
- 
-     DEFINES["_FORTIFY_SOURCE"] = "2"
- 
-@@ -168,7 +171,7 @@
- 
-     DEFINES["_DEBUG"] = True
- 
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["MOZ_DEBUG"] == "1" and (CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD"):
- 
-     DEFINES["_DEBUG"] = True
- 
-@@ -210,4 +213,9 @@
- 
-     DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911"
- 
-+if CONFIG["CPU_ARCH"] == "x86":
-+    CFLAGS += [
+diff -ur firefox-101.0.1.orig/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build firefox-101.0.1/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+--- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build  2022-06-08 23:10:31.000000000 +0900
+_+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build 2022-06-12 05:56:24.362902434 +0900
+@@ -67,14 +67,17 @@
+     DEFINES["__STDC_CONSTANT_MACROS"] = True
+     DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+     DEFINES["USE_AURA"] = "1"
+     DEFINES["USE_GLIB"] = "1"
+     DEFINES["USE_NSS_CERTS"] = "1"
+     DEFINES["USE_OZONE"] = "1"
+     DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
++    if CONFIG["OS_TARGET"] == "Linux":
++        DEFINES["WEBRTC_LINUX"] = True
++    else:
++        DEFINES["WEBRTC_BSD"] = True
+     DEFINES["WEBRTC_POSIX"] = True
+     DEFINES["_FILE_OFFSET_BITS"] = "64"
+     DEFINES["_GNU_SOURCE"] = True
+@@ -152,7 +155,7 @@
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+ 
+-if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++if not CONFIG["MOZ_DEBUG"] and (CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD"):
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+ 
+@@ -168,7 +171,7 @@
+ 
+     DEFINES["_DEBUG"] = True
+ 
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_DEBUG"] == "1" and (CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD"):
+ 
+     DEFINES["_DEBUG"] = True
+ 
+@@ -210,4 +213,13 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911"
+ 
++if CONFIG["CPU_ARCH"] == "x86":
++    CFLAGS += [
++        "-msse2"
++    ]
++
++    CXXFLAGS += [
 +        "-msse2"
 +    ]
 +
  Library("resource_adaptation_api_gn")
-diff -ur firefox-101.0.orig/third_party/libwebrtc/api/array_view_gn/moz.build firefox-101.0/third_party/libwebrtc/api/array_view_gn/moz.build
---- third_party/libwebrtc/api/array_view_gn/moz.build  2022-05-20 10:22:49.000000000 +0900
-+++ third_party/libwebrtc/api/array_view_gn/moz.build  2022-05-20 19:55:59.605803135 +0900
+diff -ur firefox-101.0.1.orig/third_party/libwebrtc/api/array_view_gn/moz.build firefox-101.0.1/third_party/libwebrtc/api/array_view_gn/moz.build
+--- third_party/libwebrtc/api/array_view_gn/moz.build  2022-06-08 23:10:31.000000000 +0900
+_+++ third_party/libwebrtc/api/array_view_gn/moz.build 2022-06-12 05:56:24.396949966 +0900
 @@ -63,14 +63,17 @@
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
@@ -90,70 +94,78 @@
  
      DEFINES["_DEBUG"] = True
  
-@@ -190,4 +193,9 @@
- 
-     DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911"
- 
-+if CONFIG["CPU_ARCH"] == "x86":
-+    CFLAGS += [
+@@ -190,4 +193,13 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911"
+ 
++if CONFIG["CPU_ARCH"] == "x86":
++    CFLAGS += [
++        "-msse2"
++    ]
++
++    CXXFLAGS += [
 +        "-msse2"
 +    ]
 +
  Library("array_view_gn")
-diff -ur firefox-101.0.orig/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build firefox-101.0/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
---- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build   2022-05-20 10:23:13.000000000 +0900
-+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build   2022-05-20 19:55:59.546937458 +0900
-@@ -67,14 +67,17 @@
-     DEFINES["__STDC_CONSTANT_MACROS"] = True
-     DEFINES["__STDC_FORMAT_MACROS"] = True
- 
--if CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD":
- 
-     DEFINES["USE_AURA"] = "1"
-     DEFINES["USE_GLIB"] = "1"
-     DEFINES["USE_NSS_CERTS"] = "1"
-     DEFINES["USE_OZONE"] = "1"
-     DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_LINUX"] = True
-+    if CONFIG["OS_TARGET"] == "Linux":
-+        DEFINES["WEBRTC_LINUX"] = True
-+    else:
-+        DEFINES["WEBRTC_BSD"] = True
-     DEFINES["WEBRTC_POSIX"] = True
-     DEFINES["_FILE_OFFSET_BITS"] = "64"
-     DEFINES["_GNU_SOURCE"] = True
-@@ -152,7 +155,7 @@
- 
-     DEFINES["_FORTIFY_SOURCE"] = "2"
- 
--if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
-+if not CONFIG["MOZ_DEBUG"] and (CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD"):
- 
-     DEFINES["_FORTIFY_SOURCE"] = "2"
- 
-@@ -168,7 +171,7 @@
- 
-     DEFINES["_DEBUG"] = True
- 
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["MOZ_DEBUG"] == "1" and (CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD"):
- 
-     DEFINES["_DEBUG"] = True
- 
-@@ -210,4 +213,9 @@
- 
-     DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911"
- 
-+if CONFIG["CPU_ARCH"] == "x86":
-+    CFLAGS += [
+diff -ur firefox-101.0.1.orig/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build firefox-101.0.1/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build   2022-06-08 23:10:31.000000000 +0900
+_+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build  2022-06-12 05:56:24.439471290 +0900
+@@ -67,14 +67,17 @@
+     DEFINES["__STDC_CONSTANT_MACROS"] = True
+     DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+     DEFINES["USE_AURA"] = "1"
+     DEFINES["USE_GLIB"] = "1"
+     DEFINES["USE_NSS_CERTS"] = "1"
+     DEFINES["USE_OZONE"] = "1"
+     DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
++    if CONFIG["OS_TARGET"] == "Linux":
++        DEFINES["WEBRTC_LINUX"] = True
++    else:
++        DEFINES["WEBRTC_BSD"] = True
+     DEFINES["WEBRTC_POSIX"] = True
+     DEFINES["_FILE_OFFSET_BITS"] = "64"
+     DEFINES["_GNU_SOURCE"] = True