http/firefox: version 90.0, SECURITY_PATCH++

42 files changed, 531 insertions, 1979 deletions

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index e58b3fee95..9470cf8a57 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -36,7 +36,7 @@ depends  libwebp       "--with-system-webp"                      &&
 
 depends  nspr               "--with-system-nspr"                 &&
 
-local NSS_BRANCH="3.64"                                          &&
+local NSS_BRANCH="3.66"                                          &&
 if spell_ok nss                                                  &&
    is_version_less "$(installed_version nss)" "${NSS_BRANCH}"; then
   depends  -sub "${NSS_BRANCH}" nss  "--with-system-nss"
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index dbeced25a4..8b193cde64 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
-         VERSION=89.0.2
-  SECURITY_PATCH=149
+         VERSION=90.0
+  SECURITY_PATCH=150
           SOURCE="${SPELL}-${VERSION}.source.tar.xz"
    SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}"
          SOURCE2="${SOURCE}.asc"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 1b0b98c4c1..7c048f3eeb 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2021-07-13 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 90.0, SECURITY_PATCH++
+	* DEPENDS: nss >= 3.66
+	* patches/*: updated
+
 2021-07-04 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: version 89.0.2, SECURITY_PATCH++
 	* DEPENDS: reenabled icu, sqlite, graphite2 and harfbuzz; nss >= 3.64
diff --git a/http/firefox/patches/0001-Don-t-use-build-id.patch b/http/firefox/patches/0001-Don-t-use-build-id.patch
index e0b0d4945c..46baad2fe3 100644
--- a/http/firefox/patches/0001-Don-t-use-build-id.patch
+++ b/http/firefox/patches/0001-Don-t-use-build-id.patch
@@ -1,7 +1,7 @@
-From a13f3e4baeb647cdabe4b73ac639cae16d9c42a4 Mon Sep 17 00:00:00 2001
+From c2fd3a63431981685b68590db8f073dc637da113 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 19:14:26 +0200
-Subject: [PATCH 01/37] Don't use build id
+Subject: [PATCH 01/36] Don't use build id
 
 We must drop build id as it causes conflicts when merging
 thunderbird/firefox/seamonkey on same system when using
@@ -14,7 +14,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  2 files changed, 14 deletions(-)
 
 diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 636321f598..e848bd321e 100644
+index a85ca56f80..1052104a79 100644
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in
 @@ -361,13 +361,6 @@ if test "$GNU_CC"; then
@@ -32,10 +32,10 @@ index 636321f598..e848bd321e 100644
  fi
  
 diff --git a/old-configure.in b/old-configure.in
-index a05ac13cd1..4ddc3f5b45 100644
+index de2642f71d..f2c4a7d4ac 100644
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -349,13 +349,6 @@ if test "$GNU_CC"; then
+@@ -348,13 +348,6 @@ if test "$GNU_CC"; then
                    AC_MSG_RESULT([no])
                    LDFLAGS=$_SAVE_LDFLAGS)
  
@@ -50,5 +50,5 @@ index a05ac13cd1..4ddc3f5b45 100644
      HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=
      _SAVE_LDFLAGS=$LDFLAGS
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0002-Fortify-sources-properly.patch b/http/firefox/patches/0002-Fortify-sources-properly.patch
index 9f9079d324..8b741cc277 100644
--- a/http/firefox/patches/0002-Fortify-sources-properly.patch
+++ b/http/firefox/patches/0002-Fortify-sources-properly.patch
@@ -1,7 +1,7 @@
-From abfce26e906bcb727320ef33294f4fa9102c1ade Mon Sep 17 00:00:00 2001
+From 5885434011f3722d78b35d8028a29ddd628408be Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 19:16:36 +0200
-Subject: [PATCH 02/37] Fortify sources properly
+Subject: [PATCH 02/36] Fortify sources properly
 
 Ensure we fortify properly, features.h is pulled in via fortification.
 
@@ -37,5 +37,5 @@ index 16c9b33329..df38d9336c 100644
  
  #endif /* _SDP_OS_DEFS_H_ */
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0003-Check-additional-plugins-dir.patch b/http/firefox/patches/0003-Check-additional-plugins-dir.patch
index e0977cb96f..e086e9d559 100644
--- a/http/firefox/patches/0003-Check-additional-plugins-dir.patch
+++ b/http/firefox/patches/0003-Check-additional-plugins-dir.patch
@@ -1,7 +1,7 @@
-From 13a73ac916e8ca4864d661f3bbb682ed7f55c25c Mon Sep 17 00:00:00 2001
+From aa97a69caaa09cfd8b0220f3913c40378caf6bf7 Mon Sep 17 00:00:00 2001
 From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
 Date: Mon, 6 Apr 2020 19:17:43 +0200
-Subject: [PATCH 03/37] Check additional plugins dir
+Subject: [PATCH 03/36] Check additional plugins dir
 
 Check original plugins dir along with default plugins dir.
 
@@ -54,5 +54,5 @@ index ef974f9904..6261eafcc8 100644
      static const char* keys[] = {NS_USER_PLUGINS_DIR, nullptr};
  #  endif
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch b/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
index c1d1878065..95f7835a69 100644
--- a/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
+++ b/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
@@ -1,7 +1,7 @@
-From 0cd112325bbe3a31bb32ca36074203d6aeba20e5 Mon Sep 17 00:00:00 2001
+From 28605c47cb098537f5c70d870cee9e2669840d60 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:32:39 +0200
-Subject: [PATCH 04/37] bmo#847568: Support system harfbuzz
+Subject: [PATCH 04/36] bmo#847568: Support system harfbuzz
 
 Allow building against system-wide harfbuzz.
 
@@ -39,10 +39,10 @@ index 5f7b5bb23e..449328ffaa 100644
      system_headers += [
          'jack/jack.h',
 diff --git a/dom/base/moz.build b/dom/base/moz.build
-index cadd80e624..4083d9c3fe 100644
+index 839bb23e2a..c8f491bef5 100644
 --- a/dom/base/moz.build
 +++ b/dom/base/moz.build
-@@ -556,6 +556,9 @@ if CONFIG["MOZ_BUILD_APP"] in ["browser", "mobile/android", "xulrunner"]:
+@@ -559,6 +559,9 @@ if CONFIG["MOZ_BUILD_APP"] in ["browser", "mobile/android", "xulrunner"]:
  if CONFIG["MOZ_X11"]:
      CXXFLAGS += CONFIG["TK_CFLAGS"]
  
@@ -145,10 +145,10 @@ index 31dd7c81b8..08bf561429 100644
  
  if CONFIG["CC_TYPE"] in ("clang", "gcc"):
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
-index 94e5474248..3f393f3316 100644
+index bf771ca044..8f9525edc0 100644
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -241,6 +241,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+@@ -254,6 +254,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
  OS_LIBS += CONFIG["MOZ_CAIRO_OSLIBS"]
  OS_LIBS += CONFIG["MOZ_WEBRTC_X11_LIBS"]
  
@@ -159,7 +159,7 @@ index 94e5474248..3f393f3316 100644
      OS_LIBS += CONFIG["MOZ_JPEG_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 0717b912ef..c934a661bd 100644
+index ac7ab6c2ef..b306763339 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -475,6 +475,15 @@ add_old_configure_assignment(
@@ -179,5 +179,5 @@ index 0717b912ef..c934a661bd 100644
  # ==============================================================
  @depends(toolkit)
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch b/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch
index 41da670401..5262a74e8a 100644
--- a/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch
+++ b/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch
@@ -1,7 +1,7 @@
-From ffc7b194ef0fb5509d27a34063c52048912b8002 Mon Sep 17 00:00:00 2001
+From d3beec2ad5b7fac54fe7a065230ddb426ab2934c Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:34:44 +0200
-Subject: [PATCH 05/37] bmo#847568: Support system graphite2
+Subject: [PATCH 05/36] bmo#847568: Support system graphite2
 
 Allow building against system-wide graphite2.
 
@@ -134,10 +134,10 @@ index fb2ad5bf34..c6ce6f8417 100644
  if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
      CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 diff --git a/old-configure.in b/old-configure.in
-index 4ddc3f5b45..de727a48bd 100644
+index f2c4a7d4ac..e2c1013a78 100644
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -2283,6 +2283,27 @@ if test "$USE_FC_FREETYPE"; then
+@@ -2277,6 +2277,27 @@ if test "$USE_FC_FREETYPE"; then
      fi
  fi
  
@@ -166,10 +166,10 @@ index 4ddc3f5b45..de727a48bd 100644
  dnl Check if we need the 32-bit Linux SSE2 error dialog
  dnl ========================================================
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
-index 3f393f3316..df178bc6cf 100644
+index 8f9525edc0..8137550ef7 100644
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -241,6 +241,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+@@ -254,6 +254,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
  OS_LIBS += CONFIG["MOZ_CAIRO_OSLIBS"]
  OS_LIBS += CONFIG["MOZ_WEBRTC_X11_LIBS"]
  
@@ -180,7 +180,7 @@ index 3f393f3316..df178bc6cf 100644
      OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index c934a661bd..0783019981 100644
+index b306763339..5ab26a1b95 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -475,6 +475,19 @@ add_old_configure_assignment(
@@ -204,5 +204,5 @@ index c934a661bd..0783019981 100644
  # ==============================================================
  option('--with-system-harfbuzz', help="Use system harfbuzz (located with pkgconfig)")
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch b/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch
index b82d4388b1..471135a61c 100644
--- a/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch
+++ b/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch
@@ -1,7 +1,7 @@
-From e09538bda8756e737af01edbd4aed9975280ca45 Mon Sep 17 00:00:00 2001
+From 73681127634e942ae2018beae7550620c96b92a7 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:36:02 +0200
-Subject: [PATCH 06/37] bmo#1559213: Support system av1
+Subject: [PATCH 06/36] bmo#1559213: Support system av1
 
 Allow building against system-wide av1.
 
@@ -15,7 +15,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  4 files changed, 34 insertions(+), 4 deletions(-)
 
 diff --git a/config/external/moz.build b/config/external/moz.build
-index 4e9888f365..bf1e255107 100644
+index 5096a1ca00..f4c84c4103 100644
 --- a/config/external/moz.build
 +++ b/config/external/moz.build
 @@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
@@ -66,7 +66,7 @@ index 16ca8a9cbc..b349dcbe6d 100644
  if CONFIG["MOZ_OMX"]:
      EXPORTS += [
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 0783019981..de0a44bf27 100644
+index 5ab26a1b95..94eddc7397 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -559,14 +559,29 @@ def av1(value):
@@ -107,8 +107,8 @@ index 0783019981..de0a44bf27 100644
  set_define("MOZ_AV1", av1)
 +set_config("MOZ_SYSTEM_AV1", depends_if(system_av1)(lambda _: True))
  
- # Built-in fragmented MP4 support.
+ # JXL Image Codec Support
  # ==============================================================
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0007-Support-sndio-audio-framework.patch b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
index 373d4a4f73..d30a480a79 100644
--- a/http/firefox/patches/0007-Support-sndio-audio-framework.patch
+++ b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
@@ -1,7 +1,7 @@
-From 09703df20bed8110f898ea3101e2a4eceaeb0712 Mon Sep 17 00:00:00 2001
+From 5c0a08959ec85a6c2884b1e98c689d80ce09b5e0 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:54:42 +0200
-Subject: [PATCH 07/37] Support sndio audio framework
+Subject: [PATCH 07/36] Support sndio audio framework
 
 Bug: https://bugs.gentoo.org/785613
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -43,10 +43,10 @@ index 872484c311..28994a693d 100644
  
  if CONFIG['OS_TARGET'] == 'Darwin':
 diff --git a/old-configure.in b/old-configure.in
-index de727a48bd..f0ecc39961 100644
+index e2c1013a78..682b815c82 100644
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -2473,6 +2473,23 @@ fi
+@@ -2467,6 +2467,23 @@ fi
  AC_SUBST(NECKO_WIFI)
  AC_SUBST(NECKO_WIFI_DBUS)
  
@@ -71,5 +71,5 @@ index de727a48bd..f0ecc39961 100644
  dnl =
  dnl = Maintainer debug option (no --enable equivalent)
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch b/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
index 531ca09491..e558f97109 100644
--- a/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
+++ b/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
@@ -1,7 +1,7 @@
-From ea37aa3783c34119f13cc869cebe527030a696f4 Mon Sep 17 00:00:00 2001
+From 5ace2ca2b244f40c2b762bef1307222b738c47b8 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:41:43 +0200
-Subject: [PATCH 08/37] bmo#878089: Don't fail when TERM is not set
+Subject: [PATCH 08/36] bmo#878089: Don't fail when TERM is not set
 
 Link: https://github.com/erikrose/blessings/pull/137
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=878089
@@ -32,5 +32,5 @@ index 388cece0b8..1283460cc9 100644
          self.stream = stream
  
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch b/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch
index e9852fbc30..ecbf021aff 100644
--- a/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch
+++ b/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch
@@ -1,7 +1,7 @@
-From b91d735d3dc25dd4a5ab89c45fbf810dbdcba8a5 Mon Sep 17 00:00:00 2001
+From 6564e5631be996a11ff7434d3a9950c8f20bb2c6 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:44:28 +0200
-Subject: [PATCH 09/37] bmo#1516803: Fix building sandbox
+Subject: [PATCH 09/36] bmo#1516803: Fix building sandbox
 
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1516803
 Bug: https://bugs.gentoo.org/666580
@@ -24,5 +24,5 @@ index 29b53f12f7..31d2e24118 100644
  DEFINES["NS_NO_XPCOM"] = True
  DisableStlWrapping()
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch b/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
index f81849ac41..9f1eadb2f8 100644
--- a/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
+++ b/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
@@ -1,7 +1,7 @@
-From e5793d37db3c95bebbba1b9babededdb10282d1a Mon Sep 17 00:00:00 2001
+From 1e8f1c7547f0a566ba0978cb70cbcd2d5f6f01d1 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:51:22 +0200
-Subject: [PATCH 10/37] Fix building spellchecker when using GCC and PGO
+Subject: [PATCH 10/36] Fix building spellchecker when using GCC and PGO
 
 Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88561
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -23,5 +23,5 @@ index dcc1d54f74..06a2ad5a15 100644
 +if CONFIG["CC_TYPE"] in ("gcc"):
 +    CXXFLAGS += ["-fno-devirtualize"]
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0011-bmo-1526653-Include-struct-definitions-for-user_vfp-.patch b/http/firefox/patches/0011-bmo-1526653-Include-struct-definitions-for-user_vfp-.patch
index 366f5c8037..879c229dbf 100644
--- a/http/firefox/patches/0011-bmo-1526653-Include-struct-definitions-for-user_vfp-.patch
+++ b/http/firefox/patches/0011-bmo-1526653-Include-struct-definitions-for-user_vfp-.patch
@@ -1,7 +1,7 @@
-From 2fc03ca254baa4d624a7b4b67656be94b63f89e9 Mon Sep 17 00:00:00 2001
+From 4ed2e8b9d47d731223026b89392a4962a3c5088b Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:57:42 +0200
-Subject: [PATCH 11/37] bmo#1526653: Include struct definitions for user_vfp
+Subject: [PATCH 11/36] bmo#1526653: Include struct definitions for user_vfp
  and user_vfp_exc
 
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
@@ -34,5 +34,5 @@ index 37bc5a9c19..67b43ada29 100644
  
  #if defined(ANDROID)
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0013-musl-Add-alternate-name-for-private-siginfo-struct-m.patch b/http/firefox/patches/0013-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
index a00174a034..19827dfa7d 100644
--- a/http/firefox/patches/0013-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
+++ b/http/firefox/patches/0013-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
@@ -1,7 +1,7 @@
-From 179237ec97ccfb589236400846e99d0e59d4919a Mon Sep 17 00:00:00 2001
+From 489c3bf843ca8a742e68a7e132ccf4fa92cb846f Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 8 Jan 2017 19:16:38 -0600
-Subject: [PATCH 13/37] musl: Add alternate name for private siginfo struct
+Subject: [PATCH 13/36] musl: Add alternate name for private siginfo struct
  member
 
 musl does not provide a macro for detecting its presence. For now,
@@ -31,5 +31,5 @@ index 9884be8bb2..86d8f88e30 100644
  
  #if defined(__mips__)
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0014-musl-Fix-syscall-wrappers.patch b/http/firefox/patches/0014-musl-Fix-syscall-wrappers.patch
index e4833ab5d5..6465ba77e5 100644
--- a/http/firefox/patches/0014-musl-Fix-syscall-wrappers.patch
+++ b/http/firefox/patches/0014-musl-Fix-syscall-wrappers.patch
@@ -1,7 +1,7 @@
-From 47318a554b6f94f8ad46839ddeb70d95cb950c11 Mon Sep 17 00:00:00 2001
+From b2d69aa429c0eaec04dbf4c3b98fe3fa0a0e312f Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 8 Jan 2017 19:19:23 -0600
-Subject: [PATCH 14/37] musl: Fix syscall wrappers
+Subject: [PATCH 14/36] musl: Fix syscall wrappers
 
 musl defines p{read,write}64 to their non-suffixed equivalents to avoid
 duplication in its syscall wrappers. This breaks macro expansion here,
@@ -38,5 +38,5 @@ index 1abe0ba5b0..d6087a1674 100644
   * wrapper functions that convert them), we provide our own kernel data
   * structures for use by the system calls.
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0015-musl-Only-use-system-heap-reporter-with-glibc.patch b/http/firefox/patches/0015-musl-Only-use-system-heap-reporter-with-glibc.patch
index 0327f733d2..42cb0a12d3 100644
--- a/http/firefox/patches/0015-musl-Only-use-system-heap-reporter-with-glibc.patch
+++ b/http/firefox/patches/0015-musl-Only-use-system-heap-reporter-with-glibc.patch
@@ -1,7 +1,7 @@
-From f6577f5dcd75e65e58dd008edd2dc84dbd1a9624 Mon Sep 17 00:00:00 2001
+From f1ec001b63419f258983421bb636dfc7afcbf295 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 20:09:26 +0200
-Subject: [PATCH 15/37] musl: Only use system heap reporter with glibc
+Subject: [PATCH 15/36] musl: Only use system heap reporter with glibc
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -29,5 +29,5 @@ index 6aa934812f..ccb8d5255a 100644
  struct SegmentKind {
    DWORD mState;
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0016-musl-Set-pthread-name-for-non-glibc-systems.patch b/http/firefox/patches/0016-musl-Set-pthread-name-for-non-glibc-systems.patch
index 8cb83d764b..e0aab45697 100644
--- a/http/firefox/patches/0016-musl-Set-pthread-name-for-non-glibc-systems.patch
+++ b/http/firefox/patches/0016-musl-Set-pthread-name-for-non-glibc-systems.patch
@@ -1,7 +1,7 @@
-From 6cf6da0082d9b01778e671c684659480e91537c7 Mon Sep 17 00:00:00 2001
+From e5969388dc0d1222db02877f4ee209e22b89fac2 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 20:10:03 +0200
-Subject: [PATCH 16/37] musl: Set pthread name for non glibc systems
+Subject: [PATCH 16/36] musl: Set pthread name for non glibc systems
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -25,5 +25,5 @@ index 35532e375b..983da45326 100644
    MOZ_RELEASE_ASSERT(!rv);
  }
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0017-musl-getcontext-is-only-avaliable-on-glibc-systems.patch b/http/firefox/patches/0017-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
index 644cb4a5ab..884d4306fd 100644
--- a/http/firefox/patches/0017-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
+++ b/http/firefox/patches/0017-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
@@ -1,7 +1,7 @@
-From e12b7cfccddbe7e26589597a2dda433c177062bd Mon Sep 17 00:00:00 2001
+From 8a35b6a8819331af0bb09dde602aa9be7df792cb Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 20:10:47 +0200
-Subject: [PATCH 17/37] musl: getcontext is only avaliable on glibc systems
+Subject: [PATCH 17/36] musl: getcontext is only avaliable on glibc systems
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp
-index e7538e50e9..9a08835481 100644
+index 3c5e96de50..211affd8a0 100644
 --- a/tools/profiler/core/platform-linux-android.cpp
 +++ b/tools/profiler/core/platform-linux-android.cpp
-@@ -604,8 +604,10 @@ static void PlatformInit(PSLockRef aLock) {}
+@@ -605,8 +605,10 @@ static void PlatformInit(PSLockRef aLock) {}
  ucontext_t sSyncUContext;
  
  void Registers::SyncPopulate() {
@@ -24,5 +24,5 @@ index e7538e50e9..9a08835481 100644
  }
  #endif
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0018-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch b/http/firefox/patches/0018-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
index 5a8695e70f..0e86dd6c0d 100644
--- a/http/firefox/patches/0018-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
+++ b/http/firefox/patches/0018-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
@@ -1,7 +1,7 @@
-From 5487455c6aefff54ca038405a227fe0c33c08159 Mon Sep 17 00:00:00 2001
+From 854fd8eeb7b5b93fa14ec504ddcf378f79ef0a6b Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 20:12:09 +0200
-Subject: [PATCH 18/37] musl: sys/auvx.h avaliable on more then just glibc
+Subject: [PATCH 18/36] musl: sys/auvx.h avaliable on more then just glibc
  systems
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -44,5 +44,5 @@ index 9c5645068a..05fea37ee0 100644
    architecture = 8;
    if ((hwcap & HWCAP_FP) != 0)
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0019-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch b/http/firefox/patches/0019-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
index 8d25717f67..c91fdea8e0 100644
--- a/http/firefox/patches/0019-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
+++ b/http/firefox/patches/0019-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
@@ -1,7 +1,7 @@
-From 9410f62391ae3eb1022b807731abdc4f59f947de Mon Sep 17 00:00:00 2001
+From 84c982b24527501f238ee134218f6fc0a886200d Mon Sep 17 00:00:00 2001
 From: Johannes <johannes.brechtmann@gmail.com>
 Date: Fri, 1 May 2020 17:20:29 +0200
-Subject: [PATCH 19/37] musl: make SYS_fork non-fatal, musl uses it for fork(2)
+Subject: [PATCH 19/36] musl: make SYS_fork non-fatal, musl uses it for fork(2)
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
-index 515b11dec4..388add4391 100644
+index 4473da766a..73a6e7fd72 100644
 --- a/security/sandbox/linux/SandboxFilter.cpp
 +++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -1473,6 +1473,10 @@ class ContentSandboxPolicy : public SandboxPolicyCommon {
+@@ -1479,6 +1479,10 @@ class ContentSandboxPolicy : public SandboxPolicyCommon {
          // usually do something reasonable on error.
        case __NR_clone:
          return ClonePolicy(Error(EPERM));
@@ -24,5 +24,5 @@ index 515b11dec4..388add4391 100644
  #  ifdef __NR_fadvise64
        case __NR_fadvise64:
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0020-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch b/http/firefox/patches/0020-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
index 1faa406638..09bc79d85c 100644
--- a/http/firefox/patches/0020-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
+++ b/http/firefox/patches/0020-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
@@ -1,7 +1,7 @@
-From 577ad5ff7d023bc4080f61880efd63839ffa3d31 Mon Sep 17 00:00:00 2001
+From 50e1b3832d329934f36e380b702e0c5510ea9969 Mon Sep 17 00:00:00 2001
 From: Rasmus Thomsen <oss@cogitri.dev>
 Date: Wed, 28 Oct 2020 17:50:24 +0100
-Subject: [PATCH 20/37] musl: include net/if.h before linux/if.h to avoid
+Subject: [PATCH 20/36] musl: include net/if.h before linux/if.h to avoid
  redefinition
 
 Bug: https://bugs.gentoo.org/751469
@@ -23,5 +23,5 @@ index 73e85c6ccc..9eca548638 100644
  #include <csi_platform.h>
  #include <assert.h>
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0021-Make-PGO-use-toolchain.patch b/http/firefox/patches/0021-Make-PGO-use-toolchain.patch
index e020fb4e12..e33fa31b3d 100644
--- a/http/firefox/patches/0021-Make-PGO-use-toolchain.patch
+++ b/http/firefox/patches/0021-Make-PGO-use-toolchain.patch
@@ -1,7 +1,7 @@
-From 665e9833bc25fdcd8f7bfff50bd447de8abf50fd Mon Sep 17 00:00:00 2001
+From c3be81ca6b65ea5eb552656f64213dc8fe3a07b5 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:13:34 +0200
-Subject: [PATCH 21/37] Make PGO use toolchain
+Subject: [PATCH 21/36] Make PGO use toolchain
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -29,5 +29,5 @@ index 3927dd907b..cb4819b230 100644
      # package.
      mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0022-bmo-1516081-Disable-watchdog-during-PGO-builds.patch b/http/firefox/patches/0022-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
index 3d02ac32af..52a11289df 100644
--- a/http/firefox/patches/0022-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
+++ b/http/firefox/patches/0022-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
@@ -1,7 +1,7 @@
-From ead0d88e0e338c7c3a22f0e5e6e54138e16d0f5d Mon Sep 17 00:00:00 2001
+From 67f9686d26702132c3b9a48b9db9b1a9fb04ce1d Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:27:06 +0200
-Subject: [PATCH 22/37] bmo#1516081: Disable watchdog during PGO builds
+Subject: [PATCH 22/36] bmo#1516081: Disable watchdog during PGO builds
 
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1516081
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -51,5 +51,5 @@ index f0d2a08c29..c8797bf12d 100644
    const PRIntervalTime ticksDuration =
        PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch b/http/firefox/patches/0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
index 96abb0bed5..f5bbd292fe 100644
--- a/http/firefox/patches/0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
+++ b/http/firefox/patches/0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
@@ -1,7 +1,7 @@
-From 76549ac67ab84e5a2ddeca467ae315de3128cf4e Mon Sep 17 00:00:00 2001
+From 1fb12bbc7c781c491cff33db3b84b1098eb764d6 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Wed, 15 Apr 2020 00:27:25 +0200
-Subject: [PATCH 23/37] bmo#1516803: force one LTO partition for sandbox when
+Subject: [PATCH 23/36] bmo#1516803: force one LTO partition for sandbox when
  using GCC
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -28,5 +28,5 @@ index 31d2e24118..88d9a2dc6f 100644
  DEFINES["NS_NO_XPCOM"] = True
  DisableStlWrapping()
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0024-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch b/http/firefox/patches/0024-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
index cd089601aa..543cb49513 100644
--- a/http/firefox/patches/0024-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
+++ b/http/firefox/patches/0024-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
@@ -1,7 +1,7 @@
-From 2ff0554bbd24db1e49d9057182ff49be92395280 Mon Sep 17 00:00:00 2001
+From c6f622f69afeb913459913d9108fc6377e62e56a Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:47:13 +0200
-Subject: [PATCH 24/37] bmo#1196777: Set GDK_FOCUS_CHANGE_MASK
+Subject: [PATCH 24/36] bmo#1196777: Set GDK_FOCUS_CHANGE_MASK
 
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1196777
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -10,10 +10,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
-index 828f5062a3..a159f32456 100644
+index f78ce835ef..5dd8d5abfe 100644
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -198,7 +198,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTURE_MASK | GDK_EXPOSURE_MASK |
+@@ -161,7 +161,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTURE_MASK | GDK_EXPOSURE_MASK |
                       GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
                       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
                       GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
@@ -24,5 +24,5 @@ index 828f5062a3..a159f32456 100644
  #if !GTK_CHECK_VERSION(3, 22, 0)
  typedef enum {
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0025-Fix-building-with-PGO-when-using-GCC.patch b/http/firefox/patches/0025-Fix-building-with-PGO-when-using-GCC.patch
index a870d01868..736493c06d 100644
--- a/http/firefox/patches/0025-Fix-building-with-PGO-when-using-GCC.patch
+++ b/http/firefox/patches/0025-Fix-building-with-PGO-when-using-GCC.patch
@@ -1,7 +1,7 @@
-From 9b403dc8840d1f16ace76a9410fe003434a96e1b Mon Sep 17 00:00:00 2001
+From 4f26f225a810afb84a47b7652cb371ff0a54aa38 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 2 Jul 2020 18:05:03 +0200
-Subject: [PATCH 25/37] Fix building with PGO when using GCC
+Subject: [PATCH 25/36] Fix building with PGO when using GCC
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -80,5 +80,5 @@ index 7f3de106ab..89289a7756 100755
          if llvm_profdata:
              profraw_files = glob.glob("*.profraw")
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0026-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch b/http/firefox/patches/0026-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
index b84931932a..3656071e14 100644
--- a/http/firefox/patches/0026-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
+++ b/http/firefox/patches/0026-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
@@ -1,7 +1,7 @@
-From 9621c47f6218e08608f489fe3fcc66a93682d474 Mon Sep 17 00:00:00 2001
+From d2f86ccfa46c1a9a7dc18a92efc1358ad2fefe47 Mon Sep 17 00:00:00 2001
 From: Mike Hommey <mh@glandium.org>
 Date: Mon, 26 Nov 2018 09:59:56 +0900
-Subject: [PATCH 26/37] libaom: Use NEON_FLAGS instead of VPX_ASFLAGS for
+Subject: [PATCH 26/36] libaom: Use NEON_FLAGS instead of VPX_ASFLAGS for
  libaom neon code
 
 Bug: https://bugs.gentoo.org/730606
@@ -24,5 +24,5 @@ index fd8c7f2b33..db3f9ca6ec 100644
      if CONFIG['OS_TARGET'] == 'Android':
          # For cpu-features.h
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0027-build-Disable-Werror.patch b/http/firefox/patches/0027-build-Disable-Werror.patch
index 23b45c3d94..48732209f6 100644
--- a/http/firefox/patches/0027-build-Disable-Werror.patch
+++ b/http/firefox/patches/0027-build-Disable-Werror.patch
@@ -1,7 +1,7 @@
-From e56b9b14238305b82c32cc58c71d1263feab9710 Mon Sep 17 00:00:00 2001
+From bff476ae2d3b6ed086274cc718bc507b5b216256 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Sat, 29 Aug 2020 22:06:15 +0200
-Subject: [PATCH 27/37] build: Disable -Werror
+Subject: [PATCH 27/36] build: Disable -Werror
 
 Bug: https://bugzilla.mozilla.org/822978
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -10,10 +10,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/build/moz.configure/warnings.configure b/build/moz.configure/warnings.configure
-index d0db70f6d3..a2b1f78a5d 100755
+index a54f68cb4e..5d0cacacc5 100755
 --- a/build/moz.configure/warnings.configure
 +++ b/build/moz.configure/warnings.configure
-@@ -234,7 +234,8 @@ with only_when(depends(target)(lambda t: t.kernel == "WINNT")):
+@@ -223,7 +223,8 @@ with only_when(depends(target)(lambda t: t.kernel == "WINNT")):
  check_and_add_gcc_warning("-Wno-gnu-zero-variadic-macro-arguments")
  
  # Make it an error to be missing function declarations for C code.
@@ -24,5 +24,5 @@ index d0db70f6d3..a2b1f78a5d 100755
  # New in clang 11. We can't really do anything about this warning.
  check_and_add_gcc_warning("-Wno-psabi")
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch b/http/firefox/patches/0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
index ec6e6eda5e..8fe8fd6145 100644
--- a/http/firefox/patches/0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
+++ b/http/firefox/patches/0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
@@ -1,7 +1,7 @@
-From fc0da069a26acffede07ab50317f6520b5c4d6de Mon Sep 17 00:00:00 2001
+From d5563aded6d64b67a4dfefdba87ea82357f9b43c Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Sat, 29 Aug 2020 22:30:59 +0200
-Subject: [PATCH 28/37] LTO: Only enable LTO for Rust when complete build uses
+Subject: [PATCH 28/36] LTO: Only enable LTO for Rust when complete build uses
  LTO
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -10,7 +10,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 38e647c101..e683f5ec7e 100644
+index fa62bcddac..4f8de5f4f1 100644
 --- a/config/makefiles/rust.mk
 +++ b/config/makefiles/rust.mk
 @@ -64,6 +64,7 @@ endif
@@ -30,5 +30,5 @@ index 38e647c101..e683f5ec7e 100644
  ifdef CARGO_INCREMENTAL
  export CARGO_INCREMENTAL
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0029-Make-elfhack-use-toolchain.patch b/http/firefox/patches/0029-Make-elfhack-use-toolchain.patch
index 5b41b2c07b..7bb6841356 100644
--- a/http/firefox/patches/0029-Make-elfhack-use-toolchain.patch
+++ b/http/firefox/patches/0029-Make-elfhack-use-toolchain.patch
@@ -1,7 +1,7 @@
-From 22639bcf27d94b1dea4458a50415370fb71126e8 Mon Sep 17 00:00:00 2001
+From 2b316f320f173f8488cc89487af03bfe87d4cc73 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 28 Sep 2020 20:52:24 +0200
-Subject: [PATCH 29/37] Make elfhack use toolchain
+Subject: [PATCH 29/36] Make elfhack use toolchain
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -22,5 +22,5 @@ index 08cc3d6852..c2b575d87a 100644
  test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX): DSO_SONAME=$@
  test-array$(DLL_SUFFIX): DT_TYPE=INIT_ARRAY
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0030-Disable-FFVPX-with-VA-API.patch b/http/firefox/patches/0030-Disable-FFVPX-with-VA-API.patch
index d02e2a5dd1..745b598c4e 100644
--- a/http/firefox/patches/0030-Disable-FFVPX-with-VA-API.patch
+++ b/http/firefox/patches/0030-Disable-FFVPX-with-VA-API.patch
@@ -1,7 +1,7 @@
-From 4933cb13af644a56b2fcfdd529e548ad44713135 Mon Sep 17 00:00:00 2001
+From 163ac78289bf1abc7cfde4250fb494fa2fe3af2e Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:22:48 +0200
-Subject: [PATCH 30/37] Disable FFVPX with VA-API
+Subject: [PATCH 30/36] Disable FFVPX with VA-API
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -87,5 +87,5 @@ index 6e84abde70..fab21747f5 100644
    if (StaticPrefs::media_android_media_codec_enabled()) {
      StartupPDM(AndroidDecoderModule::Create(),
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0031-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch b/http/firefox/patches/0031-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
index a0026445ed..f03dffba7e 100644
--- a/http/firefox/patches/0031-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
+++ b/http/firefox/patches/0031-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
@@ -1,7 +1,7 @@
-From 78bec2b0927a1065d9c38fb3014b84d75586c4f5 Mon Sep 17 00:00:00 2001
+From 4e77c213ffec65e988199a66dbba97a5796f14e0 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:48:06 +0200
-Subject: [PATCH 31/37] Enable FLAC on platforms without ffvpx via ffmpeg
+Subject: [PATCH 31/36] Enable FLAC on platforms without ffvpx via ffmpeg
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -32,5 +32,5 @@ index 2f205c9aae..68847b0952 100644
    return false;
  #endif
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0032-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch b/http/firefox/patches/0032-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
index 942c7f1f79..9b0e57ec4a 100644
--- a/http/firefox/patches/0032-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
+++ b/http/firefox/patches/0032-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
@@ -1,7 +1,7 @@
-From 8fc91e34b5b8421af6ccac800ba40dac983bef05 Mon Sep 17 00:00:00 2001
+From eab0f207b925d1da7a105b4f86d9fe34b089d64d Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Fri, 11 Dec 2020 15:37:38 +0100
-Subject: [PATCH 32/37] bmo#1670333: OpenH264: Fix decoding if it starts on non
+Subject: [PATCH 32/36] bmo#1670333: OpenH264: Fix decoding if it starts on non
  IDR I-frame
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -92,5 +92,5 @@ index 4fc81c0b37..72f3255b6f 100644
    static void EnsureInit();
  };
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0033-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch b/http/firefox/patches/0033-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
index 6257baa55f..8852983cd5 100644
--- a/http/firefox/patches/0033-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
+++ b/http/firefox/patches/0033-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
@@ -1,7 +1,7 @@
-From 23d2a0a96875e1e20f6320a76a093ecb1238c8f9 Mon Sep 17 00:00:00 2001
+From 29cdb142036bb638b9b8ed0eed3ec0985ab3e14d Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Fri, 11 Dec 2020 15:46:25 +0100
-Subject: [PATCH 33/37] bmo#1663844: OpenH264: Allow using OpenH264 GMP decoder
+Subject: [PATCH 33/36] bmo#1663844: OpenH264: Allow using OpenH264 GMP decoder
  as fallback for video decoding
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -51,5 +51,5 @@ index 5019ff5a2d..4ee0ef4518 100644
      mDecodedData.Clear();
      mDecodePromise.RejectIfExists(
 -- 
-2.31.1
+2.32.0
 
diff --git a/http/firefox/patches/0034-bmo-1580595-Wayland-Add-support-for-pointer-lock-via.patch b/http/firefox/patches/0034-bmo-1580595-Wayland-Add-support-for-pointer-lock-via.patch
deleted file mode 100644
index 6b3ae38d21..0000000000
--- a/http/firefox/patches/0034-bmo-1580595-Wayland-Add-support-for-pointer-lock-via.patch
+++ /dev/null
@@ -1,1691 +0,0 @@
-From 2ff38bfc4cd87f6588b946a3026523dfd6b27c2a Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 29 Apr 2021 18:31:05 +0200
-Subject: [PATCH 34/37] bmo#1580595: Wayland: Add support for pointer lock via
- relative-pointer and pointer-constraints
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- dom/events/EventStateManager.cpp              |   8 +
- dom/ipc/BrowserParent.cpp                     |  40 +-
- dom/ipc/BrowserParent.h                       |  12 +
- dom/ipc/PBrowser.ipdl                         |   3 +
- widget/PuppetWidget.cpp                       |  14 +
- widget/PuppetWidget.h                         |   3 +
- widget/gtk/mozgtk/mozgtk.c                    |   1 +
- widget/gtk/mozwayland/mozwayland.c            |   1 +
- widget/gtk/nsWaylandDisplay.cpp               |  25 +
- widget/gtk/nsWaylandDisplay.h                 |  13 +
- widget/gtk/nsWindow.cpp                       | 110 +++
- widget/gtk/nsWindow.h                         |  10 +
- widget/gtk/wayland/moz.build                  |   4 +
- ...-constraints-unstable-v1-client-protocol.h | 650 ++++++++++++++++++
- ...pointer-constraints-unstable-v1-protocol.c |  97 +++
- ...tive-pointer-unstable-v1-client-protocol.h | 293 ++++++++
- .../relative-pointer-unstable-v1-protocol.c   |  69 ++
- widget/nsIWidget.h                            |  10 +
- 18 files changed, 1362 insertions(+), 1 deletion(-)
- create mode 100644 widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h
- create mode 100644 widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c
- create mode 100644 widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h
- create mode 100644 widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c
-
-diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
-index 6bd7e2d822..20da36811d 100644
---- a/dom/events/EventStateManager.cpp
-+++ b/dom/events/EventStateManager.cpp
-@@ -4816,7 +4816,15 @@ void EventStateManager::SetPointerLock(nsIWidget* aWidget,
-     if (dragService) {
-       dragService->Suppress();
-     }
-+
-+    // Activate native pointer lock on platforms where it is required (Wayland)
-+    aWidget->LockNativePointer();
-   } else {
-+    if (aWidget) {
-+      // Deactivate native pointer lock on platforms where it is required
-+      aWidget->UnlockNativePointer();
-+    }
-+
-     // Unlocking, so return pointer to the original position by firing a
-     // synthetic mouse event. We first reset sLastRefPoint to its
-     // pre-pointerlock position, so that the synthetic mouse event reports
-diff --git a/dom/ipc/BrowserParent.cpp b/dom/ipc/BrowserParent.cpp
-index 9bb819f0ee..d7354c9cdd 100644
---- a/dom/ipc/BrowserParent.cpp
-+++ b/dom/ipc/BrowserParent.cpp
-@@ -229,7 +229,8 @@ BrowserParent::BrowserParent(ContentParent* aManager, const TabId& aTabId,
-       mHasLayers(false),
-       mHasPresented(false),
-       mIsReadyToHandleInputEvents(false),
--      mIsMouseEnterIntoWidgetEventSuppressed(false) {
-+      mIsMouseEnterIntoWidgetEventSuppressed(false),
-+      mLockedNativePointer(false) {
-   MOZ_ASSERT(aManager);
-   // When the input event queue is disabled, we don't need to handle the case
-   // that some input events are dispatched before PBrowserConstructor.
-@@ -594,6 +595,7 @@ void BrowserParent::RemoveWindowListeners() {
- }
- 
- void BrowserParent::Deactivated() {
-+  UnlockNativePointer();
-   UnsetTopLevelWebFocus(this);
-   UnsetLastMouseRemoteTarget(this);
-   PointerLockManager::ReleaseLockedRemoteTarget(this);
-@@ -1078,6 +1080,7 @@ void BrowserParent::UpdateDimensions(const nsIntRect& rect,
-     mChromeOffset = chromeOffset;
- 
-     Unused << SendUpdateDimensions(GetDimensionInfo());
-+    UpdateNativePointerLockCenter(widget);
-   }
- }
- 
-@@ -1098,6 +1101,17 @@ DimensionInfo BrowserParent::GetDimensionInfo() {
-   return di;
- }
- 
-+void BrowserParent::UpdateNativePointerLockCenter(nsIWidget* aWidget) {
-+  if (!mLockedNativePointer) {
-+    return;
-+  }
-+  LayoutDeviceIntRect dims(
-+      {0, 0},
-+      ViewAs<LayoutDevicePixel>(
-+          mDimensions, PixelCastJustification::LayoutDeviceIsScreenForTabDims));
-+  aWidget->SetNativePointerLockCenter((dims + mChromeOffset).Center());
-+}
-+
- void BrowserParent::SizeModeChanged(const nsSizeMode& aSizeMode) {
-   if (!mIsDestroyed && aSizeMode != mSizeMode) {
-     mSizeMode = aSizeMode;
-@@ -1899,6 +1913,30 @@ mozilla::ipc::IPCResult BrowserParent::RecvSynthesizeNativeTouchpadDoubleTap(
-   return IPC_OK();
- }
- 
-+mozilla::ipc::IPCResult BrowserParent::RecvLockNativePointer() {
-+  if (nsCOMPtr<nsIWidget> widget = GetWidget()) {
-+    mLockedNativePointer = true;  // do before updating the center
-+    UpdateNativePointerLockCenter(widget);
-+    widget->LockNativePointer();
-+  }
-+  return IPC_OK();
-+}
-+
-+void BrowserParent::UnlockNativePointer() {
-+  if (!mLockedNativePointer) {
-+    return;
-+  }
-+  if (nsCOMPtr<nsIWidget> widget = GetWidget()) {
-+    widget->UnlockNativePointer();
-+    mLockedNativePointer = false;
-+  }
-+}
-+
-+mozilla::ipc::IPCResult BrowserParent::RecvUnlockNativePointer() {
-+  UnlockNativePointer();
-+  return IPC_OK();
-+}
-+
- void BrowserParent::SendRealKeyEvent(WidgetKeyboardEvent& aEvent) {
-   if (mIsDestroyed || !mIsReadyToHandleInputEvents) {
-     return;
-diff --git a/dom/ipc/BrowserParent.h b/dom/ipc/BrowserParent.h
-index 5b53b13e27..2f92129d7e 100644
---- a/dom/ipc/BrowserParent.h
-+++ b/dom/ipc/BrowserParent.h
-@@ -547,6 +547,10 @@ class BrowserParent final : public PBrowserParent,
-   mozilla::ipc::IPCResult RecvSynthesizeNativeTouchpadDoubleTap(
-       const LayoutDeviceIntPoint& aPoint, const uint32_t& aModifierFlags);
- 
-+  mozilla::ipc::IPCResult RecvLockNativePointer();
-+
-+  mozilla::ipc::IPCResult RecvUnlockNativePointer();
-+
-   void SendMouseEvent(const nsAString& aType, float aX, float aY,
-                       int32_t aButton, int32_t aClickCount, int32_t aModifiers);
- 
-@@ -794,6 +798,10 @@ class BrowserParent final : public PBrowserParent,
-   // and have to ensure that the child did not modify links to be loaded.
-   bool QueryDropLinksForVerification();
- 
-+  void UnlockNativePointer();
-+
-+  void UpdateNativePointerLockCenter(nsIWidget* aWidget);
-+
-  private:
-   // This is used when APZ needs to find the BrowserParent associated with a
-   // layer to dispatch events.
-@@ -977,6 +985,10 @@ class BrowserParent final : public PBrowserParent,
-   // BrowserChild was not ready to handle it. We will resend it when the next
-   // time we fire a mouse event and the BrowserChild is ready.
-   bool mIsMouseEnterIntoWidgetEventSuppressed : 1;
-+
-+  // True after RecvLockNativePointer has been called and until
-+  // UnlockNativePointer has been called.
-+  bool mLockedNativePointer : 1;
- };
- 
- struct MOZ_STACK_CLASS BrowserParent::AutoUseNewTab final {
-diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
-index 4bbd6dcfdd..5447912941 100644
---- a/dom/ipc/PBrowser.ipdl
-+++ b/dom/ipc/PBrowser.ipdl
-@@ -538,6 +538,9 @@ parent:
-     async SynthesizeNativeTouchpadDoubleTap(LayoutDeviceIntPoint aPoint,
-                                             uint32_t aModifierFlags);
- 
-+    async LockNativePointer();
-+    async UnlockNativePointer();
-+
-     async AccessKeyNotHandled(WidgetKeyboardEvent event);
- 
-     async RegisterProtocolHandler(nsString scheme, nsIURI handlerURI, nsString title,
-diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp
-index 085fef6642..db71c13594 100644
---- a/widget/PuppetWidget.cpp
-+++ b/widget/PuppetWidget.cpp
-@@ -533,6 +533,20 @@ nsresult PuppetWidget::SynthesizeNativeTouchpadDoubleTap(
-   return NS_OK;
- }
- 
-+void PuppetWidget::LockNativePointer() {
-+  if (!mBrowserChild) {
-+    return;
-+  }
-+  mBrowserChild->SendLockNativePointer();
-+}
-+
-+void PuppetWidget::UnlockNativePointer() {
-+  if (!mBrowserChild) {
-+    return;
-+  }
-+  mBrowserChild->SendUnlockNativePointer();
-+}
-+
- void PuppetWidget::SetConfirmedTargetAPZC(
-     uint64_t aInputBlockId,
-     const nsTArray<ScrollableLayerGuid>& aTargets) const {
-diff --git a/widget/PuppetWidget.h b/widget/PuppetWidget.h
-index c34f7f4b85..afbea5fe5d 100644
---- a/widget/PuppetWidget.h
-+++ b/widget/PuppetWidget.h
-@@ -281,6 +281,9 @@ class PuppetWidget : public nsBaseWidget,
-   virtual nsresult SynthesizeNativeTouchpadDoubleTap(
-       LayoutDeviceIntPoint aPoint, uint32_t aModifierFlags) override;
- 
-+  virtual void LockNativePointer() override;
-+  virtual void UnlockNativePointer() override;
-+
-   virtual void StartAsyncScrollbarDrag(
-       const AsyncDragMetrics& aDragMetrics) override;
- 
-diff --git a/widget/gtk/mozgtk/mozgtk.c b/widget/gtk/mozgtk/mozgtk.c
-index 54f5d08efe..02e5db6e9e 100644
---- a/widget/gtk/mozgtk/mozgtk.c
-+++ b/widget/gtk/mozgtk/mozgtk.c
-@@ -647,6 +647,7 @@ STUB(gtk_color_chooser_get_type)
- STUB(gtk_color_chooser_set_rgba)
- STUB(gtk_color_chooser_get_rgba)
- STUB(gtk_color_chooser_set_use_alpha)
-+STUB(gdk_wayland_device_get_wl_pointer)
- #endif
- 
- #ifdef GTK2_SYMBOLS
-diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
-index 8a79d87865..7a448e6321 100644
---- a/widget/gtk/mozwayland/mozwayland.c
-+++ b/widget/gtk/mozwayland/mozwayland.c
-@@ -23,6 +23,7 @@ const struct wl_interface wl_callback_interface;
- const struct wl_interface wl_data_device_interface;
- const struct wl_interface wl_data_device_manager_interface;
- const struct wl_interface wl_keyboard_interface;
-+const struct wl_interface wl_pointer_interface;
- const struct wl_interface wl_region_interface;
- const struct wl_interface wl_registry_interface;
- const struct wl_interface wl_shm_interface;
-diff --git a/widget/gtk/nsWaylandDisplay.cpp b/widget/gtk/nsWaylandDisplay.cpp
-index 55ca07fc37..49addfeecc 100644
---- a/widget/gtk/nsWaylandDisplay.cpp
-+++ b/widget/gtk/nsWaylandDisplay.cpp
-@@ -119,6 +119,16 @@ void nsWaylandDisplay::SetViewporter(wp_viewporter* aViewporter) {
-   mViewporter = aViewporter;
- }
- 
-+void nsWaylandDisplay::SetRelativePointerManager(
-+    zwp_relative_pointer_manager_v1* aRelativePointerManager) {
-+  mRelativePointerManager = aRelativePointerManager;
-+}
-+
-+void nsWaylandDisplay::SetPointerConstraints(
-+    zwp_pointer_constraints_v1* aPointerConstraints) {
-+  mPointerConstraints = aPointerConstraints;
-+}
-+
- static void global_registry_handler(void* data, wl_registry* registry,
-                                     uint32_t id, const char* interface,
-                                     uint32_t version) {
-@@ -167,6 +177,19 @@ static void global_registry_handler(void* data, wl_registry* registry,
-     wl_proxy_set_queue((struct wl_proxy*)idle_inhibit_manager,
-                        display->GetEventQueue());
-     display->SetIdleInhibitManager(idle_inhibit_manager);
-+  } else if (strcmp(interface, "zwp_relative_pointer_manager_v1") == 0) {
-+    auto* relative_pointer_manager =
-+        WaylandRegistryBind<zwp_relative_pointer_manager_v1>(
-+            registry, id, &zwp_relative_pointer_manager_v1_interface, 1);
-+    wl_proxy_set_queue((struct wl_proxy*)relative_pointer_manager,
-+                       display->GetEventQueue());
-+    display->SetRelativePointerManager(relative_pointer_manager);
-+  } else if (strcmp(interface, "zwp_pointer_constraints_v1") == 0) {
-+    auto* pointer_constraints = WaylandRegistryBind<zwp_pointer_constraints_v1>(
-+        registry, id, &zwp_pointer_constraints_v1_interface, 1);
-+    wl_proxy_set_queue((struct wl_proxy*)pointer_constraints,
-+                       display->GetEventQueue());
-+    display->SetPointerConstraints(pointer_constraints);
-   } else if (strcmp(interface, "wl_compositor") == 0) {
-     // Requested wl_compositor version 4 as we need wl_surface_damage_buffer().
-     auto* compositor = WaylandRegistryBind<wl_compositor>(
-@@ -285,6 +308,8 @@ nsWaylandDisplay::nsWaylandDisplay(wl_display* aDisplay, bool aLighWrapper)
-       mPrimarySelectionDeviceManagerGtk(nullptr),
-       mPrimarySelectionDeviceManagerZwpV1(nullptr),
-       mIdleInhibitManager(nullptr),
-+      mRelativePointerManager(nullptr),
-+      mPointerConstraints(nullptr),
-       mRegistry(nullptr),
-       mViewporter(nullptr),
-       mExplicitSync(false) {
-diff --git a/widget/gtk/nsWaylandDisplay.h b/widget/gtk/nsWaylandDisplay.h
-index 0f94ae14f7..bc68b27b11 100644
---- a/widget/gtk/nsWaylandDisplay.h
-+++ b/widget/gtk/nsWaylandDisplay.h
-@@ -14,6 +14,8 @@
- #include "mozilla/widget/gbm.h"
- #include "mozilla/widget/gtk-primary-selection-client-protocol.h"
- #include "mozilla/widget/idle-inhibit-unstable-v1-client-protocol.h"
-+#include "mozilla/widget/relative-pointer-unstable-v1-client-protocol.h"
-+#include "mozilla/widget/pointer-constraints-unstable-v1-client-protocol.h"
- #include "mozilla/widget/linux-dmabuf-unstable-v1-client-protocol.h"
- #include "mozilla/widget/primary-selection-unstable-v1-client-protocol.h"
- #include "mozilla/widget/viewporter-client-protocol.h"
-@@ -62,6 +64,12 @@ class nsWaylandDisplay {
-   zwp_idle_inhibit_manager_v1* GetIdleInhibitManager(void) {
-     return mIdleInhibitManager;
-   }
-+  zwp_relative_pointer_manager_v1* GetRelativePointerManager(void) {
-+    return mRelativePointerManager;
-+  }
-+  zwp_pointer_constraints_v1* GetPointerConstraints(void) {
-+    return mPointerConstraints;
-+  }
-   wp_viewporter* GetViewporter(void) { return mViewporter; };
- 
-   bool IsMainThreadDisplay() { return mEventQueue == nullptr; }
-@@ -78,6 +86,9 @@ class nsWaylandDisplay {
-   void SetIdleInhibitManager(zwp_idle_inhibit_manager_v1* aIdleInhibitManager);
-   void SetViewporter(wp_viewporter* aViewporter);
- 
-+  void SetRelativePointerManager(
-+      zwp_relative_pointer_manager_v1* aRelativePointerManager);
-+  void SetPointerConstraints(zwp_pointer_constraints_v1* aPointerConstraints);
-   bool IsExplicitSyncEnabled() { return mExplicitSync; }
- 
-  private:
-@@ -95,6 +106,8 @@ class nsWaylandDisplay {
-   gtk_primary_selection_device_manager* mPrimarySelectionDeviceManagerGtk;
-   zwp_primary_selection_device_manager_v1* mPrimarySelectionDeviceManagerZwpV1;
-   zwp_idle_inhibit_manager_v1* mIdleInhibitManager;
-+  zwp_relative_pointer_manager_v1* mRelativePointerManager;
-+  zwp_pointer_constraints_v1* mPointerConstraints;
-   wl_registry* mRegistry;
-   wp_viewporter* mViewporter;
-   bool mExplicitSync;
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
-index a159f32456..8d06f91f89 100644
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -506,6 +506,9 @@ nsWindow::nsWindow() {
- #ifdef MOZ_WAYLAND
-   mNeedsCompositorResume = false;
-   mCompositorInitiallyPaused = false;
-+  mNativePointerLockCenter = LayoutDeviceIntPoint();
-+  mRelativePointer = nullptr;
-+  mLockedPointer = nullptr;
- #endif
-   mWaitingForMoveToRectCB = false;
-   mPendingSizeRect = LayoutDeviceIntRect(0, 0, 0, 0);
-@@ -8018,6 +8021,13 @@ nsresult nsWindow::SynthesizeNativeMouseEvent(
-       // all other cases we'll synthesize a motion event that will be emitted by
-       // gdk_display_warp_pointer().
-       // XXX How to activate native modifier for the other events?
-+#ifdef MOZ_WAYLAND
-+      // Impossible to warp the pointer on Wayland.
-+      // For pointer lock, pointer-constraints and relative-pointer are used.
-+      if (GdkIsWaylandDisplay()) {
-+        return NS_OK;
-+      }
-+#endif
-       GdkScreen* screen = gdk_window_get_screen(mGdkWindow);
-       GdkPoint point = DevicePixelsToGdkPointRoundDown(aPoint);
-       gdk_display_warp_pointer(display, screen, point.x, point.y);
-@@ -8441,6 +8451,106 @@ already_AddRefed<nsIWidget> nsIWidget::CreateChildWindow() {
- }
- 
- #ifdef MOZ_WAYLAND
-+static void relative_pointer_handle_relative_motion(
-+    void* data, struct zwp_relative_pointer_v1* pointer, uint32_t time_hi,
-+    uint32_t time_lo, wl_fixed_t dx_w, wl_fixed_t dy_w, wl_fixed_t dx_unaccel_w,
-+    wl_fixed_t dy_unaccel_w) {
-+  RefPtr<nsWindow> window(reinterpret_cast<nsWindow*>(data));
-+
-+  WidgetMouseEvent event(true, eMouseMove, window, WidgetMouseEvent::eReal);
-+
-+  event.mRefPoint = window->GetNativePointerLockCenter();
-+  event.mRefPoint.x += wl_fixed_to_double(dx_unaccel_w);
-+  event.mRefPoint.y += wl_fixed_to_double(dy_unaccel_w);
-+
-+  event.AssignEventTime(window->GetWidgetEventTime(time_lo));
-+  window->DispatchInputEvent(&event);
-+}
-+
-+static const struct zwp_relative_pointer_v1_listener relative_pointer_listener =
-+    {
-+        relative_pointer_handle_relative_motion,
-+};
-+
-+void nsWindow::SetNativePointerLockCenter(
-+    const LayoutDeviceIntPoint& aLockCenter) {
-+  mNativePointerLockCenter = aLockCenter;
-+}
-+
-+void nsWindow::LockNativePointer() {
-+  if (!GdkIsWaylandDisplay()) {
-+    return;
-+  }
-+
-+  auto waylandDisplay = WaylandDisplayGet();
-+
-+  auto* pointerConstraints = waylandDisplay->GetPointerConstraints();
-+  if (!pointerConstraints) {
-+    return;
-+  }
-+
-+  auto* relativePointerMgr = waylandDisplay->GetRelativePointerManager();
-+  if (!relativePointerMgr) {
-+    return;
-+  }
-+
-+  GdkDisplay* display = gdk_display_get_default();
-+
-+  GdkDeviceManager* manager = gdk_display_get_device_manager(display);
-+  MOZ_ASSERT(manager);
-+
-+  GdkDevice* device = gdk_device_manager_get_client_pointer(manager);
-+  if (!device) {
-+    NS_WARNING("Could not find Wayland pointer to lock");
-+    return;
-+  }
-+  wl_pointer* pointer = gdk_wayland_device_get_wl_pointer(device);
-+  MOZ_ASSERT(pointer);
-+
-+  wl_surface* surface =
-+      gdk_wayland_window_get_wl_surface(gtk_widget_get_window(GetGtkWidget()));
-+  if (!surface) {
-+    /* Can be null when the window is hidden.
-+     * Though it's unlikely that a lock request comes in that case, be
-+     * defensive. */
-+    return;
-+  }
-+
-+  mLockedPointer = zwp_pointer_constraints_v1_lock_pointer(
-+      pointerConstraints, surface, pointer, nullptr,
-+      ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
-+  if (!mLockedPointer) {
-+    NS_WARNING("Could not lock Wayland pointer");
-+    return;
-+  }
-+
-+  mRelativePointer = zwp_relative_pointer_manager_v1_get_relative_pointer(
-+      relativePointerMgr, pointer);
-+  if (!mRelativePointer) {
-+    NS_WARNING("Could not create relative Wayland pointer");
-+    zwp_locked_pointer_v1_destroy(mLockedPointer);
-+    mLockedPointer = nullptr;
-+    return;
-+  }
-+
-+  zwp_relative_pointer_v1_add_listener(mRelativePointer,
-+                                       &relative_pointer_listener, this);
-+}
-+
-+void nsWindow::UnlockNativePointer() {
-+  if (!GdkIsWaylandDisplay()) {
-+    return;
-+  }
-+  if (mRelativePointer) {
-+    zwp_relative_pointer_v1_destroy(mRelativePointer);
-+    mRelativePointer = nullptr;
-+  }
-+  if (mLockedPointer) {
-+    zwp_locked_pointer_v1_destroy(mLockedPointer);
-+    mLockedPointer = nullptr;
-+  }
-+}
-+
- nsresult nsWindow::GetScreenRect(LayoutDeviceIntRect* aRect) {
-   typedef struct _GdkMonitor GdkMonitor;
-   static auto s_gdk_display_get_monitor_at_window =
-diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
-index e2721d0e5b..aa340f4ee0 100644
---- a/widget/gtk/nsWindow.h
-+++ b/widget/gtk/nsWindow.h
-@@ -423,6 +423,13 @@ class nsWindow final : public nsBaseWidget {
-   static bool GetTopLevelWindowActiveState(nsIFrame* aFrame);
-   static bool TitlebarUseShapeMask();
- #ifdef MOZ_WAYLAND
-+  LayoutDeviceIntPoint GetNativePointerLockCenter() {
-+    return mNativePointerLockCenter;
-+  }
-+  virtual void SetNativePointerLockCenter(
-+      const LayoutDeviceIntPoint& aLockCenter) override;
-+  virtual void LockNativePointer() override;
-+  virtual void UnlockNativePointer() override;
-   virtual nsresult GetScreenRect(LayoutDeviceIntRect* aRect) override;
-   virtual nsRect GetPreferredPopupRect() override {
-     return mPreferredPopupRect;
-@@ -480,6 +487,7 @@ class nsWindow final : public nsBaseWidget {
- #ifdef MOZ_WAYLAND
-   bool mNeedsCompositorResume;
-   bool mCompositorInitiallyPaused;
-+  LayoutDeviceIntPoint mNativePointerLockCenter;
- #endif
-   bool mWindowScaleFactorChanged;
-   int mWindowScaleFactor;
-@@ -561,6 +569,8 @@ class nsWindow final : public nsBaseWidget {
- #endif
- #ifdef MOZ_WAYLAND
-   RefPtr<mozilla::gfx::VsyncSource> mWaylandVsyncSource;
-+  zwp_locked_pointer_v1* mLockedPointer;
-+  zwp_relative_pointer_v1* mRelativePointer;
- #endif
- 
-   // Upper bound on pending ConfigureNotify events to be dispatched to the
-diff --git a/widget/gtk/wayland/moz.build b/widget/gtk/wayland/moz.build
-index 21a5bee855..c3959760da 100644
---- a/widget/gtk/wayland/moz.build
-+++ b/widget/gtk/wayland/moz.build
-@@ -11,7 +11,9 @@ SOURCES += [
-     "gtk-primary-selection-protocol.c",
-     "idle-inhibit-unstable-v1-protocol.c",
-     "linux-dmabuf-unstable-v1-protocol.c",
-+    "pointer-constraints-unstable-v1-protocol.c",
-     "primary-selection-unstable-v1-protocol.c",
-+    "relative-pointer-unstable-v1-protocol.c",
-     "viewporter-protocol.c",
-     "xdg-output-unstable-v1-protocol.c",
- ]
-@@ -21,7 +23,9 @@ EXPORTS.mozilla.widget += [
-     "gtk-primary-selection-client-protocol.h",
-     "idle-inhibit-unstable-v1-client-protocol.h",
-     "linux-dmabuf-unstable-v1-client-protocol.h",
-+    "pointer-constraints-unstable-v1-client-protocol.h",
-     "primary-selection-unstable-v1-client-protocol.h",
-+    "relative-pointer-unstable-v1-client-protocol.h",
-     "va_drmcommon.h",
-     "viewporter-client-protocol.h",
-     "xdg-output-unstable-v1-client-protocol.h",
-diff --git a/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h b/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h
-new file mode 100644
-index 0000000000..0f38dee226
---- /dev/null
-+++ b/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h
-@@ -0,0 +1,650 @@
-+/* Generated by wayland-scanner 1.18.0 */
-+
-+#ifndef POINTER_CONSTRAINTS_UNSTABLE_V1_CLIENT_PROTOCOL_H
-+#define POINTER_CONSTRAINTS_UNSTABLE_V1_CLIENT_PROTOCOL_H
-+
-+#include <stdint.h>
-+#include <stddef.h>
-+#include "wayland-client.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/**
-+ * @page page_pointer_constraints_unstable_v1 The
-+ * pointer_constraints_unstable_v1 protocol protocol for constraining pointer
-+ * motions
-+ *
-+ * @section page_desc_pointer_constraints_unstable_v1 Description
-+ *
-+ * This protocol specifies a set of interfaces used for adding constraints to
-+ * the motion of a pointer. Possible constraints include confining pointer
-+ * motions to a given region, or locking it to its current position.
-+ *
-+ * In order to constrain the pointer, a client must first bind the global
-+ * interface "wp_pointer_constraints" which, if a compositor supports pointer
-+ * constraints, is exposed by the registry. Using the bound global object, the
-+ * client uses the request that corresponds to the type of constraint it wants
-+ * to make. See wp_pointer_constraints for more details.
-+ *
-+ * Warning! The protocol described in this file is experimental and backward
-+ * incompatible changes may be made. Backward compatible changes may be added
-+ * together with the corresponding interface version bump. Backward
-+ * incompatible changes are done by bumping the version number in the protocol
-+ * and interface names and resetting the interface version. Once the protocol
-+ * is to be declared stable, the 'z' prefix and the version number in the
-+ * protocol and interface names are removed and the interface version number is
-+ * reset.
-+ *
-+ * @section page_ifaces_pointer_constraints_unstable_v1 Interfaces
-+ * - @subpage page_iface_zwp_pointer_constraints_v1 - constrain the movement of
-+ * a pointer
-+ * - @subpage page_iface_zwp_locked_pointer_v1 - receive relative pointer motion
-+ * events
-+ * - @subpage page_iface_zwp_confined_pointer_v1 - confined pointer object
-+ * @section page_copyright_pointer_constraints_unstable_v1 Copyright
-+ * <pre>
-+ *
-+ * Copyright © 2014      Jonas Ådahl
-+ * Copyright © 2015      Red Hat Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ * </pre>
-+ */
-+struct wl_pointer;
-+struct wl_region;
-+struct wl_surface;
-+struct zwp_confined_pointer_v1;
-+struct zwp_locked_pointer_v1;
-+struct zwp_pointer_constraints_v1;
-+
-+/**
-+ * @page page_iface_zwp_pointer_constraints_v1 zwp_pointer_constraints_v1
-+ * @section page_iface_zwp_pointer_constraints_v1_desc Description
-+ *
-+ * The global interface exposing pointer constraining functionality. It
-+ * exposes two requests: lock_pointer for locking the pointer to its
-+ * position, and confine_pointer for locking the pointer to a region.
-+ *
-+ * The lock_pointer and confine_pointer requests create the objects
-+ * wp_locked_pointer and wp_confined_pointer respectively, and the client can
-+ * use these objects to interact with the lock.
-+ *
-+ * For any surface, only one lock or confinement may be active across all
-+ * wl_pointer objects of the same seat. If a lock or confinement is requested
-+ * when another lock or confinement is active or requested on the same surface
-+ * and with any of the wl_pointer objects of the same seat, an
-+ * 'already_constrained' error will be raised.
-+ * @section page_iface_zwp_pointer_constraints_v1_api API
-+ * See @ref iface_zwp_pointer_constraints_v1.
-+ */
-+/**
-+ * @defgroup iface_zwp_pointer_constraints_v1 The zwp_pointer_constraints_v1
-+ * interface
-+ *
-+ * The global interface exposing pointer constraining functionality. It
-+ * exposes two requests: lock_pointer for locking the pointer to its
-+ * position, and confine_pointer for locking the pointer to a region.
-+ *
-+ * The lock_pointer and confine_pointer requests create the objects
-+ * wp_locked_pointer and wp_confined_pointer respectively, and the client can
-+ * use these objects to interact with the lock.
-+ *
-+ * For any surface, only one lock or confinement may be active across all
-+ * wl_pointer objects of the same seat. If a lock or confinement is requested
-+ * when another lock or confinement is active or requested on the same surface
-+ * and with any of the wl_pointer objects of the same seat, an
-+ * 'already_constrained' error will be raised.
-+ */
-+extern const struct wl_interface zwp_pointer_constraints_v1_interface;
-+/**
-+ * @page page_iface_zwp_locked_pointer_v1 zwp_locked_pointer_v1
-+ * @section page_iface_zwp_locked_pointer_v1_desc Description
-+ *
-+ * The wp_locked_pointer interface represents a locked pointer state.
-+ *
-+ * While the lock of this object is active, the wl_pointer objects of the
-+ * associated seat will not emit any wl_pointer.motion events.
-+ *
-+ * This object will send the event 'locked' when the lock is activated.
-+ * Whenever the lock is activated, it is guaranteed that the locked surface
-+ * will already have received pointer focus and that the pointer will be
-+ * within the region passed to the request creating this object.
-+ *
-+ * To unlock the pointer, send the destroy request. This will also destroy
-+ * the wp_locked_pointer object.
-+ *
-+ * If the compositor decides to unlock the pointer the unlocked event is
-+ * sent. See wp_locked_pointer.unlock for details.
-+ *
-+ * When unlocking, the compositor may warp the cursor position to the set
-+ * cursor position hint. If it does, it will not result in any relative
-+ * motion events emitted via wp_relative_pointer.
-+ *
-+ * If the surface the lock was requested on is destroyed and the lock is not
-+ * yet activated, the wp_locked_pointer object is now defunct and must be
-+ * destroyed.
-+ * @section page_iface_zwp_locked_pointer_v1_api API
-+ * See @ref iface_zwp_locked_pointer_v1.
-+ */
-+/**
-+ * @defgroup iface_zwp_locked_pointer_v1 The zwp_locked_pointer_v1 interface
-+ *
-+ * The wp_locked_pointer interface represents a locked pointer state.
-+ *
-+ * While the lock of this object is active, the wl_pointer objects of the
-+ * associated seat will not emit any wl_pointer.motion events.
-+ *
-+ * This object will send the event 'locked' when the lock is activated.
-+ * Whenever the lock is activated, it is guaranteed that the locked surface
-+ * will already have received pointer focus and that the pointer will be
-+ * within the region passed to the request creating this object.
-+ *
-+ * To unlock the pointer, send the destroy request. This will also destroy
-+ * the wp_locked_pointer object.
-+ *
-+ * If the compositor decides to unlock the pointer the unlocked event is
-+ * sent. See wp_locked_pointer.unlock for details.
-+ *
-+ * When unlocking, the compositor may warp the cursor position to the set
-+ * cursor position hint. If it does, it will not result in any relative
-+ * motion events emitted via wp_relative_pointer.
-+ *
-+ * If the surface the lock was requested on is destroyed and the lock is not
-+ * yet activated, the wp_locked_pointer object is now defunct and must be
-+ * destroyed.
-+ */
-+extern const struct wl_interface zwp_locked_pointer_v1_interface;
-+/**
-+ * @page page_iface_zwp_confined_pointer_v1 zwp_confined_pointer_v1
-+ * @section page_iface_zwp_confined_pointer_v1_desc Description
-+ *
-+ * The wp_confined_pointer interface represents a confined pointer state.
-+ *
-+ * This object will send the event 'confined' when the confinement is
-+ * activated. Whenever the confinement is activated, it is guaranteed that
-+ * the surface the pointer is confined to will already have received pointer
-+ * focus and that the pointer will be within the region passed to the request
-+ * creating this object. It is up to the compositor to decide whether this
-+ * requires some user interaction and if the pointer will warp to within the
-+ * passed region if outside.
-+ *
-+ * To unconfine the pointer, send the destroy request. This will also destroy
-+ * the wp_confined_pointer object.
-+ *
-+ * If the compositor decides to unconfine the pointer the unconfined event is
-+ * sent. The wp_confined_pointer object is at this point defunct and should
-+ * be destroyed.
-+ * @section page_iface_zwp_confined_pointer_v1_api API
-+ * See @ref iface_zwp_confined_pointer_v1.
-+ */
-+/**
-+ * @defgroup iface_zwp_confined_pointer_v1 The zwp_confined_pointer_v1 interface
-+ *
-+ * The wp_confined_pointer interface represents a confined pointer state.
-+ *
-+ * This object will send the event 'confined' when the confinement is
-+ * activated. Whenever the confinement is activated, it is guaranteed that
-+ * the surface the pointer is confined to will already have received pointer
-+ * focus and that the pointer will be within the region passed to the request
-+ * creating this object. It is up to the compositor to decide whether this
-+ * requires some user interaction and if the pointer will warp to within the
-+ * passed region if outside.
-+ *
-+ * To unconfine the pointer, send the destroy request. This will also destroy
-+ * the wp_confined_pointer object.
-+ *
-+ * If the compositor decides to unconfine the pointer the unconfined event is
-+ * sent. The wp_confined_pointer object is at this point defunct and should
-+ * be destroyed.
-+ */
-+extern const struct wl_interface zwp_confined_pointer_v1_interface;
-+
-+#ifndef ZWP_POINTER_CONSTRAINTS_V1_ERROR_ENUM
-+#  define ZWP_POINTER_CONSTRAINTS_V1_ERROR_ENUM
-+/**
-+ * @ingroup iface_zwp_pointer_constraints_v1
-+ * wp_pointer_constraints error values
-+ *
-+ * These errors can be emitted in response to wp_pointer_constraints
-+ * requests.
-+ */
-+enum zwp_pointer_constraints_v1_error {
-+  /**
-+   * pointer constraint already requested on that surface
-+   */
-+  ZWP_POINTER_CONSTRAINTS_V1_ERROR_ALREADY_CONSTRAINED = 1,
-+};
-+#endif /* ZWP_POINTER_CONSTRAINTS_V1_ERROR_ENUM */
-+
-+#ifndef ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ENUM
-+#  define ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ENUM
-+/**
-+ * @ingroup iface_zwp_pointer_constraints_v1
-+ * the pointer constraint may reactivate
-+ *
-+ * A persistent pointer constraint may again reactivate once it has
-+ * been deactivated. See the corresponding deactivation event
-+ * (wp_locked_pointer.unlocked and wp_confined_pointer.unconfined) for
-+ * details.
-+ */
-+enum zwp_pointer_constraints_v1_lifetime {
-+  ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT = 1,
-+  ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT = 2,
-+};
-+#endif /* ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ENUM */
-+
-+#define ZWP_POINTER_CONSTRAINTS_V1_DESTROY 0
-+#define ZWP_POINTER_CONSTRAINTS_V1_LOCK_POINTER 1
-+#define ZWP_POINTER_CONSTRAINTS_V1_CONFINE_POINTER 2
-+
-+/**
-+ * @ingroup iface_zwp_pointer_constraints_v1
-+ */
-+#define ZWP_POINTER_CONSTRAINTS_V1_DESTROY_SINCE_VERSION 1
-+/**
-+ * @ingroup iface_zwp_pointer_constraints_v1
-+ */
-+#define ZWP_POINTER_CONSTRAINTS_V1_LOCK_POINTER_SINCE_VERSION 1
-+/**
-+ * @ingroup iface_zwp_pointer_constraints_v1
-+ */
-+#define ZWP_POINTER_CONSTRAINTS_V1_CONFINE_POINTER_SINCE_VERSION 1
-+
-+/** @ingroup iface_zwp_pointer_constraints_v1 */
-+static inline void zwp_pointer_constraints_v1_set_user_data(
-+    struct zwp_pointer_constraints_v1* zwp_pointer_constraints_v1,
-+    void* user_data) {
-+  wl_proxy_set_user_data((struct wl_proxy*)zwp_pointer_constraints_v1,
-+                         user_data);
-+}
-+
-+/** @ingroup iface_zwp_pointer_constraints_v1 */
-+static inline void* zwp_pointer_constraints_v1_get_user_data(
-+    struct zwp_pointer_constraints_v1* zwp_pointer_constraints_v1) {
-+  return wl_proxy_get_user_data((struct wl_proxy*)zwp_pointer_constraints_v1);
-+}
-+
-+static inline uint32_t zwp_pointer_constraints_v1_get_version(
-+    struct zwp_pointer_constraints_v1* zwp_pointer_constraints_v1) {
-+  return wl_proxy_get_version((struct wl_proxy*)zwp_pointer_constraints_v1);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_pointer_constraints_v1
-+ *
-+ * Used by the client to notify the server that it will no longer use this
-+ * pointer constraints object.
-+ */
-+static inline void zwp_pointer_constraints_v1_destroy(
-+    struct zwp_pointer_constraints_v1* zwp_pointer_constraints_v1) {
-+  wl_proxy_marshal((struct wl_proxy*)zwp_pointer_constraints_v1,
-+                   ZWP_POINTER_CONSTRAINTS_V1_DESTROY);
-+
-+  wl_proxy_destroy((struct wl_proxy*)zwp_pointer_constraints_v1);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_pointer_constraints_v1
-+ *
-+ * The lock_pointer request lets the client request to disable movements of
-+ * the virtual pointer (i.e. the cursor), effectively locking the pointer
-+ * to a position. This request may not take effect immediately; in the
-+ * future, when the compositor deems implementation-specific constraints
-+ * are satisfied, the pointer lock will be activated and the compositor
-+ * sends a locked event.
-+ *
-+ * The protocol provides no guarantee that the constraints are ever
-+ * satisfied, and does not require the compositor to send an error if the
-+ * constraints cannot ever be satisfied. It is thus possible to request a
-+ * lock that will never activate.
-+ *
-+ * There may not be another pointer constraint of any kind requested or
-+ * active on the surface for any of the wl_pointer objects of the seat of
-+ * the passed pointer when requesting a lock. If there is, an error will be
-+ * raised. See general pointer lock documentation for more details.
-+ *
-+ * The intersection of the region passed with this request and the input
-+ * region of the surface is used to determine where the pointer must be
-+ * in order for the lock to activate. It is up to the compositor whether to
-+ * warp the pointer or require some kind of user interaction for the lock
-+ * to activate. If the region is null the surface input region is used.
-+ *
-+ * A surface may receive pointer focus without the lock being activated.
-+ *
-+ * The request creates a new object wp_locked_pointer which is used to
-+ * interact with the lock as well as receive updates about its state. See
-+ * the the description of wp_locked_pointer for further information.
-+ *
-+ * Note that while a pointer is locked, the wl_pointer objects of the
-+ * corresponding seat will not emit any wl_pointer.motion events, but
-+ * relative motion events will still be emitted via wp_relative_pointer
-+ * objects of the same seat. wl_pointer.axis and wl_pointer.button events
-+ * are unaffected.
-+ */
-+static inline struct zwp_locked_pointer_v1*
-+zwp_pointer_constraints_v1_lock_pointer(
-+    struct zwp_pointer_constraints_v1* zwp_pointer_constraints_v1,
-+    struct wl_surface* surface, struct wl_pointer* pointer,
-+    struct wl_region* region, uint32_t lifetime) {
-+  struct wl_proxy* id;
-+
-+  id = wl_proxy_marshal_constructor(
-+      (struct wl_proxy*)zwp_pointer_constraints_v1,
-+      ZWP_POINTER_CONSTRAINTS_V1_LOCK_POINTER, &zwp_locked_pointer_v1_interface,
-+      NULL, surface, pointer, region, lifetime);
-+
-+  return (struct zwp_locked_pointer_v1*)id;
-+}
-+
-+/**
-+ * @ingroup iface_zwp_pointer_constraints_v1
-+ *
-+ * The confine_pointer request lets the client request to confine the
-+ * pointer cursor to a given region. This request may not take effect
-+ * immediately; in the future, when the compositor deems implementation-
-+ * specific constraints are satisfied, the pointer confinement will be
-+ * activated and the compositor sends a confined event.
-+ *
-+ * The intersection of the region passed with this request and the input
-+ * region of the surface is used to determine where the pointer must be
-+ * in order for the confinement to activate. It is up to the compositor
-+ * whether to warp the pointer or require some kind of user interaction for
-+ * the confinement to activate. If the region is null the surface input
-+ * region is used.
-+ *
-+ * The request will create a new object wp_confined_pointer which is used
-+ * to interact with the confinement as well as receive updates about its
-+ * state. See the the description of wp_confined_pointer for further
-+ * information.
-+ */
-+static inline struct zwp_confined_pointer_v1*
-+zwp_pointer_constraints_v1_confine_pointer(
-+    struct zwp_pointer_constraints_v1* zwp_pointer_constraints_v1,
-+    struct wl_surface* surface, struct wl_pointer* pointer,
-+    struct wl_region* region, uint32_t lifetime) {
-+  struct wl_proxy* id;
-+
-+  id =
-+      wl_proxy_marshal_constructor((struct wl_proxy*)zwp_pointer_constraints_v1,
-+                                   ZWP_POINTER_CONSTRAINTS_V1_CONFINE_POINTER,
-+                                   &zwp_confined_pointer_v1_interface, NULL,
-+                                   surface, pointer, region, lifetime);
-+
-+  return (struct zwp_confined_pointer_v1*)id;
-+}
-+
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ * @struct zwp_locked_pointer_v1_listener
-+ */
-+struct zwp_locked_pointer_v1_listener {
-+  /**
-+   * lock activation event
-+   *
-+   * Notification that the pointer lock of the seat's pointer is
-+   * activated.
-+   */
-+  void (*locked)(void* data,
-+                 struct zwp_locked_pointer_v1* zwp_locked_pointer_v1);
-+  /**
-+   * lock deactivation event
-+   *
-+   * Notification that the pointer lock of the seat's pointer is no
-+   * longer active. If this is a oneshot pointer lock (see
-+   * wp_pointer_constraints.lifetime) this object is now defunct and
-+   * should be destroyed. If this is a persistent pointer lock (see
-+   * wp_pointer_constraints.lifetime) this pointer lock may again
-+   * reactivate in the future.
-+   */
-+  void (*unlocked)(void* data,
-+                   struct zwp_locked_pointer_v1* zwp_locked_pointer_v1);
-+};
-+
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ */
-+static inline int zwp_locked_pointer_v1_add_listener(
-+    struct zwp_locked_pointer_v1* zwp_locked_pointer_v1,
-+    const struct zwp_locked_pointer_v1_listener* listener, void* data) {
-+  return wl_proxy_add_listener((struct wl_proxy*)zwp_locked_pointer_v1,
-+                               (void (**)(void))listener, data);
-+}
-+
-+#define ZWP_LOCKED_POINTER_V1_DESTROY 0
-+#define ZWP_LOCKED_POINTER_V1_SET_CURSOR_POSITION_HINT 1
-+#define ZWP_LOCKED_POINTER_V1_SET_REGION 2
-+
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ */
-+#define ZWP_LOCKED_POINTER_V1_LOCKED_SINCE_VERSION 1
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ */
-+#define ZWP_LOCKED_POINTER_V1_UNLOCKED_SINCE_VERSION 1
-+
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ */
-+#define ZWP_LOCKED_POINTER_V1_DESTROY_SINCE_VERSION 1
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ */
-+#define ZWP_LOCKED_POINTER_V1_SET_CURSOR_POSITION_HINT_SINCE_VERSION 1
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ */
-+#define ZWP_LOCKED_POINTER_V1_SET_REGION_SINCE_VERSION 1
-+
-+/** @ingroup iface_zwp_locked_pointer_v1 */
-+static inline void zwp_locked_pointer_v1_set_user_data(
-+    struct zwp_locked_pointer_v1* zwp_locked_pointer_v1, void* user_data) {
-+  wl_proxy_set_user_data((struct wl_proxy*)zwp_locked_pointer_v1, user_data);
-+}
-+
-+/** @ingroup iface_zwp_locked_pointer_v1 */
-+static inline void* zwp_locked_pointer_v1_get_user_data(
-+    struct zwp_locked_pointer_v1* zwp_locked_pointer_v1) {
-+  return wl_proxy_get_user_data((struct wl_proxy*)zwp_locked_pointer_v1);
-+}
-+
-+static inline uint32_t zwp_locked_pointer_v1_get_version(
-+    struct zwp_locked_pointer_v1* zwp_locked_pointer_v1) {
-+  return wl_proxy_get_version((struct wl_proxy*)zwp_locked_pointer_v1);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ *
-+ * Destroy the locked pointer object. If applicable, the compositor will
-+ * unlock the pointer.
-+ */
-+static inline void zwp_locked_pointer_v1_destroy(
-+    struct zwp_locked_pointer_v1* zwp_locked_pointer_v1) {
-+  wl_proxy_marshal((struct wl_proxy*)zwp_locked_pointer_v1,
-+                   ZWP_LOCKED_POINTER_V1_DESTROY);
-+
-+  wl_proxy_destroy((struct wl_proxy*)zwp_locked_pointer_v1);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ *
-+ * Set the cursor position hint relative to the top left corner of the
-+ * surface.
-+ *
-+ * If the client is drawing its own cursor, it should update the position
-+ * hint to the position of its own cursor. A compositor may use this
-+ * information to warp the pointer upon unlock in order to avoid pointer
-+ * jumps.
-+ *
-+ * The cursor position hint is double buffered. The new hint will only take
-+ * effect when the associated surface gets it pending state applied. See
-+ * wl_surface.commit for details.
-+ */
-+static inline void zwp_locked_pointer_v1_set_cursor_position_hint(
-+    struct zwp_locked_pointer_v1* zwp_locked_pointer_v1, wl_fixed_t surface_x,
-+    wl_fixed_t surface_y) {
-+  wl_proxy_marshal((struct wl_proxy*)zwp_locked_pointer_v1,
-+                   ZWP_LOCKED_POINTER_V1_SET_CURSOR_POSITION_HINT, surface_x,
-+                   surface_y);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_locked_pointer_v1
-+ *
-+ * Set a new region used to lock the pointer.
-+ *
-+ * The new lock region is double-buffered. The new lock region will
-+ * only take effect when the associated surface gets its pending state
-+ * applied. See wl_surface.commit for details.
-+ *
-+ * For details about the lock region, see wp_locked_pointer.
-+ */
-+static inline void zwp_locked_pointer_v1_set_region(
-+    struct zwp_locked_pointer_v1* zwp_locked_pointer_v1,
-+    struct wl_region* region) {
-+  wl_proxy_marshal((struct wl_proxy*)zwp_locked_pointer_v1,
-+                   ZWP_LOCKED_POINTER_V1_SET_REGION, region);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_confined_pointer_v1
-+ * @struct zwp_confined_pointer_v1_listener
-+ */
-+struct zwp_confined_pointer_v1_listener {
-+  /**
-+   * pointer confined
-+   *
-+   * Notification that the pointer confinement of the seat's
-+   * pointer is activated.
-+   */
-+  void (*confined)(void* data,
-+                   struct zwp_confined_pointer_v1* zwp_confined_pointer_v1);
-+  /**
-+   * pointer unconfined
-+   *
-+   * Notification that the pointer confinement of the seat's
-+   * pointer is no longer active. If this is a oneshot pointer
-+   * confinement (see wp_pointer_constraints.lifetime) this object is
-+   * now defunct and should be destroyed. If this is a persistent
-+   * pointer confinement (see wp_pointer_constraints.lifetime) this
-+   * pointer confinement may again reactivate in the future.
-+   */
-+  void (*unconfined)(void* data,
-+                     struct zwp_confined_pointer_v1* zwp_confined_pointer_v1);
-+};
-+
-+/**
-+ * @ingroup iface_zwp_confined_pointer_v1
-+ */
-+static inline int zwp_confined_pointer_v1_add_listener(
-+    struct zwp_confined_pointer_v1* zwp_confined_pointer_v1,
-+    const struct zwp_confined_pointer_v1_listener* listener, void* data) {
-+  return wl_proxy_add_listener((struct wl_proxy*)zwp_confined_pointer_v1,
-+                               (void (**)(void))listener, data);
-+}
-+
-+#define ZWP_CONFINED_POINTER_V1_DESTROY 0
-+#define ZWP_CONFINED_POINTER_V1_SET_REGION 1
-+
-+/**
-+ * @ingroup iface_zwp_confined_pointer_v1
-+ */
-+#define ZWP_CONFINED_POINTER_V1_CONFINED_SINCE_VERSION 1
-+/**
-+ * @ingroup iface_zwp_confined_pointer_v1
-+ */
-+#define ZWP_CONFINED_POINTER_V1_UNCONFINED_SINCE_VERSION 1
-+
-+/**
-+ * @ingroup iface_zwp_confined_pointer_v1
-+ */
-+#define ZWP_CONFINED_POINTER_V1_DESTROY_SINCE_VERSION 1
-+/**
-+ * @ingroup iface_zwp_confined_pointer_v1
-+ */
-+#define ZWP_CONFINED_POINTER_V1_SET_REGION_SINCE_VERSION 1
-+
-+/** @ingroup iface_zwp_confined_pointer_v1 */
-+static inline void zwp_confined_pointer_v1_set_user_data(
-+    struct zwp_confined_pointer_v1* zwp_confined_pointer_v1, void* user_data) {
-+  wl_proxy_set_user_data((struct wl_proxy*)zwp_confined_pointer_v1, user_data);
-+}
-+
-+/** @ingroup iface_zwp_confined_pointer_v1 */
-+static inline void* zwp_confined_pointer_v1_get_user_data(
-+    struct zwp_confined_pointer_v1* zwp_confined_pointer_v1) {
-+  return wl_proxy_get_user_data((struct wl_proxy*)zwp_confined_pointer_v1);
-+}
-+
-+static inline uint32_t zwp_confined_pointer_v1_get_version(
-+    struct zwp_confined_pointer_v1* zwp_confined_pointer_v1) {
-+  return wl_proxy_get_version((struct wl_proxy*)zwp_confined_pointer_v1);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_confined_pointer_v1
-+ *
-+ * Destroy the confined pointer object. If applicable, the compositor will
-+ * unconfine the pointer.
-+ */
-+static inline void zwp_confined_pointer_v1_destroy(
-+    struct zwp_confined_pointer_v1* zwp_confined_pointer_v1) {
-+  wl_proxy_marshal((struct wl_proxy*)zwp_confined_pointer_v1,
-+                   ZWP_CONFINED_POINTER_V1_DESTROY);
-+
-+  wl_proxy_destroy((struct wl_proxy*)zwp_confined_pointer_v1);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_confined_pointer_v1
-+ *
-+ * Set a new region used to confine the pointer.
-+ *
-+ * The new confine region is double-buffered. The new confine region will
-+ * only take effect when the associated surface gets its pending state
-+ * applied. See wl_surface.commit for details.
-+ *
-+ * If the confinement is active when the new confinement region is applied
-+ * and the pointer ends up outside of newly applied region, the pointer may
-+ * warped to a position within the new confinement region. If warped, a
-+ * wl_pointer.motion event will be emitted, but no
-+ * wp_relative_pointer.relative_motion event.
-+ *
-+ * The compositor may also, instead of using the new region, unconfine the
-+ * pointer.
-+ *
-+ * For details about the confine region, see wp_confined_pointer.
-+ */
-+static inline void zwp_confined_pointer_v1_set_region(
-+    struct zwp_confined_pointer_v1* zwp_confined_pointer_v1,
-+    struct wl_region* region) {
-+  wl_proxy_marshal((struct wl_proxy*)zwp_confined_pointer_v1,
-+                   ZWP_CONFINED_POINTER_V1_SET_REGION, region);
-+}
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c b/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c
-new file mode 100644
-index 0000000000..c28ddf6918
---- /dev/null
-+++ b/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c
-@@ -0,0 +1,97 @@
-+/* Generated by wayland-scanner 1.18.0 */
-+
-+/*
-+ * Copyright © 2014      Jonas Ådahl
-+ * Copyright © 2015      Red Hat Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include "wayland-util.h"
-+
-+#pragma GCC visibility push(default)
-+extern const struct wl_interface wl_pointer_interface;
-+extern const struct wl_interface wl_region_interface;
-+extern const struct wl_interface wl_surface_interface;
-+extern const struct wl_interface zwp_confined_pointer_v1_interface;
-+extern const struct wl_interface zwp_locked_pointer_v1_interface;
-+#pragma GCC visibility pop
-+
-+static const struct wl_interface* pointer_constraints_unstable_v1_types[] = {
-+    NULL,
-+    NULL,
-+    &zwp_locked_pointer_v1_interface,
-+    &wl_surface_interface,
-+    &wl_pointer_interface,
-+    &wl_region_interface,
-+    NULL,
-+    &zwp_confined_pointer_v1_interface,
-+    &wl_surface_interface,
-+    &wl_pointer_interface,
-+    &wl_region_interface,
-+    NULL,
-+    &wl_region_interface,
-+    &wl_region_interface,
-+};
-+
-+static const struct wl_message zwp_pointer_constraints_v1_requests[] = {
-+    {"destroy", "", pointer_constraints_unstable_v1_types + 0},
-+    {"lock_pointer", "noo?ou", pointer_constraints_unstable_v1_types + 2},
-+    {"confine_pointer", "noo?ou", pointer_constraints_unstable_v1_types + 7},
-+};
-+
-+WL_EXPORT const struct wl_interface zwp_pointer_constraints_v1_interface = {
-+    "zwp_pointer_constraints_v1",        1, 3,
-+    zwp_pointer_constraints_v1_requests, 0, NULL,
-+};
-+
-+static const struct wl_message zwp_locked_pointer_v1_requests[] = {
-+    {"destroy", "", pointer_constraints_unstable_v1_types + 0},
-+    {"set_cursor_position_hint", "ff",
-+     pointer_constraints_unstable_v1_types + 0},
-+    {"set_region", "?o", pointer_constraints_unstable_v1_types + 12},
-+};
-+
-+static const struct wl_message zwp_locked_pointer_v1_events[] = {
-+    {"locked", "", pointer_constraints_unstable_v1_types + 0},
-+    {"unlocked", "", pointer_constraints_unstable_v1_types + 0},
-+};
-+
-+WL_EXPORT const struct wl_interface zwp_locked_pointer_v1_interface = {
-+    "zwp_locked_pointer_v1",        1, 3,
-+    zwp_locked_pointer_v1_requests, 2, zwp_locked_pointer_v1_events,
-+};
-+
-+static const struct wl_message zwp_confined_pointer_v1_requests[] = {
-+    {"destroy", "", pointer_constraints_unstable_v1_types + 0},
-+    {"set_region", "?o", pointer_constraints_unstable_v1_types + 13},
-+};
-+
-+static const struct wl_message zwp_confined_pointer_v1_events[] = {
-+    {"confined", "", pointer_constraints_unstable_v1_types + 0},
-+    {"unconfined", "", pointer_constraints_unstable_v1_types + 0},
-+};
-+
-+WL_EXPORT const struct wl_interface zwp_confined_pointer_v1_interface = {
-+    "zwp_confined_pointer_v1",        1, 2,
-+    zwp_confined_pointer_v1_requests, 2, zwp_confined_pointer_v1_events,
-+};
-diff --git a/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h b/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h
-new file mode 100644
-index 0000000000..dbae8081f4
---- /dev/null
-+++ b/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h
-@@ -0,0 +1,293 @@
-+/* Generated by wayland-scanner 1.18.0 */
-+
-+#ifndef RELATIVE_POINTER_UNSTABLE_V1_CLIENT_PROTOCOL_H
-+#define RELATIVE_POINTER_UNSTABLE_V1_CLIENT_PROTOCOL_H
-+
-+#include <stdint.h>
-+#include <stddef.h>
-+#include "wayland-client.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/**
-+ * @page page_relative_pointer_unstable_v1 The relative_pointer_unstable_v1
-+ * protocol protocol for relative pointer motion events
-+ *
-+ * @section page_desc_relative_pointer_unstable_v1 Description
-+ *
-+ * This protocol specifies a set of interfaces used for making clients able to
-+ * receive relative pointer events not obstructed by barriers (such as the
-+ * monitor edge or other pointer barriers).
-+ *
-+ * To start receiving relative pointer events, a client must first bind the
-+ * global interface "wp_relative_pointer_manager" which, if a compositor
-+ * supports relative pointer motion events, is exposed by the registry. After
-+ * having created the relative pointer manager proxy object, the client uses
-+ * it to create the actual relative pointer object using the
-+ * "get_relative_pointer" request given a wl_pointer. The relative pointer
-+ * motion events will then, when applicable, be transmitted via the proxy of
-+ * the newly created relative pointer object. See the documentation of the
-+ * relative pointer interface for more details.
-+ *
-+ * Warning! The protocol described in this file is experimental and backward
-+ * incompatible changes may be made. Backward compatible changes may be added
-+ * together with the corresponding interface version bump. Backward
-+ * incompatible changes are done by bumping the version number in the protocol
-+ * and interface names and resetting the interface version. Once the protocol
-+ * is to be declared stable, the 'z' prefix and the version number in the
-+ * protocol and interface names are removed and the interface version number is
-+ * reset.
-+ *
-+ * @section page_ifaces_relative_pointer_unstable_v1 Interfaces
-+ * - @subpage page_iface_zwp_relative_pointer_manager_v1 - get relative pointer
-+ * objects
-+ * - @subpage page_iface_zwp_relative_pointer_v1 - relative pointer object
-+ * @section page_copyright_relative_pointer_unstable_v1 Copyright
-+ * <pre>
-+ *
-+ * Copyright © 2014      Jonas Ådahl
-+ * Copyright © 2015      Red Hat Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ * </pre>
-+ */
-+struct wl_pointer;
-+struct zwp_relative_pointer_manager_v1;
-+struct zwp_relative_pointer_v1;
-+
-+/**
-+ * @page page_iface_zwp_relative_pointer_manager_v1
-+ * zwp_relative_pointer_manager_v1
-+ * @section page_iface_zwp_relative_pointer_manager_v1_desc Description
-+ *
-+ * A global interface used for getting the relative pointer object for a
-+ * given pointer.
-+ * @section page_iface_zwp_relative_pointer_manager_v1_api API
-+ * See @ref iface_zwp_relative_pointer_manager_v1.
-+ */
-+/**
-+ * @defgroup iface_zwp_relative_pointer_manager_v1 The
-+ * zwp_relative_pointer_manager_v1 interface
-+ *
-+ * A global interface used for getting the relative pointer object for a
-+ * given pointer.
-+ */
-+extern const struct wl_interface zwp_relative_pointer_manager_v1_interface;
-+/**
-+ * @page page_iface_zwp_relative_pointer_v1 zwp_relative_pointer_v1
-+ * @section page_iface_zwp_relative_pointer_v1_desc Description
-+ *
-+ * A wp_relative_pointer object is an extension to the wl_pointer interface
-+ * used for emitting relative pointer events. It shares the same focus as
-+ * wl_pointer objects of the same seat and will only emit events when it has
-+ * focus.
-+ * @section page_iface_zwp_relative_pointer_v1_api API
-+ * See @ref iface_zwp_relative_pointer_v1.
-+ */
-+/**
-+ * @defgroup iface_zwp_relative_pointer_v1 The zwp_relative_pointer_v1 interface
-+ *
-+ * A wp_relative_pointer object is an extension to the wl_pointer interface
-+ * used for emitting relative pointer events. It shares the same focus as
-+ * wl_pointer objects of the same seat and will only emit events when it has
-+ * focus.
-+ */
-+extern const struct wl_interface zwp_relative_pointer_v1_interface;
-+
-+#define ZWP_RELATIVE_POINTER_MANAGER_V1_DESTROY 0
-+#define ZWP_RELATIVE_POINTER_MANAGER_V1_GET_RELATIVE_POINTER 1
-+
-+/**
-+ * @ingroup iface_zwp_relative_pointer_manager_v1
-+ */
-+#define ZWP_RELATIVE_POINTER_MANAGER_V1_DESTROY_SINCE_VERSION 1
-+/**
-+ * @ingroup iface_zwp_relative_pointer_manager_v1
-+ */
-+#define ZWP_RELATIVE_POINTER_MANAGER_V1_GET_RELATIVE_POINTER_SINCE_VERSION 1
-+
-+/** @ingroup iface_zwp_relative_pointer_manager_v1 */
-+static inline void zwp_relative_pointer_manager_v1_set_user_data(
-+    struct zwp_relative_pointer_manager_v1* zwp_relative_pointer_manager_v1,
-+    void* user_data) {
-+  wl_proxy_set_user_data((struct wl_proxy*)zwp_relative_pointer_manager_v1,
-+                         user_data);
-+}
-+
-+/** @ingroup iface_zwp_relative_pointer_manager_v1 */
-+static inline void* zwp_relative_pointer_manager_v1_get_user_data(
-+    struct zwp_relative_pointer_manager_v1* zwp_relative_pointer_manager_v1) {
-+  return wl_proxy_get_user_data(
-+      (struct wl_proxy*)zwp_relative_pointer_manager_v1);
-+}
-+
-+static inline uint32_t zwp_relative_pointer_manager_v1_get_version(
-+    struct zwp_relative_pointer_manager_v1* zwp_relative_pointer_manager_v1) {
-+  return wl_proxy_get_version(
-+      (struct wl_proxy*)zwp_relative_pointer_manager_v1);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_relative_pointer_manager_v1
-+ *
-+ * Used by the client to notify the server that it will no longer use this
-+ * relative pointer manager object.
-+ */
-+static inline void zwp_relative_pointer_manager_v1_destroy(
-+    struct zwp_relative_pointer_manager_v1* zwp_relative_pointer_manager_v1) {
-+  wl_proxy_marshal((struct wl_proxy*)zwp_relative_pointer_manager_v1,
-+                   ZWP_RELATIVE_POINTER_MANAGER_V1_DESTROY);
-+
-+  wl_proxy_destroy((struct wl_proxy*)zwp_relative_pointer_manager_v1);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_relative_pointer_manager_v1
-+ *
-+ * Create a relative pointer interface given a wl_pointer object. See the
-+ * wp_relative_pointer interface for more details.
-+ */
-+static inline struct zwp_relative_pointer_v1*
-+zwp_relative_pointer_manager_v1_get_relative_pointer(
-+    struct zwp_relative_pointer_manager_v1* zwp_relative_pointer_manager_v1,
-+    struct wl_pointer* pointer) {
-+  struct wl_proxy* id;
-+
-+  id = wl_proxy_marshal_constructor(
-+      (struct wl_proxy*)zwp_relative_pointer_manager_v1,
-+      ZWP_RELATIVE_POINTER_MANAGER_V1_GET_RELATIVE_POINTER,
-+      &zwp_relative_pointer_v1_interface, NULL, pointer);
-+
-+  return (struct zwp_relative_pointer_v1*)id;
-+}
-+
-+/**
-+ * @ingroup iface_zwp_relative_pointer_v1
-+ * @struct zwp_relative_pointer_v1_listener
-+ */
-+struct zwp_relative_pointer_v1_listener {
-+  /**
-+   * relative pointer motion
-+   *
-+   * Relative x/y pointer motion from the pointer of the seat
-+   * associated with this object.
-+   *
-+   * A relative motion is in the same dimension as regular wl_pointer
-+   * motion events, except they do not represent an absolute
-+   * position. For example, moving a pointer from (x, y) to (x', y')
-+   * would have the equivalent relative motion (x' - x, y' - y). If a
-+   * pointer motion caused the absolute pointer position to be
-+   * clipped by for example the edge of the monitor, the relative
-+   * motion is unaffected by the clipping and will represent the
-+   * unclipped motion.
-+   *
-+   * This event also contains non-accelerated motion deltas. The
-+   * non-accelerated delta is, when applicable, the regular pointer
-+   * motion delta as it was before having applied motion acceleration
-+   * and other transformations such as normalization.
-+   *
-+   * Note that the non-accelerated delta does not represent 'raw'
-+   * events as they were read from some device. Pointer motion
-+   * acceleration is device- and configuration-specific and
-+   * non-accelerated deltas and accelerated deltas may have the same
-+   * value on some devices.
-+   *
-+   * Relative motions are not coupled to wl_pointer.motion events,
-+   * and can be sent in combination with such events, but also
-+   * independently. There may also be scenarios where
-+   * wl_pointer.motion is sent, but there is no relative motion. The
-+   * order of an absolute and relative motion event originating from
-+   * the same physical motion is not guaranteed.
-+   *
-+   * If the client needs button events or focus state, it can receive
-+   * them from a wl_pointer object of the same seat that the
-+   * wp_relative_pointer object is associated with.
-+   * @param utime_hi high 32 bits of a 64 bit timestamp with microsecond
-+   * granularity
-+   * @param utime_lo low 32 bits of a 64 bit timestamp with microsecond
-+   * granularity
-+   * @param dx the x component of the motion vector
-+   * @param dy the y component of the motion vector
-+   * @param dx_unaccel the x component of the unaccelerated motion vector
-+   * @param dy_unaccel the y component of the unaccelerated motion vector
-+   */
-+  void (*relative_motion)(
-+      void* data, struct zwp_relative_pointer_v1* zwp_relative_pointer_v1,
-+      uint32_t utime_hi, uint32_t utime_lo, wl_fixed_t dx, wl_fixed_t dy,
-+      wl_fixed_t dx_unaccel, wl_fixed_t dy_unaccel);
-+};
-+
-+/**
-+ * @ingroup iface_zwp_relative_pointer_v1
-+ */
-+static inline int zwp_relative_pointer_v1_add_listener(
-+    struct zwp_relative_pointer_v1* zwp_relative_pointer_v1,
-+    const struct zwp_relative_pointer_v1_listener* listener, void* data) {
-+  return wl_proxy_add_listener((struct wl_proxy*)zwp_relative_pointer_v1,
-+                               (void (**)(void))listener, data);
-+}
-+
-+#define ZWP_RELATIVE_POINTER_V1_DESTROY 0
-+
-+/**
-+ * @ingroup iface_zwp_relative_pointer_v1
-+ */
-+#define ZWP_RELATIVE_POINTER_V1_RELATIVE_MOTION_SINCE_VERSION 1
-+
-+/**
-+ * @ingroup iface_zwp_relative_pointer_v1
-+ */
-+#define ZWP_RELATIVE_POINTER_V1_DESTROY_SINCE_VERSION 1
-+
-+/** @ingroup iface_zwp_relative_pointer_v1 */
-+static inline void zwp_relative_pointer_v1_set_user_data(
-+    struct zwp_relative_pointer_v1* zwp_relative_pointer_v1, void* user_data) {
-+  wl_proxy_set_user_data((struct wl_proxy*)zwp_relative_pointer_v1, user_data);
-+}
-+
-+/** @ingroup iface_zwp_relative_pointer_v1 */
-+static inline void* zwp_relative_pointer_v1_get_user_data(
-+    struct zwp_relative_pointer_v1* zwp_relative_pointer_v1) {
-+  return wl_proxy_get_user_data((struct wl_proxy*)zwp_relative_pointer_v1);
-+}
-+
-+static inline uint32_t zwp_relative_pointer_v1_get_version(
-+    struct zwp_relative_pointer_v1* zwp_relative_pointer_v1) {
-+  return wl_proxy_get_version((struct wl_proxy*)zwp_relative_pointer_v1);
-+}
-+
-+/**
-+ * @ingroup iface_zwp_relative_pointer_v1
-+ */
-+static inline void zwp_relative_pointer_v1_destroy(
-+    struct zwp_relative_pointer_v1* zwp_relative_pointer_v1) {
-+  wl_proxy_marshal((struct wl_proxy*)zwp_relative_pointer_v1,
-+                   ZWP_RELATIVE_POINTER_V1_DESTROY);
-+
-+  wl_proxy_destroy((struct wl_proxy*)zwp_relative_pointer_v1);
-+}
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c b/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c
-new file mode 100644
-index 0000000000..3534686a3d
---- /dev/null
-+++ b/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c
-@@ -0,0 +1,69 @@
-+/* Generated by wayland-scanner 1.18.0 */
-+
-+/*
-+ * Copyright © 2014      Jonas Ådahl
-+ * Copyright © 2015      Red Hat Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include "wayland-util.h"
-+
-+#pragma GCC visibility push(default)
-+extern const struct wl_interface wl_pointer_interface;
-+extern const struct wl_interface zwp_relative_pointer_v1_interface;
-+#pragma GCC visibility pop
-+
-+static const struct wl_interface* relative_pointer_unstable_v1_types[] = {
-+    NULL,
-+    NULL,
-+    NULL,
-+    NULL,
-+    NULL,
-+    NULL,
-+    &zwp_relative_pointer_v1_interface,
-+    &wl_pointer_interface,
-+};
-+
-+static const struct wl_message zwp_relative_pointer_manager_v1_requests[] = {
-+    {"destroy", "", relative_pointer_unstable_v1_types + 0},
-+    {"get_relative_pointer", "no", relative_pointer_unstable_v1_types + 6},
-+};
-+
-+WL_EXPORT const struct wl_interface zwp_relative_pointer_manager_v1_interface =
-+    {
-+        "zwp_relative_pointer_manager_v1",        1, 2,
-+        zwp_relative_pointer_manager_v1_requests, 0, NULL,
-+};
-+
-+static const struct wl_message zwp_relative_pointer_v1_requests[] = {
-+    {"destroy", "", relative_pointer_unstable_v1_types + 0},
-+};
-+
-+static const struct wl_message zwp_relative_pointer_v1_events[] = {
-+    {"relative_motion", "uuffff", relative_pointer_unstable_v1_types + 0},
-+};
-+
-+WL_EXPORT const struct wl_interface zwp_relative_pointer_v1_interface = {
-+    "zwp_relative_pointer_v1",        1, 1,
-+    zwp_relative_pointer_v1_requests, 1, zwp_relative_pointer_v1_events,
-+};
-diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
-index efe3b625bd..c261e17b56 100644
---- a/widget/nsIWidget.h
-+++ b/widget/nsIWidget.h
-@@ -1834,6 +1834,16 @@ class nsIWidget : public nsISupports {
- 
- #endif
- 
-+  /**
-+   * If this widget uses native pointer lock instead of warp-to-center
-+   * (currently only GTK on Wayland), these methods provide access to that
-+   * functionality.
-+   */
-+  virtual void SetNativePointerLockCenter(
-+      const LayoutDeviceIntPoint& aLockCenter) {}
-+  virtual void LockNativePointer() {}
-+  virtual void UnlockNativePointer() {}
-+
-   /*
-    * Get safe area insets except to cutout.
-    * See https://drafts.csswg.org/css-env-1/#safe-area-insets.
--- 
-2.31.1
-
diff --git a/http/firefox/patches/0034-bmo-1646135-Disable-HW-WR-on-Nvidia-prop.-drivers-on.patch b/http/firefox/patches/0034-bmo-1646135-Disable-HW-WR-on-Nvidia-prop.-drivers-on.patch
new file mode 100644
index 0000000000..41eae64424
--- /dev/null
+++ b/http/firefox/patches/0034-bmo-1646135-Disable-HW-WR-on-Nvidia-prop.-drivers-on.patch
@@ -0,0 +1,35 @@
+From eb2b14167139b890c45da22917429a3dd29f510c Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 16 Jun 2021 02:13:33 +0200
+Subject: [PATCH 34/36] bmo#1646135: Disable HW-WR on Nvidia prop. drivers on
+ Wayland
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ widget/gtk/GfxInfo.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/widget/gtk/GfxInfo.cpp b/widget/gtk/GfxInfo.cpp
+index fd6e7509fd..d3f3baf311 100644
+--- a/widget/gtk/GfxInfo.cpp
++++ b/widget/gtk/GfxInfo.cpp
+@@ -682,6 +682,16 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
+         nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_LESS_THAN, V(460, 32, 3, 0),
+         "FEATURE_FAILURE_WEBRENDER_OLD_NVIDIA", "460.32.03");
+ 
++    // Disable Nvidia proprietary drivers on Wayland.
++    APPEND_TO_DRIVER_BLOCKLIST_EXT(
++        OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
++        DesktopEnvironment::All, WindowProtocol::Wayland,
++        DriverVendor::NonMesaAll, DeviceFamily::NvidiaAll,
++        nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
++        DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0),
++        "FEATURE_FAILURE_WEBRENDER_NVIDIA_WAYLAND",
++        "https://bugzilla.mozilla.org/show_bug.cgi?id=1646135");
++
+     // ATI Mesa baseline, chosen arbitrarily.
+     APPEND_TO_DRIVER_BLOCKLIST_EXT(
+         OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
+-- 
+2.32.0
+
diff --git a/http/firefox/patches/0035-bmo-1705048-Wayland-Emulate-X11-popup-parentless-win.patch b/http/firefox/patches/0035-bmo-1705048-Wayland-Emulate-X11-popup-parentless-win.patch
deleted file mode 100644
index dc65d28640..0000000000
--- a/http/firefox/patches/0035-bmo-1705048-Wayland-Emulate-X11-popup-parentless-win.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 36211b3182555b85b147419f51b3435329f2abc5 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 5 May 2021 15:13:55 +0200
-Subject: [PATCH 35/37] bmo#1705048: Wayland: Emulate X11 popup parentless
- window as a toplevel on Wayland
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- widget/gtk/nsWindow.cpp | 18 +++++++++++++-----
- widget/gtk/nsWindow.h   |  4 ++++
- 2 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
-index 8d06f91f89..501a2ff15a 100644
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -553,6 +553,7 @@ nsWindow::nsWindow() {
-   mTitlebarBackdropState = false;
- 
-   mHasAlphaVisual = false;
-+  mIsWaylandPanelWindow = false;
-   mIsPIPWindow = false;
-   mAlwaysOnTop = false;
- 
-@@ -3713,7 +3714,7 @@ void nsWindow::OnButtonPressEvent(GdkEventButton* aEvent) {
- 
-   LayoutDeviceIntPoint refPoint =
-       GdkEventCoordsToDevicePixels(aEvent->x, aEvent->y);
--  if (mDraggableRegion.Contains(refPoint.x, refPoint.y) &&
-+  if ((mIsWaylandPanelWindow || mDraggableRegion.Contains(refPoint.x, refPoint.y)) &&
-       domButton == MouseButton::ePrimary &&
-       eventStatus.mContentStatus != nsEventStatus_eConsumeNoDefault) {
-     mWindowShouldStartDragging = true;
-@@ -4625,8 +4626,9 @@ nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
-       // as a workaround.
-       mWindowType = eWindowType_toplevel;
-     } else if (mWindowType == eWindowType_popup && !aNativeParent && !aParent) {
--      // Workaround for Wayland where the popup windows always need to have
--      // parent window. For example webrtc ui is a popup window without parent.
-+      // mIsWaylandPanelWindow is a special toplevel window on Wayland which
-+      // emulates X11 popup window without parent.
-+      mIsWaylandPanelWindow = true;
-       mWindowType = eWindowType_toplevel;
-     }
-   }
-@@ -4653,8 +4655,10 @@ nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
-       // popup window position.
-       GtkWindowType type = GTK_WINDOW_TOPLEVEL;
-       if (mWindowType == eWindowType_popup) {
--        type = (mIsX11Display && aInitData->mNoAutoHide) ? GTK_WINDOW_TOPLEVEL
--                                                         : GTK_WINDOW_POPUP;
-+        type = GTK_WINDOW_POPUP;
-+        if (GdkIsX11Display() && aInitData->mNoAutoHide) {
-+          type = GTK_WINDOW_TOPLEVEL;
-+        }
-       }
-       mShell = gtk_window_new(type);
- 
-@@ -4901,6 +4905,10 @@ nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
-       }
- #endif
- 
-+      if (mIsWaylandPanelWindow) {
-+        gtk_window_set_decorated(GTK_WINDOW(mShell), false);
-+      }
-+
-       if (mWindowType == eWindowType_popup) {
-         // gdk does not automatically set the cursor for "temporary"
-         // windows, which are what gtk uses for popups.
-diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
-index aa340f4ee0..79200b3ce1 100644
---- a/widget/gtk/nsWindow.h
-+++ b/widget/gtk/nsWindow.h
-@@ -590,6 +590,10 @@ class nsWindow final : public nsBaseWidget {
-   LayoutDeviceIntRegion mDraggableRegion;
-   // It's PictureInPicture window.
-   bool mIsPIPWindow;
-+  // It's undecorated popup utility window, without resizers/titlebar,
-+  // movable by mouse. Used on Wayland as a workaround for popups without
-+  // parent (for instance WebRTC sharing indicator).
-+  bool mIsWaylandPanelWindow;
-   bool mAlwaysOnTop;
- 
- #ifdef ACCESSIBILITY
--- 
-2.31.1
-
diff --git a/http/firefox/patches/0035-bmo-1715254-Deny-clone3-to-force-glibc-fallback.patch b/http/firefox/patches/0035-bmo-1715254-Deny-clone3-to-force-glibc-fallback.patch
new file mode 100644
index 0000000000..5b5fdd4be8
--- /dev/null
+++ b/http/firefox/patches/0035-bmo-1715254-Deny-clone3-to-force-glibc-fallback.patch
@@ -0,0 +1,38 @@
+From bb8fedf1391d759e787207f5b5f2a81b289b4772 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Mon, 12 Jul 2021 18:03:43 +0200
+Subject: [PATCH 35/36] bmo#1715254: Deny clone3 to force glibc fallback
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ security/sandbox/linux/SandboxFilter.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
+index 73a6e7fd72..f4e66fc148 100644
+--- a/security/sandbox/linux/SandboxFilter.cpp
++++ b/security/sandbox/linux/SandboxFilter.cpp
+@@ -835,6 +835,9 @@ class SandboxPolicyCommon : public SandboxPolicyBase {
+       case __NR_clone:
+         return ClonePolicy(InvalidSyscall());
+ 
++      case __NR_clone3:
++        return Error(ENOSYS);
++
+         // More thread creation.
+ #ifdef __NR_set_robust_list
+       case __NR_set_robust_list:
+@@ -1479,6 +1482,10 @@ class ContentSandboxPolicy : public SandboxPolicyCommon {
+         // usually do something reasonable on error.
+       case __NR_clone:
+         return ClonePolicy(Error(EPERM));
++
++      case __NR_clone3:
++        return Error(ENOSYS);
++
+ #  ifdef __NR_fork
+       case __NR_fork:
+         return Error(ENOSYS);
+-- 
+2.32.0
+
diff --git a/http/firefox/patches/0036-bmo-1711816-Fix-stdc-compat.cpp-compilation-errors-w.patch b/http/firefox/patches/0036-bmo-1711816-Fix-stdc-compat.cpp-compilation-errors-w.patch
deleted file mode 100644
index 42f0217baf..0000000000
--- a/http/firefox/patches/0036-bmo-1711816-Fix-stdc-compat.cpp-compilation-errors-w.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fef46785dd742c856c792af3b96fa07b5a21f712 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Fri, 28 May 2021 23:03:28 +0200
-Subject: [PATCH 36/37] bmo#1711816: Fix stdc++compat.cpp compilation errors
- with recent GCC
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- build/unix/stdc++compat/stdc++compat.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/build/unix/stdc++compat/stdc++compat.cpp b/build/unix/stdc++compat/stdc++compat.cpp
-index dd1ebcecbf..8c4eed5997 100644
---- a/build/unix/stdc++compat/stdc++compat.cpp
-+++ b/build/unix/stdc++compat/stdc++compat.cpp
-@@ -4,6 +4,7 @@
- 
- #include <ostream>
- #include <istream>
-+#include <memory>
- #include <string>
- #include <stdarg.h>
- #include <stdio.h>
-@@ -48,12 +49,14 @@ void __attribute__((weak)) __throw_out_of_range_fmt(char const* fmt, ...) {
- #endif
- 
- #if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 20)
-+namespace __cxxabiv1 {
- /* Technically, this symbol is not in GLIBCXX_3.4.20, but in CXXABI_1.3.8,
-    but that's equivalent, version-wise. Those calls are added by the compiler
-    itself on `new Class[n]` calls. */
- extern "C" void __attribute__((weak)) __cxa_throw_bad_array_new_length() {
-   MOZ_CRASH();
- }
-+}  // namespace __cxxabiv1
- #endif
- 
- #if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 21)
--- 
-2.31.1
-
diff --git a/http/firefox/patches/0036-bmo-1719674-Make-packed_simd-compile-with-Rust-1.54.patch b/http/firefox/patches/0036-bmo-1719674-Make-packed_simd-compile-with-Rust-1.54.patch
new file mode 100644
index 0000000000..0419f26655
--- /dev/null
+++ b/http/firefox/patches/0036-bmo-1719674-Make-packed_simd-compile-with-Rust-1.54.patch
@@ -0,0 +1,327 @@
+From 9c705c9292a70018cdc435e073693fa603e6838e Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Mon, 12 Jul 2021 18:41:41 +0200
+Subject: [PATCH 36/36] bmo#1719674: Make packed_simd compile with Rust 1.54
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ .cargo/config.in                              |   2 +-
+ Cargo.lock                                    |   2 +-
+ Cargo.toml                                    |   2 +-
+ .../rust/packed_simd/.cargo-checksum.json     |   2 +-
+ .../rust/packed_simd/src/api/shuffle.rs       |  46 ++++----
+ .../rust/packed_simd/src/codegen/llvm.rs      | 109 +++++++++++-------
+ third_party/rust/packed_simd/src/lib.rs       |   4 +-
+ 7 files changed, 94 insertions(+), 73 deletions(-)
+
+diff --git a/.cargo/config.in b/.cargo/config.in
+index 870d01c079..db27c1db56 100644
+--- a/.cargo/config.in
++++ b/.cargo/config.in
+@@ -80,7 +80,7 @@ rev = "a74f7df5bf6cb11194fb74daa0c3cf42f326fd90"
+ [source."https://github.com/hsivonen/packed_simd"]
+ git = "https://github.com/hsivonen/packed_simd"
+ replace-with = "vendored-sources"
+-rev = "0917fe780032a6bbb23d71be545f9c1834128d75"
++rev = "6a16f954950401b92b4e220fbf2dfaf6f00e1fb2"
+ 
+ [source."https://github.com/hsivonen/chardetng_c"]
+ git = "https://github.com/hsivonen/chardetng_c"
+diff --git a/Cargo.lock b/Cargo.lock
+index 6237a58a82..0082f497ef 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -3662,7 +3662,7 @@ dependencies = [
+ [[package]]
+ name = "packed_simd"
+ version = "0.3.4"
+-source = "git+https://github.com/hsivonen/packed_simd?rev=0917fe780032a6bbb23d71be545f9c1834128d75#0917fe780032a6bbb23d71be545f9c1834128d75"
++source = "git+https://github.com/hsivonen/packed_simd?rev=6a16f954950401b92b4e220fbf2dfaf6f00e1fb2#6a16f954950401b92b4e220fbf2dfaf6f00e1fb2"
+ dependencies = [
+  "cfg-if 0.1.10",
+ ]
+diff --git a/Cargo.toml b/Cargo.toml
+index 4ea4b8d63a..c9d112337b 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -78,7 +78,7 @@ opt-level = 2
+ chardetng = { git = "https://github.com/hsivonen/chardetng", rev="39f95e2f7cd6e632a379cdeee62c68e8cedd7810" }
+ chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" }
+ libudev-sys = { path = "dom/webauthn/libudev-sys" }
+-packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
++packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="6a16f954950401b92b4e220fbf2dfaf6f00e1fb2" }
+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="f3cace4fb8b53db0849c62af4fa62bade5a620f7" }
+ nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+ spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu5" }
+diff --git a/third_party/rust/packed_simd/.cargo-checksum.json b/third_party/rust/packed_simd/.cargo-checksum.json
+index 1512803e57..a5ad93450e 100644
+--- a/third_party/rust/packed_simd/.cargo-checksum.json
++++ b/third_party/rust/packed_simd/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".appveyor.yml":"f1ed01850e0d725f9498f52a1a63ddf40702ad6e0bf5b2d7c4c04d76e96794a3",".travis.yml":"d56de6531d3c4880e3aada85ac8e6d7388e5d781871e181cb8ade2a746d5d5f5","Cargo.toml":"e94ccb82002e8b55680c2c5fec554a9e864c5f354e113278d0aa927df279330d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"49d01e49a33393af64fa6c813b6a724f68a4d1abfbedcb96413651ed105aa820","bors.toml":"dee881dc69b9b7834e4eba5d95c3ed5a416d4628815a167d6a22d4cb4fb064b8","build.rs":"c3312e786c7fcb8f16c0785fe235ebbcf43fbeab6d7d683752f62043ca92d887","ci/all.sh":"2ae6b2445b4db83833e40b37efd0016c6b9879ee988b9b3ef94db5439a3e1606","ci/android-install-ndk.sh":"0f1746108cc30bf9b9ba45bcde7b19fc1a8bdf5b0258035b4eb8dc69b75efac4","ci/android-install-sdk.sh":"3490432022c5c8f5a115c084f7a9aca1626f96c0c87ffb62019228c4346b47e4","ci/android-sysimage.sh":"ebf4e5daa1f0fe1b2092b79f0f3f161c4c4275cb744e52352c4d81ab451e4c5a","ci/benchmark.sh":"b61d19ef6b90deba8fb79dee74c8b062d94844676293da346da87bb78a9a49a4","ci/deploy_and_run_on_ios_simulator.rs":"ec8ecf82d92072676aa47f0d1a3d021b60a7ae3531153ef12d2ff4541fc294dc","ci/docker/aarch64-linux-android/Dockerfile":"ace2e7d33c87bc0f6d3962a4a3408c04557646f7f51ab99cfbf574906796b016","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"da88c0d50f16dc08448c7fdf1fa5ed2cbe576acf9e7dd85b5b818621b2a8c702","ci/docker/arm-linux-androideabi/Dockerfile":"370e55d3330a413a3ccf677b3afb3e0ef9018a5fab263faa97ae8ac017fc2286","ci/docker/arm-unknown-linux-gnueabi/Dockerfile":"bb5f8ae890707c128652290ffc544447643bf12037ddd73c6ad6989f848cb380","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"1afaefcbc05b740859acd4e067bc92439be6bcbe8f2e9678474fb434bcd398d9","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"8282ea707a94109beed47a57574755e2d58401735904a03f85fb64c578c53b4f","ci/docker/i586-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/i686-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/mips-unknown-linux-gnu/Dockerfile":"b2ebc25797612c4f8395fe9d407725156044955bfbcf442036b7f55b43a5f9da","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"b0c1692ac65bc56dd30494b1993d8e929c48cc9c4b92029b7c7592af6d4f9220","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"4e9249c179300138141d0b2b7401b11897f64aed69f541f078c1db4594df2827","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"3164c52b0dcbb01afa78292b15b5c43503ccf0491cf6eb801ec2bf22ae274e52","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"786f799d0b56eb54d7b6c4b00e1aed4ce81776e14e44767e083c89d014b72004","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"e8bc363837cd9c2d8b22402acb8c1c329efc11ba5d12170603d2fe2eae9da059","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"47998d45b781d797b9e6085ebe898d90de0c952b54537a8db4e8d7503eb032d9","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"93fb44df3d7fd31ead158570667c97b5076a05c3d968af4a84bc13819a8f2db8","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"da1c39a3ff1fe22e41395fa7c8934e90b4c1788e551b9aec6e38bfd94effc437","ci/docker/thumbv7neon-linux-androideabi/Dockerfile":"c2decd5591bd7a09378901bef629cd944acf052eb55e4f35b79eb9cb4d62246a","ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile":"51955a8bf3c4d440f47382af6f5426ebff94ab01a04da36175babda9a057740f","ci/docker/wasm32-unknown-unknown/Dockerfile":"3e5f294bc1e004aa599086c2af49d6f3e7459fa250f5fbdd60cf67d53db78758","ci/docker/x86_64-linux-android/Dockerfile":"685040273cf350d5509e580ac451555efa19790c8723ca2af066adadc6880ad2","ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile":"44b6203d9290bfdc53d81219f0937e1110847a23dd982ec8c4de388354f01536","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"7f4e3ca5fa288ea70edb4d1f75309708cd30b192e2e4444e61c4d5b3b58f89cf","ci/dox.sh":"434e9611c52e389312d2b03564adf09429f10cc76fe66a8644adb104903b87b7","ci/linux-s390x.sh":"d6b732d7795b4ba131326aff893bca6228a7d2eb0e9402f135705413dbbe0dce","ci/linux-sparc64.sh":"c92966838b1ab7ad3b7a344833ee726aba6b647cf5952e56f0ad1ba420b13325","ci/lld-shim.rs":"3d7f71ec23a49e2b67f694a0168786f9a954dda15f5a138815d966643fd3fcc3","ci/max_line_width.sh":"0a1518bba4c9ecaa55694cb2e9930d0e19c265baabf73143f17f9cf285aaa5bb","ci/run-docker.sh":"92e036390ad9b0d16f109579df1b5ced2e72e9afea40c7d011400ebd3a2a90de","ci/run.sh":"41dd6a60efaaeae9661a01370cce98b631f78392859a0cf68c946c0a16edf5f7","ci/run_examples.sh":"d1a23c6c35374a0678ba5114b9b8fefd8be0a79e774872a8bf0898d1baca18d0","ci/runtest-android.rs":"145a8e9799a5223975061fe7e586ade5669ee4877a7d7a4cf6b4ab48e8e36c7c","ci/setup_benchmarks.sh":"fae3960023f6f3d1388cd2ad22fdbab4b075f1f29dd4292d7994a20783beb6cf","ci/test-runner-linux":"c8aa6025cff5306f4f31d0c61dc5f9d4dd5a1d189ab613ef8d4c367c694d9ccd","contributing.md":"2cc8c9c560ae17867e69b06d09b758dbf7bc39eb774ada50a743724b10acc0a2","perf-guide/.gitignore":"fe82c7da551079d832cf74200b0b359b4df9828cb4a0416fa7384f07a2ae6a13","perf-guide/book.toml":"115a98284126c6b180178b44713314cc494f08a71662ee2ce15cf67f17a51064","perf-guide/src/SUMMARY.md":"3e03bffc991fdc2050f3d51842d72d9d21ea6abab56a3baf3b2d5973a78b89e1","perf-guide/src/ascii.css":"29afb08833b2fe2250f0412e1fa1161a2432a0820a14953c87124407417c741a","perf-guide/src/bound_checks.md":"5e4991ff58a183ef0cd9fdc1feb4cd12d083b44bdf87393bbb0927808ef3ce7d","perf-guide/src/float-math/approx.md":"8c09032fa2d795a0c5db1775826c850d28eb2627846d0965c60ee72de63735ad","perf-guide/src/float-math/fma.md":"311076ba4b741d604a82e74b83a8d7e8c318fcbd7f64c4392d1cf5af95c60243","perf-guide/src/float-math/fp.md":"04153e775ab6e4f0d7837bcc515230d327b04edfa34c84ce9c9e10ebaeef2be8","perf-guide/src/float-math/svml.md":"0798873b8eedaeda5fed62dc91645b57c20775a02d3cd74d8bd06958f1516506","perf-guide/src/introduction.md":"9f5a19e9e6751f25d2daad39891a0cc600974527ec4c8305843f9618910671bd","perf-guide/src/prof/linux.md":"447731eb5de7d69166728fdbc5ecb0c0c9db678ea493b45a592d67dd002184c0","perf-guide/src/prof/mca.md":"f56d54f3d20e7aa4d32052186e8237b03d65971eb5d112802b442570ff11d344","perf-guide/src/prof/profiling.md":"8a650c0fd6ede0964789bb6577557eeef1d8226a896788602ce61528e260e43c","perf-guide/src/target-feature/attribute.md":"615f88dca0a707b6c416fa605435dd6e1fb5361cc639429cbf68cd87624bd78b","perf-guide/src/target-feature/features.md":"17077760ff24c006b606dd21889c53d87228f4311f3ba3a574f9afdeacd86165","perf-guide/src/target-feature/inlining.md":"7ed1d7068d8173a00d84c16cfe5871cd68b9f04f8d0cca2d01ebc84957ebf2f6","perf-guide/src/target-feature/practice.md":"c4b371842e0086df178488fec97f20def8f0c62ee588bcd25fd948b9b1fa227e","perf-guide/src/target-feature/runtime.md":"835425f5ee597fb3e51d36e725a81ebee29f4561231d19563cd4da81dbb1cfcb","perf-guide/src/target-feature/rustflags.md":"ab49712e9293a65d74d540ba4784fcb57ff1119ec05a575d895c071f1a620f64","perf-guide/src/vert-hor-ops.md":"c6211c0ee91e60552ec592d89d9d957eedc21dee3cbd89e1ad6765ea06a27471","rustfmt.toml":"de6101d0670bad65fb3b337d56957d2a024e017e5ab146ec784d77312daaf8ff","src/api.rs":"f6e92f056565e6fd93f98829a408aee9e790251e0cbd8a8bc30c8662b4d6fabb","src/api/bit_manip.rs":"c47a4d0f7451f7e35d07715e4f39a472e07457fd456fdb726864a4f6887252a3","src/api/bitmask.rs":"6d2beefd62ee5d9c8eb060bee6abc641616bf828c99f82abf97b21bf004e894b","src/api/cast.rs":"03b94a3d316ac7b7be7068810044911e965e889a0ace7bae762749ca74a92747","src/api/cast/macros.rs":"b0a14d0c83ad2ebb7a275180f6d9e3f2bc312ba57a7d3d6c39fad4e0f20f9408","src/api/cast/v128.rs":"2107ea6a426a0fe37a0aa6a03a579ff0bdeb5a1599ea76e2d81734a82f41276d","src/api/cast/v16.rs":"d785cf93b8e61200c9ae1c32b9f5e9d9518e87c261c56bcaf92f2e47b0009eb4","src/api/cast/v256.rs":"b81fcfd367a5de532d922dedf18579e53666facef7957c0e1bc827825e500ae6","src/api/cast/v32.rs":"2aac9ec0a67a97328ba908b13a1ff98da3dcd7781910d592d31f9207cbd9a7d2","src/api/cast/v512.rs":"33b33de818f8d4eccc982bc2f3951a8b3d03e9762ec02789b3df82e3f5ed3fc3","src/api/cast/v64.rs":"ec878917d52a8c952633251b3a938a2cbe0a63fee6d12c15840d9f1343d1f394","src/api/cmp.rs":"357c3a2a09c6d4611c32dd7fa95be2fae933d513e229026ec9b44451a77b884e","src/api/cmp/eq.rs":"60f70f355bae4cb5b17db53204cacc3890f70670611c17df638d4c04f7cc8075","src/api/cmp/ord.rs":"589f7234761c294fa5df8f525bc4acd5a47cdb602207d524a0d4e19804cd9695","src/api/cmp/partial_eq.rs":"3ed23d2a930b0f9750c3a5309da766b03dc4f9c4d375b42ad3c50fe732693d15","src/api/cmp/partial_ord.rs":"e16b11805c94048acd058c93994b5bc74bb187f8d7e3b86a87df60e1601467f9","src/api/cmp/vertical.rs":"de3d62f38eba817299aa16f1e1939954c9a447e316509397465c2830852ba053","src/api/default.rs":"67bf21c134127d12a7028c8b88a57f0ceee8ccbd74976da8ca74eb9f16a174d5","src/api/fmt.rs":"67fb804bb86b6cd77cf8cd492b5733ce437071b66fe3297278b8a6552c325dda","src/api/fmt/binary.rs":"35cb5c266197d6224d598fb3d286e5fe48ef0c01ed356c2ff6fe9ba946f96a92","src/api/fmt/debug.rs":"aa18eea443bf353fea3db8b1a025132bbcaf91e747ecfa43b8d9fce9af395a0c","src/api/fmt/lower_hex.rs":"69d5be366631af309f214e8031c8c20267fcc27a695eac6f45c6bc1df72a67e6","src/api/fmt/octal.rs":"9eb11ba3d990213f3c7f1ec25edba7ce997cb1320e16d308c83498ba6b9bfbd9","src/api/fmt/upper_hex.rs":"a4637d085b7bb20e759ce58e08435b510a563ba3dd468af2b03560fdc5511562","src/api/from.rs":"2e599d8329cb05eaf06224cc441355c4b7b51254fc19256619333be8c149d444","src/api/from/from_array.rs":"dd3fc64fb17d6184bb60343f8da26a05edf0e5f3c14caf55d49fa15e21d948dc","src/api/from/from_vector.rs":"9764371aa9e6005aace74dea14f59e5611a095b7cf42707940924749282c52f0","src/api/hash.rs":"5076ece87969592c876486f5b1ea8affbeaec379d1a14a30859e0aa5592019de","src/api/into_bits.rs":"82297f0697d67b5a015e904e7e6e7b2a7066ba825bc54b94b4ff3e22d7a1eefb","src/api/into_bits/arch_specific.rs":"4acab22af90112072a2608fafc66fccf18cbf2e641b72af28404d30833cfe5c6","src/api/into_bits/macros.rs":"d762406de25aedff88d460dec7a80dc8e825a2a419d53218ce007efa6a1d3e04","src/api/into_bits/v128.rs":"3c502b9ce85bfcc727d6f053d49030b0ba9f46bd8e9fa5aa109382a2033f9f87","src/api/into_bits/v16.rs":"f4f4f61ba88aa51b158ec56ca3dce234349aea0daf2b3029a14ab5125d1e41e5","src/api/into_bits/v256.rs":"c24c3676707a0feb868dabe00766d74deab176794f905f79056337198c7cf790","src/api/into_bits/v32.rs":"905ba683d342fa32f4202b80bb46530807bd0a5b588f6c2e8c9f475223c47775","src/api/into_bits/v512.rs":"7cd89005215a9326eed8a742125dcbf981cba1aca72a313478eabf3df71b1160","src/api/into_bits/v64.rs":"d6238022ccff7b92e55b3f6017fc269acb6f36330a6d7e8fb389853a0f1b6478","src/api/math.rs":"8b2a2fc651917a850539f993aa0b9e5bf4da67b11685285b8de8cdca311719ec","src/api/math/float.rs":"61d2794d68262a1090ae473bd30793b5f65cf732f32a6694a3af2ce5d9225616","src/api/math/float/abs.rs":"5b6b2701e2e11135b7ce58a05052ea8120e10e4702c95d046b9d21b827b26bf8","src/api/math/float/consts.rs":"78acba000d3fa527111300b6327c1932de9c4c1e02d4174e1a5615c01463d38c","src/api/math/float/cos.rs":"4c2dd7173728ef189314f1576c9486e03be21b7da98843b2f9011282a7979e31","src/api/math/float/exp.rs":"7c6d5f1e304f498a01cfa23b92380c815d7da0ad94eae3483783bc377d287eef","src/api/math/float/ln.rs":"54c7583f3df793b39ff57534fade27b41bb992439e5dc178252f5ca3190a3e54","src/api/math/float/mul_add.rs":"62cac77660d20159276d4c9ef066eb90c81cbddb808e8e157182c607625ad2eb","src/api/math/float/mul_adde.rs":"bae056ee9f3a70df39ec3c3b2f6437c65303888a7b843ef1a5bcf1f5aca0e602","src/api/math/float/powf.rs":"9ddb938984b36d39d82a82f862f80df8f7fb013f1d222d45698d41d88472f568","src/api/math/float/recpre.rs":"589225794ff1dbf31158dff660e6d4509ecc8befbb57c633900dea5ac0b840d6","src/api/math/float/rsqrte.rs":"a32abdcc318d7ccc8448231f54d75b884b7cbeb03a7d595713ab6243036f4dbf","src/api/math/float/sin.rs":"cbd3622b7df74f19691743001c8cf747a201f8977ad90542fee915f37dcd1e49","src/api/math/float/sqrt.rs":"0c66d5d63fb08e4d99c6b82a8828e41173aff1ac9fa1a2764a11fac217ccf2ac","src/api/math/float/sqrte.rs":"731e1c9f321b662accdd27dacb3aac2e8043b7aecb2f2161dde733bd9f025362","src/api/minimal.rs":"1f22bcc528555444e76de569ec0ae2029b9ae9d04805efeafa93369c8098036b","src/api/minimal/iuf.rs":"819cff26d3e196f807645bcc1d79eb27d9f175edb89910f2274d52a1e913cd11","src/api/minimal/mask.rs":"0cae10ae1fc65f5070e686c0c79bfba27b86b33d6c399367bd4848fb367dcec4","src/api/minimal/ptr.rs":"f65ebf21866a863485344432d9a7a9b7418f7fad5fdf841a4e2fa56ec0766ad0","src/api/ops.rs":"3e273b277a0f3019d42c3c59ca94a5afd4885d5ae6d2182e5089bbeec9de42ee","src/api/ops/scalar_arithmetic.rs":"d2d5ad897a59dd0787544f927e0e7ca4072c3e58b0f4a2324083312b0d5a21d7","src/api/ops/scalar_bitwise.rs":"482204e459ca6be79568e1c9f70adbe2d2151412ddf122fb2161be8ebb51c40c","src/api/ops/scalar_mask_bitwise.rs":"c250f52042e37b22d57256c80d4604104cfd2fbe2a2e127c676267270ca5d350","src/api/ops/scalar_shifts.rs":"987f8fdebeedc16e3d77c1b732e7826ef70633c541d16dfa290845d5c6289150","src/api/ops/vector_arithmetic.rs":"ddca15d09ddeef502c2ed66117a62300ca65d87e959e8b622d767bdf1c307910","src/api/ops/vector_bitwise.rs":"b3968f7005b649edcc22a54e2379b14d5ee19045f2e784029805781ae043b5ee","src/api/ops/vector_float_min_max.rs":"76bf8cb607e2c442923c1da1061a6b80d742d607408033c2a3761161114cf2a0","src/api/ops/vector_int_min_max.rs":"a378789c6ff9b32a51fbd0a97ffd36ed102cd1fe6a067d2b02017c1df342def6","src/api/ops/vector_mask_bitwise.rs":"5052d18517d765415d40327e6e8e55a312daaca0a5e2aec959bfa54b1675f9c8","src/api/ops/vector_neg.rs":"5c62f6b0221983cdbd23cd0a3af3672e6ba1255f0dfe8b19aae6fbd6503e231b","src/api/ops/vector_rotates.rs":"03cbe8a400fd7c688e4ee771a990a6754f2031b1a59b19ae81158b21471167e5","src/api/ops/vector_shifts.rs":"9bf69d0087268f61009e39aea52e03a90f378910206b6a28e8393178b6a5d0e0","src/api/ptr.rs":"8a793251bed6130dcfb2f1519ceaa18b751bbb15875928d0fb6deb5a5e07523a","src/api/ptr/gather_scatter.rs":"138b02b0fa1fdd785b95fc7048488be7e3ef277e0bc6ac5affb26af6a11d41a6","src/api/reductions.rs":"ae5baca81352ecd44526d6c30c0a1feeda475ec73ddd3c3ec6b14e944e5448ee","src/api/reductions/bitwise.rs":"8bf910ae226188bd15fc7e125f058cd2566b6186fcd0cd8fd020f352c39ce139","src/api/reductions/float_arithmetic.rs":"3997125f87c7bac07fffda3a1d814e0e6c77ca83099546a9e2fb8dc92231129f","src/api/reductions/integer_arithmetic.rs":"47471da1c5f859489680bb5d34ced3d3aa20081c16053a3af121a4496fcb57bf","src/api/reductions/mask.rs":"db83327a950e33a317f37fd33ca4e20c347fb415975ec024f3e23da8509425af","src/api/reductions/min_max.rs":"d40ccad10220ae5982785015bef92e4b0749583c2b060cad0aa4f92d99491c3b","src/api/select.rs":"a98e2ccf9fc6bdeed32d337c8675bc96c2fbe2cc34fbf149ad6047fb8e749774","src/api/shuffle.rs":"da58200790868c09659819322a489929a5b6e56c596ed07e6a44293ea02e7d09","src/api/shuffle1_dyn.rs":"bfea5a91905b31444e9ef7ca6eddb7a9606b7e22d3f71bb842eb2795a0346620","src/api/slice.rs":"ee87484e8af329547b9a5d4f2a69e8bed6ea10bbd96270d706083843d4eea2ac","src/api/slice/from_slice.rs":"53691dc9958dec4180004a42d140552b405e8cd875caa282e89af378dd63c8bc","src/api/slice/write_to_slice.rs":"3dd2e511af43dc6fa911dd0b12f6f00323e0acd1202a01365db400557d52a89b","src/api/swap_bytes.rs":"4a6792a2e49a77475e1b237592b4b2804dbddb79c474331acd0dd71b36934259","src/codegen.rs":"a29d38fa0a85eaf787fb49989e625bf64effd5f39c126fbb2a24be206d2a3917","src/codegen/bit_manip.rs":"17ecebcff1f080e712fea5eb51602a73f4201ed56a198220342c8eb55bb92692","src/codegen/llvm.rs":"b1f24237f61b7c5ddb8d47f3943aab79a95ce0e75af87ab2d1c88d842faffd39","src/codegen/math.rs":"35f96e37a78fcf0cdb02146b7f27a45108fe06a37fc2a54d8851ce131a326178","src/codegen/math/float.rs":"dd86c0449e576c83b719700962ac017c332987fac08d91f2b7a2b1b883598170","src/codegen/math/float/abs.rs":"f56e2b4b8055ea861c1f5cbc6b6e1d8e7e5af163b62c13574ddee4e09513bfbc","src/codegen/math/float/cos.rs":"ef3b511a24d23045b310315e80348a9b7fedb576fc2de52d74290616a0abeb2a","src/codegen/math/float/cos_pi.rs":"4e7631a5d73dac21531e09ef1802d1180f8997509c2c8fa9f67f322194263a97","src/codegen/math/float/exp.rs":"61b691598c41b5622f24e4320c1bdd08701e612a516438bdddcc728fc3405c8c","src/codegen/math/float/ln.rs":"46b718b1ba8c9d99e1ad40f53d20dfde08a3063ca7bd2a9fdd6698e060da687e","src/codegen/math/float/macros.rs":"dd42135fff13f9aca4fd3a1a4e14c7e6c31aadc6d817d63b0d2fb9e62e062744","src/codegen/math/float/mul_add.rs":"a37bf764345d4b1714f97e83897b7cf0855fc2811704bcbc0012db91825339e1","src/codegen/math/float/mul_adde.rs":"c75702bfcb361de45964a93caf959a695ef2376bd069227600b8c6872665c755","src/codegen/math/float/powf.rs":"642346e982bc4c39203de0864d2149c4179cd7b21cf67a2951687932b4675872","src/codegen/math/float/sin.rs":"9d68164c90cdca6a85155040cdac42e27342ebe0b925273ef1593df721af4258","src/codegen/math/float/sin_cos_pi.rs":"9be02ad48585a1e8d99129382fbffbaed47852f15459256a708850b6b7a75405","src/codegen/math/float/sin_pi.rs":"9890347905b4d4a3c7341c3eb06406e46e60582bcf6960688bd727e5dadc6c57","src/codegen/math/float/sqrt.rs":"e3c60dcfb0c6d2fc62adabcc931b2d4040b83cab294dea36443fb4b89eb79e34","src/codegen/math/float/sqrte.rs":"f0f4ef9eb475ae41bcc7ec6a95ad744ba6b36925faa8b2c2814004396d196b63","src/codegen/pointer_sized_int.rs":"a70697169c28218b56fd2e8d5353f2e00671d1150d0c8cef77d613bdfacd84cb","src/codegen/reductions.rs":"645e2514746d01387ddd07f0aa4ffd8430cc9ab428d4fb13773ea319fa25dd95","src/codegen/reductions/mask.rs":"8f1afe6aabf096a3278e1fc3a30f736e04aa8b9ce96373cee22162d18cfe2702","src/codegen/reductions/mask/aarch64.rs":"cba6e17603d39795dcfe8339b6b7d8714c3e162a1f0a635979f037aa24fe4206","src/codegen/reductions/mask/arm.rs":"9447904818aa2c7c25d0963eead452a639a11ca7dbd6d21eedbfcaade07a0f33","src/codegen/reductions/mask/fallback.rs":"7a0ef9f7fd03ae318b495b95e121350cd61caffc5cc6ee17fabf130d5d933453","src/codegen/reductions/mask/fallback_impl.rs":"76547f396e55ef403327c77c314cf8db8c7a5c9b9819bfb925abeacf130249e5","src/codegen/reductions/mask/x86.rs":"4c0457b6276f9809223590092a4c77e73812330326cdabd28df06820de10a310","src/codegen/reductions/mask/x86/avx.rs":"b4913d87844c522903641cbbf10db4551addb1ce5e9e78278e21612fa65c733b","src/codegen/reductions/mask/x86/avx2.rs":"677aed3f056285285daa3adff8bc65e739630b4424defa6d9665e160f027507e","src/codegen/reductions/mask/x86/sse.rs":"5a827c6f8e1074e324f6e4c778942badb6c09d747a7142de01cadec1240b3428","src/codegen/reductions/mask/x86/sse2.rs":"bc38e6c31cb4b3d62147eba6cac264e519e2a48e0f7ce9010cfa9ef0cf0ec9fd","src/codegen/shuffle.rs":"99a0b52c2470097b028af134221099baba383446a01c7dc3ae560209880bcdb7","src/codegen/shuffle1_dyn.rs":"abbc95305dad815ab2ded3e8357791bcff080414668b55a4d397558a1d202d01","src/codegen/swap_bytes.rs":"1d6cdc716eadddc92b4fd506b2445a821caa8dc00860447de09d7ebd69c2087f","src/codegen/v128.rs":"94226b31ec403d18d9d2fe06713f147c9c79e9b5f9105089088266313f843185","src/codegen/v16.rs":"ddec4ffb66b6f7aaffb9a1780c5ddba82557abd74f45073d335047e04cf74924","src/codegen/v256.rs":"6b63917f0444118d6b1595bff2045e59b97c4d24012bd575f69f1f0efc5a0241","src/codegen/v32.rs":"3477b3c5540aed86e61e2f5807dd31db947413cec9181c587d93ed6ec74f0eba","src/codegen/v512.rs":"5854f99d3aabc4cd42b28a20d9ce447756dc2ba024a409a69b6a8ae1f1842fc5","src/codegen/v64.rs":"e9e89caebfe63d10c0cbca61e4dfdba3b7e02ee0989170f80beed23237ddd950","src/codegen/vPtr.rs":"711c753a08d53a2879c4fb87a0762c46ce4e34c22f0ca88d2e4c557a0f679969","src/codegen/vSize.rs":"eeee9858749aa82142b27bc120d1989bb74a6b82e1e4efbbeaccc9634dc9acfc","src/lib.rs":"b842b5e47008b9bd59af4d2e309b84204d90a53d36595684082adc46b6934987","src/masks.rs":"be05e923ac58fe6eb61311561b5583cd306574f206dc09fe8e3c7de3dd0c1433","src/sealed.rs":"ae7fdeaf5d84cd7710ed730ca72ca7eaba93df6cb0acb183e5c0a7327acf197f","src/testing.rs":"1d3a7862ef625e235a5734ad7204e68d350f902c0695182b1f08a0552432416e","src/testing/macros.rs":"6378856d7a40ba5ec5c7c0dad6327d79f0c77266921c24296d10aed6c68e9b98","src/testing/utils.rs":"5ec6a47b836f364ec6dede19750a19eaac704162327d03041eb0f007d5f8d75c","src/v128.rs":"16cf9a8e7156b899ee9b9cd3f2dba9d13ec63289bea8c3ee9ae2e43ad9510288","src/v16.rs":"cb6465cf1e00bf530183af1819b9fe3d7eec978f8765d5e85d9b58a39a4b4045","src/v256.rs":"fe235017da18c7f3c361831c60e3173ad304d8ea1e95d64ebebc79da2d708511","src/v32.rs":"145d347855bac59b2de6508f9e594654e6c330423af9edc0e2ac8f4d1abdf45e","src/v512.rs":"f372f277f3e62eb5c945bb1c460333fdb17b6974fcc876633788ff53bded9599","src/v64.rs":"0b8079881b71575e3414be0b7f8f7eaba65281ba6732f2b2f61f73e95b6f48f7","src/vPtr.rs":"8b3e433d487180bb4304ff71245ecad90f0010f43e139a72027b672abe58facc","src/vSize.rs":"eda5aa020706cbf94d15bada41a0c2a35fc8f3f37cb7c2cd6f34d201399a495e","tests/endianness.rs":"7db22078f31fe1421fc2d21f2e6b9df5eb0bdc99c10f6985d3a74c0df8f205dc"},"package":null}
+\ No newline at end of file
++{"files":{".appveyor.yml":"f1ed01850e0d725f9498f52a1a63ddf40702ad6e0bf5b2d7c4c04d76e96794a3",".travis.yml":"d56de6531d3c4880e3aada85ac8e6d7388e5d781871e181cb8ade2a746d5d5f5","Cargo.toml":"e94ccb82002e8b55680c2c5fec554a9e864c5f354e113278d0aa927df279330d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"49d01e49a33393af64fa6c813b6a724f68a4d1abfbedcb96413651ed105aa820","bors.toml":"dee881dc69b9b7834e4eba5d95c3ed5a416d4628815a167d6a22d4cb4fb064b8","build.rs":"c3312e786c7fcb8f16c0785fe235ebbcf43fbeab6d7d683752f62043ca92d887","ci/all.sh":"2ae6b2445b4db83833e40b37efd0016c6b9879ee988b9b3ef94db5439a3e1606","ci/android-install-ndk.sh":"0f1746108cc30bf9b9ba45bcde7b19fc1a8bdf5b0258035b4eb8dc69b75efac4","ci/android-install-sdk.sh":"3490432022c5c8f5a115c084f7a9aca1626f96c0c87ffb62019228c4346b47e4","ci/android-sysimage.sh":"ebf4e5daa1f0fe1b2092b79f0f3f161c4c4275cb744e52352c4d81ab451e4c5a","ci/benchmark.sh":"b61d19ef6b90deba8fb79dee74c8b062d94844676293da346da87bb78a9a49a4","ci/deploy_and_run_on_ios_simulator.rs":"ec8ecf82d92072676aa47f0d1a3d021b60a7ae3531153ef12d2ff4541fc294dc","ci/docker/aarch64-linux-android/Dockerfile":"ace2e7d33c87bc0f6d3962a4a3408c04557646f7f51ab99cfbf574906796b016","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"da88c0d50f16dc08448c7fdf1fa5ed2cbe576acf9e7dd85b5b818621b2a8c702","ci/docker/arm-linux-androideabi/Dockerfile":"370e55d3330a413a3ccf677b3afb3e0ef9018a5fab263faa97ae8ac017fc2286","ci/docker/arm-unknown-linux-gnueabi/Dockerfile":"bb5f8ae890707c128652290ffc544447643bf12037ddd73c6ad6989f848cb380","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"1afaefcbc05b740859acd4e067bc92439be6bcbe8f2e9678474fb434bcd398d9","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"8282ea707a94109beed47a57574755e2d58401735904a03f85fb64c578c53b4f","ci/docker/i586-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/i686-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/mips-unknown-linux-gnu/Dockerfile":"b2ebc25797612c4f8395fe9d407725156044955bfbcf442036b7f55b43a5f9da","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"b0c1692ac65bc56dd30494b1993d8e929c48cc9c4b92029b7c7592af6d4f9220","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"4e9249c179300138141d0b2b7401b11897f64aed69f541f078c1db4594df2827","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"3164c52b0dcbb01afa78292b15b5c43503ccf0491cf6eb801ec2bf22ae274e52","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"786f799d0b56eb54d7b6c4b00e1aed4ce81776e14e44767e083c89d014b72004","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"e8bc363837cd9c2d8b22402acb8c1c329efc11ba5d12170603d2fe2eae9da059","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"47998d45b781d797b9e6085ebe898d90de0c952b54537a8db4e8d7503eb032d9","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"93fb44df3d7fd31ead158570667c97b5076a05c3d968af4a84bc13819a8f2db8","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"da1c39a3ff1fe22e41395fa7c8934e90b4c1788e551b9aec6e38bfd94effc437","ci/docker/thumbv7neon-linux-androideabi/Dockerfile":"c2decd5591bd7a09378901bef629cd944acf052eb55e4f35b79eb9cb4d62246a","ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile":"51955a8bf3c4d440f47382af6f5426ebff94ab01a04da36175babda9a057740f","ci/docker/wasm32-unknown-unknown/Dockerfile":"3e5f294bc1e004aa599086c2af49d6f3e7459fa250f5fbdd60cf67d53db78758","ci/docker/x86_64-linux-android/Dockerfile":"685040273cf350d5509e580ac451555efa19790c8723ca2af066adadc6880ad2","ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile":"44b6203d9290bfdc53d81219f0937e1110847a23dd982ec8c4de388354f01536","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"7f4e3ca5fa288ea70edb4d1f75309708cd30b192e2e4444e61c4d5b3b58f89cf","ci/dox.sh":"434e9611c52e389312d2b03564adf09429f10cc76fe66a8644adb104903b87b7","ci/linux-s390x.sh":"d6b732d7795b4ba131326aff893bca6228a7d2eb0e9402f135705413dbbe0dce","ci/linux-sparc64.sh":"c92966838b1ab7ad3b7a344833ee726aba6b647cf5952e56f0ad1ba420b13325","ci/lld-shim.rs":"3d7f71ec23a49e2b67f694a0168786f9a954dda15f5a138815d966643fd3fcc3","ci/max_line_width.sh":"0a1518bba4c9ecaa55694cb2e9930d0e19c265baabf73143f17f9cf285aaa5bb","ci/run-docker.sh":"92e036390ad9b0d16f109579df1b5ced2e72e9afea40c7d011400ebd3a2a90de","ci/run.sh":"41dd6a60efaaeae9661a01370cce98b631f78392859a0cf68c946c0a16edf5f7","ci/run_examples.sh":"d1a23c6c35374a0678ba5114b9b8fefd8be0a79e774872a8bf0898d1baca18d0","ci/runtest-android.rs":"145a8e9799a5223975061fe7e586ade5669ee4877a7d7a4cf6b4ab48e8e36c7c","ci/setup_benchmarks.sh":"fae3960023f6f3d1388cd2ad22fdbab4b075f1f29dd4292d7994a20783beb6cf","ci/test-runner-linux":"c8aa6025cff5306f4f31d0c61dc5f9d4dd5a1d189ab613ef8d4c367c694d9ccd","contributing.md":"2cc8c9c560ae17867e69b06d09b758dbf7bc39eb774ada50a743724b10acc0a2","perf-guide/.gitignore":"fe82c7da551079d832cf74200b0b359b4df9828cb4a0416fa7384f07a2ae6a13","perf-guide/book.toml":"115a98284126c6b180178b44713314cc494f08a71662ee2ce15cf67f17a51064","perf-guide/src/SUMMARY.md":"3e03bffc991fdc2050f3d51842d72d9d21ea6abab56a3baf3b2d5973a78b89e1","perf-guide/src/ascii.css":"29afb08833b2fe2250f0412e1fa1161a2432a0820a14953c87124407417c741a","perf-guide/src/bound_checks.md":"5e4991ff58a183ef0cd9fdc1feb4cd12d083b44bdf87393bbb0927808ef3ce7d","perf-guide/src/float-math/approx.md":"8c09032fa2d795a0c5db1775826c850d28eb2627846d0965c60ee72de63735ad","perf-guide/src/float-math/fma.md":"311076ba4b741d604a82e74b83a8d7e8c318fcbd7f64c4392d1cf5af95c60243","perf-guide/src/float-math/fp.md":"04153e775ab6e4f0d7837bcc515230d327b04edfa34c84ce9c9e10ebaeef2be8","perf-guide/src/float-math/svml.md":"0798873b8eedaeda5fed62dc91645b57c20775a02d3cd74d8bd06958f1516506","perf-guide/src/introduction.md":"9f5a19e9e6751f25d2daad39891a0cc600974527ec4c8305843f9618910671bd","perf-guide/src/prof/linux.md":"447731eb5de7d69166728fdbc5ecb0c0c9db678ea493b45a592d67dd002184c0","perf-guide/src/prof/mca.md":"f56d54f3d20e7aa4d32052186e8237b03d65971eb5d112802b442570ff11d344","perf-guide/src/prof/profiling.md":"8a650c0fd6ede0964789bb6577557eeef1d8226a896788602ce61528e260e43c","perf-guide/src/target-feature/attribute.md":"615f88dca0a707b6c416fa605435dd6e1fb5361cc639429cbf68cd87624bd78b","perf-guide/src/target-feature/features.md":"17077760ff24c006b606dd21889c53d87228f4311f3ba3a574f9afdeacd86165","perf-guide/src/target-feature/inlining.md":"7ed1d7068d8173a00d84c16cfe5871cd68b9f04f8d0cca2d01ebc84957ebf2f6","perf-guide/src/target-feature/practice.md":"c4b371842e0086df178488fec97f20def8f0c62ee588bcd25fd948b9b1fa227e","perf-guide/src/target-feature/runtime.md":"835425f5ee597fb3e51d36e725a81ebee29f4561231d19563cd4da81dbb1cfcb","perf-guide/src/target-feature/rustflags.md":"ab49712e9293a65d74d540ba4784fcb57ff1119ec05a575d895c071f1a620f64","perf-guide/src/vert-hor-ops.md":"c6211c0ee91e60552ec592d89d9d957eedc21dee3cbd89e1ad6765ea06a27471","rustfmt.toml":"de6101d0670bad65fb3b337d56957d2a024e017e5ab146ec784d77312daaf8ff","src/api.rs":"f6e92f056565e6fd93f98829a408aee9e790251e0cbd8a8bc30c8662b4d6fabb","src/api/bit_manip.rs":"c47a4d0f7451f7e35d07715e4f39a472e07457fd456fdb726864a4f6887252a3","src/api/bitmask.rs":"6d2beefd62ee5d9c8eb060bee6abc641616bf828c99f82abf97b21bf004e894b","src/api/cast.rs":"03b94a3d316ac7b7be7068810044911e965e889a0ace7bae762749ca74a92747","src/api/cast/macros.rs":"b0a14d0c83ad2ebb7a275180f6d9e3f2bc312ba57a7d3d6c39fad4e0f20f9408","src/api/cast/v128.rs":"2107ea6a426a0fe37a0aa6a03a579ff0bdeb5a1599ea76e2d81734a82f41276d","src/api/cast/v16.rs":"d785cf93b8e61200c9ae1c32b9f5e9d9518e87c261c56bcaf92f2e47b0009eb4","src/api/cast/v256.rs":"b81fcfd367a5de532d922dedf18579e53666facef7957c0e1bc827825e500ae6","src/api/cast/v32.rs":"2aac9ec0a67a97328ba908b13a1ff98da3dcd7781910d592d31f9207cbd9a7d2","src/api/cast/v512.rs":"33b33de818f8d4eccc982bc2f3951a8b3d03e9762ec02789b3df82e3f5ed3fc3","src/api/cast/v64.rs":"ec878917d52a8c952633251b3a938a2cbe0a63fee6d12c15840d9f1343d1f394","src/api/cmp.rs":"357c3a2a09c6d4611c32dd7fa95be2fae933d513e229026ec9b44451a77b884e","src/api/cmp/eq.rs":"60f70f355bae4cb5b17db53204cacc3890f70670611c17df638d4c04f7cc8075","src/api/cmp/ord.rs":"589f7234761c294fa5df8f525bc4acd5a47cdb602207d524a0d4e19804cd9695","src/api/cmp/partial_eq.rs":"3ed23d2a930b0f9750c3a5309da766b03dc4f9c4d375b42ad3c50fe732693d15","src/api/cmp/partial_ord.rs":"e16b11805c94048acd058c93994b5bc74bb187f8d7e3b86a87df60e1601467f9","src/api/cmp/vertical.rs":"de3d62f38eba817299aa16f1e1939954c9a447e316509397465c2830852ba053","src/api/default.rs":"67bf21c134127d12a7028c8b88a57f0ceee8ccbd74976da8ca74eb9f16a174d5","src/api/fmt.rs":"67fb804bb86b6cd77cf8cd492b5733ce437071b66fe3297278b8a6552c325dda","src/api/fmt/binary.rs":"35cb5c266197d6224d598fb3d286e5fe48ef0c01ed356c2ff6fe9ba946f96a92","src/api/fmt/debug.rs":"aa18eea443bf353fea3db8b1a025132bbcaf91e747ecfa43b8d9fce9af395a0c","src/api/fmt/lower_hex.rs":"69d5be366631af309f214e8031c8c20267fcc27a695eac6f45c6bc1df72a67e6","src/api/fmt/octal.rs":"9eb11ba3d990213f3c7f1ec25edba7ce997cb1320e16d308c83498ba6b9bfbd9","src/api/fmt/upper_hex.rs":"a4637d085b7bb20e759ce58e08435b510a563ba3dd468af2b03560fdc5511562","src/api/from.rs":"2e599d8329cb05eaf06224cc441355c4b7b51254fc19256619333be8c149d444","src/api/from/from_array.rs":"dd3fc64fb17d6184bb60343f8da26a05edf0e5f3c14caf55d49fa15e21d948dc","src/api/from/from_vector.rs":"9764371aa9e6005aace74dea14f59e5611a095b7cf42707940924749282c52f0","src/api/hash.rs":"5076ece87969592c876486f5b1ea8affbeaec379d1a14a30859e0aa5592019de","src/api/into_bits.rs":"82297f0697d67b5a015e904e7e6e7b2a7066ba825bc54b94b4ff3e22d7a1eefb","src/api/into_bits/arch_specific.rs":"4acab22af90112072a2608fafc66fccf18cbf2e641b72af28404d30833cfe5c6","src/api/into_bits/macros.rs":"d762406de25aedff88d460dec7a80dc8e825a2a419d53218ce007efa6a1d3e04","src/api/into_bits/v128.rs":"3c502b9ce85bfcc727d6f053d49030b0ba9f46bd8e9fa5aa109382a2033f9f87","src/api/into_bits/v16.rs":"f4f4f61ba88aa51b158ec56ca3dce234349aea0daf2b3029a14ab5125d1e41e5","src/api/into_bits/v256.rs":"c24c3676707a0feb868dabe00766d74deab176794f905f79056337198c7cf790","src/api/into_bits/v32.rs":"905ba683d342fa32f4202b80bb46530807bd0a5b588f6c2e8c9f475223c47775","src/api/into_bits/v512.rs":"7cd89005215a9326eed8a742125dcbf981cba1aca72a313478eabf3df71b1160","src/api/into_bits/v64.rs":"d6238022ccff7b92e55b3f6017fc269acb6f36330a6d7e8fb389853a0f1b6478","src/api/math.rs":"8b2a2fc651917a850539f993aa0b9e5bf4da67b11685285b8de8cdca311719ec","src/api/math/float.rs":"61d2794d68262a1090ae473bd30793b5f65cf732f32a6694a3af2ce5d9225616","src/api/math/float/abs.rs":"5b6b2701e2e11135b7ce58a05052ea8120e10e4702c95d046b9d21b827b26bf8","src/api/math/float/consts.rs":"78acba000d3fa527111300b6327c1932de9c4c1e02d4174e1a5615c01463d38c","src/api/math/float/cos.rs":"4c2dd7173728ef189314f1576c9486e03be21b7da98843b2f9011282a7979e31","src/api/math/float/exp.rs":"7c6d5f1e304f498a01cfa23b92380c815d7da0ad94eae3483783bc377d287eef","src/api/math/float/ln.rs":"54c7583f3df793b39ff57534fade27b41bb992439e5dc178252f5ca3190a3e54","src/api/math/float/mul_add.rs":"62cac77660d20159276d4c9ef066eb90c81cbddb808e8e157182c607625ad2eb","src/api/math/float/mul_adde.rs":"bae056ee9f3a70df39ec3c3b2f6437c65303888a7b843ef1a5bcf1f5aca0e602","src/api/math/float/powf.rs":"9ddb938984b36d39d82a82f862f80df8f7fb013f1d222d45698d41d88472f568","src/api/math/float/recpre.rs":"589225794ff1dbf31158dff660e6d4509ecc8befbb57c633900dea5ac0b840d6","src/api/math/float/rsqrte.rs":"a32abdcc318d7ccc8448231f54d75b884b7cbeb03a7d595713ab6243036f4dbf","src/api/math/float/sin.rs":"cbd3622b7df74f19691743001c8cf747a201f8977ad90542fee915f37dcd1e49","src/api/math/float/sqrt.rs":"0c66d5d63fb08e4d99c6b82a8828e41173aff1ac9fa1a2764a11fac217ccf2ac","src/api/math/float/sqrte.rs":"731e1c9f321b662accdd27dacb3aac2e8043b7aecb2f2161dde733bd9f025362","src/api/minimal.rs":"1f22bcc528555444e76de569ec0ae2029b9ae9d04805efeafa93369c8098036b","src/api/minimal/iuf.rs":"819cff26d3e196f807645bcc1d79eb27d9f175edb89910f2274d52a1e913cd11","src/api/minimal/mask.rs":"0cae10ae1fc65f5070e686c0c79bfba27b86b33d6c399367bd4848fb367dcec4","src/api/minimal/ptr.rs":"f65ebf21866a863485344432d9a7a9b7418f7fad5fdf841a4e2fa56ec0766ad0","src/api/ops.rs":"3e273b277a0f3019d42c3c59ca94a5afd4885d5ae6d2182e5089bbeec9de42ee","src/api/ops/scalar_arithmetic.rs":"d2d5ad897a59dd0787544f927e0e7ca4072c3e58b0f4a2324083312b0d5a21d7","src/api/ops/scalar_bitwise.rs":"482204e459ca6be79568e1c9f70adbe2d2151412ddf122fb2161be8ebb51c40c","src/api/ops/scalar_mask_bitwise.rs":"c250f52042e37b22d57256c80d4604104cfd2fbe2a2e127c676267270ca5d350","src/api/ops/scalar_shifts.rs":"987f8fdebeedc16e3d77c1b732e7826ef70633c541d16dfa290845d5c6289150","src/api/ops/vector_arithmetic.rs":"ddca15d09ddeef502c2ed66117a62300ca65d87e959e8b622d767bdf1c307910","src/api/ops/vector_bitwise.rs":"b3968f7005b649edcc22a54e2379b14d5ee19045f2e784029805781ae043b5ee","src/api/ops/vector_float_min_max.rs":"76bf8cb607e2c442923c1da1061a6b80d742d607408033c2a3761161114cf2a0","src/api/ops/vector_int_min_max.rs":"a378789c6ff9b32a51fbd0a97ffd36ed102cd1fe6a067d2b02017c1df342def6","src/api/ops/vector_mask_bitwise.rs":"5052d18517d765415d40327e6e8e55a312daaca0a5e2aec959bfa54b1675f9c8","src/api/ops/vector_neg.rs":"5c62f6b0221983cdbd23cd0a3af3672e6ba1255f0dfe8b19aae6fbd6503e231b","src/api/ops/vector_rotates.rs":"03cbe8a400fd7c688e4ee771a990a6754f2031b1a59b19ae81158b21471167e5","src/api/ops/vector_shifts.rs":"9bf69d0087268f61009e39aea52e03a90f378910206b6a28e8393178b6a5d0e0","src/api/ptr.rs":"8a793251bed6130dcfb2f1519ceaa18b751bbb15875928d0fb6deb5a5e07523a","src/api/ptr/gather_scatter.rs":"138b02b0fa1fdd785b95fc7048488be7e3ef277e0bc6ac5affb26af6a11d41a6","src/api/reductions.rs":"ae5baca81352ecd44526d6c30c0a1feeda475ec73ddd3c3ec6b14e944e5448ee","src/api/reductions/bitwise.rs":"8bf910ae226188bd15fc7e125f058cd2566b6186fcd0cd8fd020f352c39ce139","src/api/reductions/float_arithmetic.rs":"3997125f87c7bac07fffda3a1d814e0e6c77ca83099546a9e2fb8dc92231129f","src/api/reductions/integer_arithmetic.rs":"47471da1c5f859489680bb5d34ced3d3aa20081c16053a3af121a4496fcb57bf","src/api/reductions/mask.rs":"db83327a950e33a317f37fd33ca4e20c347fb415975ec024f3e23da8509425af","src/api/reductions/min_max.rs":"d40ccad10220ae5982785015bef92e4b0749583c2b060cad0aa4f92d99491c3b","src/api/select.rs":"a98e2ccf9fc6bdeed32d337c8675bc96c2fbe2cc34fbf149ad6047fb8e749774","src/api/shuffle.rs":"6d1e5970b9fc8555a667c2924151070dd21584e81da8a9668d6bfe16f4a0db82","src/api/shuffle1_dyn.rs":"bfea5a91905b31444e9ef7ca6eddb7a9606b7e22d3f71bb842eb2795a0346620","src/api/slice.rs":"ee87484e8af329547b9a5d4f2a69e8bed6ea10bbd96270d706083843d4eea2ac","src/api/slice/from_slice.rs":"53691dc9958dec4180004a42d140552b405e8cd875caa282e89af378dd63c8bc","src/api/slice/write_to_slice.rs":"3dd2e511af43dc6fa911dd0b12f6f00323e0acd1202a01365db400557d52a89b","src/api/swap_bytes.rs":"4a6792a2e49a77475e1b237592b4b2804dbddb79c474331acd0dd71b36934259","src/codegen.rs":"a29d38fa0a85eaf787fb49989e625bf64effd5f39c126fbb2a24be206d2a3917","src/codegen/bit_manip.rs":"17ecebcff1f080e712fea5eb51602a73f4201ed56a198220342c8eb55bb92692","src/codegen/llvm.rs":"5bc6751293f9f184cf23d5df448c7d58b58b799e41c7a91f8ca41a5ba56e64ec","src/codegen/math.rs":"35f96e37a78fcf0cdb02146b7f27a45108fe06a37fc2a54d8851ce131a326178","src/codegen/math/float.rs":"dd86c0449e576c83b719700962ac017c332987fac08d91f2b7a2b1b883598170","src/codegen/math/float/abs.rs":"f56e2b4b8055ea861c1f5cbc6b6e1d8e7e5af163b62c13574ddee4e09513bfbc","src/codegen/math/float/cos.rs":"ef3b511a24d23045b310315e80348a9b7fedb576fc2de52d74290616a0abeb2a","src/codegen/math/float/cos_pi.rs":"4e7631a5d73dac21531e09ef1802d1180f8997509c2c8fa9f67f322194263a97","src/codegen/math/float/exp.rs":"61b691598c41b5622f24e4320c1bdd08701e612a516438bdddcc728fc3405c8c","src/codegen/math/float/ln.rs":"46b718b1ba8c9d99e1ad40f53d20dfde08a3063ca7bd2a9fdd6698e060da687e","src/codegen/math/float/macros.rs":"dd42135fff13f9aca4fd3a1a4e14c7e6c31aadc6d817d63b0d2fb9e62e062744","src/codegen/math/float/mul_add.rs":"a37bf764345d4b1714f97e83897b7cf0855fc2811704bcbc0012db91825339e1","src/codegen/math/float/mul_adde.rs":"c75702bfcb361de45964a93caf959a695ef2376bd069227600b8c6872665c755","src/codegen/math/float/powf.rs":"642346e982bc4c39203de0864d2149c4179cd7b21cf67a2951687932b4675872","src/codegen/math/float/sin.rs":"9d68164c90cdca6a85155040cdac42e27342ebe0b925273ef1593df721af4258","src/codegen/math/float/sin_cos_pi.rs":"9be02ad48585a1e8d99129382fbffbaed47852f15459256a708850b6b7a75405","src/codegen/math/float/sin_pi.rs":"9890347905b4d4a3c7341c3eb06406e46e60582bcf6960688bd727e5dadc6c57","src/codegen/math/float/sqrt.rs":"e3c60dcfb0c6d2fc62adabcc931b2d4040b83cab294dea36443fb4b89eb79e34","src/codegen/math/float/sqrte.rs":"f0f4ef9eb475ae41bcc7ec6a95ad744ba6b36925faa8b2c2814004396d196b63","src/codegen/pointer_sized_int.rs":"a70697169c28218b56fd2e8d5353f2e00671d1150d0c8cef77d613bdfacd84cb","src/codegen/reductions.rs":"645e2514746d01387ddd07f0aa4ffd8430cc9ab428d4fb13773ea319fa25dd95","src/codegen/reductions/mask.rs":"8f1afe6aabf096a3278e1fc3a30f736e04aa8b9ce96373cee22162d18cfe2702","src/codegen/reductions/mask/aarch64.rs":"cba6e17603d39795dcfe8339b6b7d8714c3e162a1f0a635979f037aa24fe4206","src/codegen/reductions/mask/arm.rs":"9447904818aa2c7c25d0963eead452a639a11ca7dbd6d21eedbfcaade07a0f33","src/codegen/reductions/mask/fallback.rs":"7a0ef9f7fd03ae318b495b95e121350cd61caffc5cc6ee17fabf130d5d933453","src/codegen/reductions/mask/fallback_impl.rs":"76547f396e55ef403327c77c314cf8db8c7a5c9b9819bfb925abeacf130249e5","src/codegen/reductions/mask/x86.rs":"4c0457b6276f9809223590092a4c77e73812330326cdabd28df06820de10a310","src/codegen/reductions/mask/x86/avx.rs":"b4913d87844c522903641cbbf10db4551addb1ce5e9e78278e21612fa65c733b","src/codegen/reductions/mask/x86/avx2.rs":"677aed3f056285285daa3adff8bc65e739630b4424defa6d9665e160f027507e","src/codegen/reductions/mask/x86/sse.rs":"5a827c6f8e1074e324f6e4c778942badb6c09d747a7142de01cadec1240b3428","src/codegen/reductions/mask/x86/sse2.rs":"bc38e6c31cb4b3d62147eba6cac264e519e2a48e0f7ce9010cfa9ef0cf0ec9fd","src/codegen/shuffle.rs":"99a0b52c2470097b028af134221099baba383446a01c7dc3ae560209880bcdb7","src/codegen/shuffle1_dyn.rs":"abbc95305dad815ab2ded3e8357791bcff080414668b55a4d397558a1d202d01","src/codegen/swap_bytes.rs":"1d6cdc716eadddc92b4fd506b2445a821caa8dc00860447de09d7ebd69c2087f","src/codegen/v128.rs":"94226b31ec403d18d9d2fe06713f147c9c79e9b5f9105089088266313f843185","src/codegen/v16.rs":"ddec4ffb66b6f7aaffb9a1780c5ddba82557abd74f45073d335047e04cf74924","src/codegen/v256.rs":"6b63917f0444118d6b1595bff2045e59b97c4d24012bd575f69f1f0efc5a0241","src/codegen/v32.rs":"3477b3c5540aed86e61e2f5807dd31db947413cec9181c587d93ed6ec74f0eba","src/codegen/v512.rs":"5854f99d3aabc4cd42b28a20d9ce447756dc2ba024a409a69b6a8ae1f1842fc5","src/codegen/v64.rs":"e9e89caebfe63d10c0cbca61e4dfdba3b7e02ee0989170f80beed23237ddd950","src/codegen/vPtr.rs":"711c753a08d53a2879c4fb87a0762c46ce4e34c22f0ca88d2e4c557a0f679969","src/codegen/vSize.rs":"eeee9858749aa82142b27bc120d1989bb74a6b82e1e4efbbeaccc9634dc9acfc","src/lib.rs":"f2e2d0867734a62e1f468e5d3e15fbd01a15f8aafd5d65a8a3cb7ab95ffd61c4","src/masks.rs":"be05e923ac58fe6eb61311561b5583cd306574f206dc09fe8e3c7de3dd0c1433","src/sealed.rs":"ae7fdeaf5d84cd7710ed730ca72ca7eaba93df6cb0acb183e5c0a7327acf197f","src/testing.rs":"1d3a7862ef625e235a5734ad7204e68d350f902c0695182b1f08a0552432416e","src/testing/macros.rs":"6378856d7a40ba5ec5c7c0dad6327d79f0c77266921c24296d10aed6c68e9b98","src/testing/utils.rs":"5ec6a47b836f364ec6dede19750a19eaac704162327d03041eb0f007d5f8d75c","src/v128.rs":"16cf9a8e7156b899ee9b9cd3f2dba9d13ec63289bea8c3ee9ae2e43ad9510288","src/v16.rs":"cb6465cf1e00bf530183af1819b9fe3d7eec978f8765d5e85d9b58a39a4b4045","src/v256.rs":"fe235017da18c7f3c361831c60e3173ad304d8ea1e95d64ebebc79da2d708511","src/v32.rs":"145d347855bac59b2de6508f9e594654e6c330423af9edc0e2ac8f4d1abdf45e","src/v512.rs":"f372f277f3e62eb5c945bb1c460333fdb17b6974fcc876633788ff53bded9599","src/v64.rs":"0b8079881b71575e3414be0b7f8f7eaba65281ba6732f2b2f61f73e95b6f48f7","src/vPtr.rs":"8b3e433d487180bb4304ff71245ecad90f0010f43e139a72027b672abe58facc","src/vSize.rs":"eda5aa020706cbf94d15bada41a0c2a35fc8f3f37cb7c2cd6f34d201399a495e","tests/endianness.rs":"7db22078f31fe1421fc2d21f2e6b9df5eb0bdc99c10f6985d3a74c0df8f205dc"},"package":null}
+\ No newline at end of file
+diff --git a/third_party/rust/packed_simd/src/api/shuffle.rs b/third_party/rust/packed_simd/src/api/shuffle.rs
+index 13a7fae5fc..3fe1ad5f27 100644
+--- a/third_party/rust/packed_simd/src/api/shuffle.rs
++++ b/third_party/rust/packed_simd/src/api/shuffle.rs
+@@ -79,20 +79,18 @@ macro_rules! shuffle {
+     ($vec0:expr, $vec1:expr, [$l0:expr, $l1:expr]) => {{
+         #[allow(unused_unsafe)]
+         unsafe {
+-            $crate::Simd($crate::__shuffle_vector2(
++            $crate::Simd($crate::__shuffle_vector2::<{[$l0, $l1]}, _, _>(
+                 $vec0.0,
+                 $vec1.0,
+-                [$l0, $l1],
+             ))
+         }
+     }};
+     ($vec0:expr, $vec1:expr, [$l0:expr, $l1:expr, $l2:expr, $l3:expr]) => {{
+         #[allow(unused_unsafe)]
+         unsafe {
+-            $crate::Simd($crate::__shuffle_vector4(
++            $crate::Simd($crate::__shuffle_vector4::<{[$l0, $l1, $l2, $l3]}, _, _>(
+                 $vec0.0,
+                 $vec1.0,
+-                [$l0, $l1, $l2, $l3],
+             ))
+         }
+     }};
+@@ -101,10 +99,9 @@ macro_rules! shuffle {
+       $l4:expr, $l5:expr, $l6:expr, $l7:expr]) => {{
+         #[allow(unused_unsafe)]
+         unsafe {
+-            $crate::Simd($crate::__shuffle_vector8(
++            $crate::Simd($crate::__shuffle_vector8::<{[$l0, $l1, $l2, $l3, $l4, $l5, $l6, $l7]}, _, _>(
+                 $vec0.0,
+                 $vec1.0,
+-                [$l0, $l1, $l2, $l3, $l4, $l5, $l6, $l7],
+             ))
+         }
+     }};
+@@ -115,13 +112,14 @@ macro_rules! shuffle {
+       $l12:expr, $l13:expr, $l14:expr, $l15:expr]) => {{
+         #[allow(unused_unsafe)]
+         unsafe {
+-            $crate::Simd($crate::__shuffle_vector16(
+-                $vec0.0,
+-                $vec1.0,
++            $crate::Simd($crate::__shuffle_vector16::<{
+                 [
+                     $l0, $l1, $l2, $l3, $l4, $l5, $l6, $l7, $l8, $l9, $l10,
+                     $l11, $l12, $l13, $l14, $l15,
+-                ],
++                ]
++            }, _, _>(
++                $vec0.0,
++                $vec1.0,
+             ))
+         }
+     }};
+@@ -136,15 +134,16 @@ macro_rules! shuffle {
+       $l28:expr, $l29:expr, $l30:expr, $l31:expr]) => {{
+         #[allow(unused_unsafe)]
+         unsafe {
+-            $crate::Simd($crate::__shuffle_vector32(
+-                $vec0.0,
+-                $vec1.0,
++            $crate::Simd($crate::__shuffle_vector32::<{
+                 [
+                     $l0, $l1, $l2, $l3, $l4, $l5, $l6, $l7, $l8, $l9, $l10,
+                     $l11, $l12, $l13, $l14, $l15, $l16, $l17, $l18, $l19,
+                     $l20, $l21, $l22, $l23, $l24, $l25, $l26, $l27, $l28,
+                     $l29, $l30, $l31,
+-                ],
++                ]
++            }, _, _>(
++                $vec0.0,
++                $vec1.0,
+             ))
+         }
+     }};
+@@ -167,18 +166,17 @@ macro_rules! shuffle {
+       $l60:expr, $l61:expr, $l62:expr, $l63:expr]) => {{
+         #[allow(unused_unsafe)]
+         unsafe {
+-            $crate::Simd($crate::__shuffle_vector64(
++            $crate::Simd($crate::__shuffle_vector64::<{[
++                $l0, $l1, $l2, $l3, $l4, $l5, $l6, $l7, $l8, $l9, $l10,
++                $l11, $l12, $l13, $l14, $l15, $l16, $l17, $l18, $l19,
++                $l20, $l21, $l22, $l23, $l24, $l25, $l26, $l27, $l28,
++                $l29, $l30, $l31, $l32, $l33, $l34, $l35, $l36, $l37,
++                $l38, $l39, $l40, $l41, $l42, $l43, $l44, $l45, $l46,
++                $l47, $l48, $l49, $l50, $l51, $l52, $l53, $l54, $l55,
++                $l56, $l57, $l58, $l59, $l60, $l61, $l62, $l63,
++            ]}, _, _>(
+                 $vec0.0,
+                 $vec1.0,
+-                [
+-                    $l0, $l1, $l2, $l3, $l4, $l5, $l6, $l7, $l8, $l9, $l10,
+-                    $l11, $l12, $l13, $l14, $l15, $l16, $l17, $l18, $l19,
+-                    $l20, $l21, $l22, $l23, $l24, $l25, $l26, $l27, $l28,
+-                    $l29, $l30, $l31, $l32, $l33, $l34, $l35, $l36, $l37,
+-                    $l38, $l39, $l40, $l41, $l42, $l43, $l44, $l45, $l46,
+-                    $l47, $l48, $l49, $l50, $l51, $l52, $l53, $l54, $l55,
+-                    $l56, $l57, $l58, $l59, $l60, $l61, $l62, $l63,
+-                ],
+             ))
+         }
+      }};
+diff --git a/third_party/rust/packed_simd/src/codegen/llvm.rs b/third_party/rust/packed_simd/src/codegen/llvm.rs
+index 93c6ce6b77..52b11a95b9 100644
+--- a/third_party/rust/packed_simd/src/codegen/llvm.rs
++++ b/third_party/rust/packed_simd/src/codegen/llvm.rs
+@@ -7,52 +7,73 @@ use crate::sealed::Simd;
+ 
+ // Shuffle intrinsics: expanded in users' crates, therefore public.
+ extern "platform-intrinsic" {
+-    // FIXME: Passing this intrinsics an `idx` array with an index that is
+-    // out-of-bounds will produce a monomorphization-time error.
+-    // https://github.com/rust-lang-nursery/packed_simd/issues/21
+-    #[rustc_args_required_const(2)]
+-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U
+-    where
+-        T: Simd,
+-        <T as Simd>::Element: Shuffle<[u32; 2], Output = U>;
+-
+-    #[rustc_args_required_const(2)]
+-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U
+-    where
+-        T: Simd,
+-        <T as Simd>::Element: Shuffle<[u32; 4], Output = U>;
+-
+-    #[rustc_args_required_const(2)]
+-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U
+-    where
+-        T: Simd,
+-        <T as Simd>::Element: Shuffle<[u32; 8], Output = U>;
+-
+-    #[rustc_args_required_const(2)]
+-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U
+-    where
+-        T: Simd,
+-        <T as Simd>::Element: Shuffle<[u32; 16], Output = U>;
+-
+-    #[rustc_args_required_const(2)]
+-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U
+-    where
+-        T: Simd,
+-        <T as Simd>::Element: Shuffle<[u32; 32], Output = U>;
+-
+-    #[rustc_args_required_const(2)]
+-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U
+-    where
+-        T: Simd,
+-        <T as Simd>::Element: Shuffle<[u32; 64], Output = U>;
++    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
++    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
++    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
++    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
++    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
++    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
+ }
+ 
+-pub use self::simd_shuffle16 as __shuffle_vector16;
+-pub use self::simd_shuffle2 as __shuffle_vector2;
+-pub use self::simd_shuffle32 as __shuffle_vector32;
+-pub use self::simd_shuffle4 as __shuffle_vector4;
+-pub use self::simd_shuffle64 as __shuffle_vector64;
+-pub use self::simd_shuffle8 as __shuffle_vector8;
++#[allow(clippy::missing_safety_doc)]
++#[inline]
++pub unsafe fn __shuffle_vector2<const IDX: [u32; 2], T, U>(x: T, y: T) -> U
++where
++    T: Simd,
++    <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
++{
++    simd_shuffle2(x, y, IDX)
++}
++
++#[allow(clippy::missing_safety_doc)]
++#[inline]
++pub unsafe fn __shuffle_vector4<const IDX: [u32; 4], T, U>(x: T, y: T) -> U
++where
++    T: Simd,
++    <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
++{
++    simd_shuffle4(x, y, IDX)
++}
++
++#[allow(clippy::missing_safety_doc)]
++#[inline]
++pub unsafe fn __shuffle_vector8<const IDX: [u32; 8], T, U>(x: T, y: T) -> U
++where
++    T: Simd,
++    <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
++{
++    simd_shuffle8(x, y, IDX)
++}
++
++#[allow(clippy::missing_safety_doc)]
++#[inline]
++pub unsafe fn __shuffle_vector16<const IDX: [u32; 16], T, U>(x: T, y: T) -> U
++where
++    T: Simd,
++    <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
++{
++    simd_shuffle16(x, y, IDX)
++}
++
++#[allow(clippy::missing_safety_doc)]
++#[inline]
++pub unsafe fn __shuffle_vector32<const IDX: [u32; 32], T, U>(x: T, y: T) -> U
++where
++    T: Simd,
++    <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
++{
++    simd_shuffle32(x, y, IDX)
++}
++
++#[allow(clippy::missing_safety_doc)]
++#[inline]
++pub unsafe fn __shuffle_vector64<const IDX: [u32; 64], T, U>(x: T, y: T) -> U
++where
++    T: Simd,
++    <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
++{
++    simd_shuffle64(x, y, IDX)
++}
+ 
+ extern "platform-intrinsic" {
+     crate fn simd_eq<T, U>(x: T, y: T) -> U;
+diff --git a/third_party/rust/packed_simd/src/lib.rs b/third_party/rust/packed_simd/src/lib.rs
+index b0b56d4d74..cccdb856b4 100644
+--- a/third_party/rust/packed_simd/src/lib.rs
++++ b/third_party/rust/packed_simd/src/lib.rs
+@@ -200,9 +200,9 @@
+ //!   preserving, etc.
+ 
+ #![feature(
++    const_generics,
+     repr_simd,
+     rustc_attrs,
+-    const_fn,
+     platform_intrinsics,
+     stdsimd,
+     aarch64_target_feature,
+@@ -217,6 +217,7 @@
+         // FIXME: these types are unsound in C FFI already
+         // See https://github.com/rust-lang/rust/issues/53346
+         improper_ctypes_definitions,
++        incomplete_features,
+         clippy::cast_possible_truncation,
+         clippy::cast_lossless,
+         clippy::cast_possible_wrap,
+@@ -227,6 +228,7 @@
+         // See https://github.com/rust-lang/rust-clippy/issues/3410
+         clippy::use_self,
+         clippy::wrong_self_convention,
++        clippy::from_over_into,
+ )]
+ #![cfg_attr(test, feature(hashmap_internals))]
+ #![deny(rust_2018_idioms, clippy::missing_inline_in_public_items)]
+-- 
+2.32.0
+
diff --git a/http/firefox/patches/0037-bmo-1712947-Don-t-pass-neon-flags-to-rustc-when-usin.patch b/http/firefox/patches/0037-bmo-1712947-Don-t-pass-neon-flags-to-rustc-when-usin.patch
deleted file mode 100644
index 510d717e4a..0000000000
--- a/http/firefox/patches/0037-bmo-1712947-Don-t-pass-neon-flags-to-rustc-when-usin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a7629ff76a565413a22699fdbd173af803f0f5fa Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Tue, 1 Jun 2021 09:35:57 +0200
-Subject: [PATCH 37/37] bmo#1712947: Don't pass neon flags to rustc when using
- thumbv7neon targets
-
-Bug: https://bugs.gentoo.org/792621
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- config/makefiles/rust.mk | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index e683f5ec7e..838716175a 100644
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -86,10 +86,13 @@ endif
- 
- rustflags_neon =
- ifeq (neon,$(MOZ_FPU))
--# Enable neon and disable restriction to 16 FPU registers
-+ifneq (,$(filter thumbv7neon-,$(RUST_TARGET)))
-+# Enable neon and disable restriction to 16 FPU registers when neon is enabled
-+# but we're not using a thumbv7neon target, where it's already the default.
- # (CPUs with neon have 32 FPU registers available)
- rustflags_neon += -C target_feature=+neon,-d16
- endif
-+endif
- 
- rustflags_sancov =
- ifdef LIBFUZZER
--- 
-2.31.1
-