http/firefox: version 96.0, SECURITY_PATCH++

36 files changed, 153 insertions, 205 deletions

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 6f66379443..de386aa088 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -35,7 +35,7 @@ depends  libwebp       "--with-system-webp"                      &&
 
 depends  nspr               "--with-system-nspr"                 &&
 
-local NSS_BRANCH="3.72"                                          &&
+local NSS_BRANCH="3.73"                                          &&
 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 dc5d54bacb..ac620c064e 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
-         VERSION=95.0.2
-  SECURITY_PATCH=156
+         VERSION=96.0
+  SECURITY_PATCH=157
           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 0dad9771aa..c8379638f2 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2022-01-11 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 96.0, SECURITY_PATCH++
+	* DEPENDS: nss >= 3.73
+	* patches/*: updated
+
 2021-12-20 Pavel Vinogradov <public@sourcemage.org>
 	* patches/*: updated, fixes building with wayland >= 1.20
 
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 992bd2e3ba..27c2fc3993 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 5afd7721b1433d1d354abd96e2fdc967fe34f8d7 Mon Sep 17 00:00:00 2001
+From db2794973f8a5e580fbceacbfb1b6469c9f162d7 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/32] Don't use build id
+Subject: [PATCH 01/30] 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 dcc78d3b16..c2633069e2 100644
+index 905494b784..15a7a2a852 100644
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in
 @@ -350,13 +350,6 @@ if test "$GNU_CC"; then
@@ -32,7 +32,7 @@ index dcc78d3b16..c2633069e2 100644
  fi
  
 diff --git a/old-configure.in b/old-configure.in
-index 9c8cdb462a..1707e98471 100644
+index d1479574d1..f69f5f5456 100644
 --- a/old-configure.in
 +++ b/old-configure.in
 @@ -337,13 +337,6 @@ if test "$GNU_CC"; then
diff --git a/http/firefox/patches/0002-Fortify-sources-properly.patch b/http/firefox/patches/0002-Fortify-sources-properly.patch
index 98e39faf27..3abe8b01ba 100644
--- a/http/firefox/patches/0002-Fortify-sources-properly.patch
+++ b/http/firefox/patches/0002-Fortify-sources-properly.patch
@@ -1,7 +1,7 @@
-From e9f2525adaa1958f048acee2bd873a5c3aaa0c5b Mon Sep 17 00:00:00 2001
+From a1395e97ffdbc9404a343b76fd731dc7ef385ffc 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/32] Fortify sources properly
+Subject: [PATCH 02/30] Fortify sources properly
 
 Ensure we fortify properly, features.h is pulled in via fortification.
 
@@ -12,7 +12,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  2 files changed, 4 deletions(-)
 
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 4e210b8f0f..e060fd2dcc 100644
+index a1b58eb59b..ae0c9d6d7c 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
 @@ -229,7 +229,6 @@ system_headers = [
diff --git a/http/firefox/patches/0003-Check-additional-plugins-dir.patch b/http/firefox/patches/0003-Check-additional-plugins-dir.patch
index c1f2b2c2c3..ef66d9b4f6 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 461b9a82277a8f610642bc1b40ba6d4f8870355b Mon Sep 17 00:00:00 2001
+From 4d5eb53fa2ca9eeeadbfcd2be832aa8e97d413fc 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/32] Check additional plugins dir
+Subject: [PATCH 03/30] Check additional plugins dir
 
 Check original plugins dir along with default plugins dir.
 
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 cd5edca2a1..abcf190300 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 7f2fec622a442d150368b762fbe632580281104e Mon Sep 17 00:00:00 2001
+From 61e8f03c526a40dda89b57aad6aec3f37d7125cd 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/32] bmo#847568: Support system harfbuzz
+Subject: [PATCH 04/30] bmo#847568: Support system harfbuzz
 
 Allow building against system-wide harfbuzz.
 
@@ -21,10 +21,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  10 files changed, 40 insertions(+), 1 deletion(-)
 
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index e060fd2dcc..7178ada497 100644
+index ae0c9d6d7c..44d08cf06b 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1236,6 +1236,13 @@ if CONFIG['OS_TARGET'] == 'Android':
+@@ -1237,6 +1237,13 @@ if CONFIG['OS_TARGET'] == 'Android':
          'vr/gvr/capi/include/gvr.h',
      ]
  
@@ -39,7 +39,7 @@ index e060fd2dcc..7178ada497 100644
      system_headers += [
          'jack/jack.h',
 diff --git a/dom/base/moz.build b/dom/base/moz.build
-index 1e9ee396b7..2e5f8c10f6 100644
+index d390adfc49..4508f19cb6 100644
 --- a/dom/base/moz.build
 +++ b/dom/base/moz.build
 @@ -567,6 +567,9 @@ FINAL_LIBRARY = "xul"
@@ -75,10 +75,10 @@ index 4d6d63da9d..8222b72333 100644
      "thebes",
      "ipc",
 diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
-index 7d6644f65e..ba37dc9f90 100755
+index 5e0fd17d79..860b80af4f 100755
 --- a/gfx/skia/generate_mozbuild.py
 +++ b/gfx/skia/generate_mozbuild.py
-@@ -97,6 +97,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
+@@ -96,6 +96,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
          '-Wno-unused-private-field',
      ]
  
@@ -89,10 +89,10 @@ index 7d6644f65e..ba37dc9f90 100755
      LOCAL_INCLUDES += [
          "/gfx/cairo/cairo/src",
 diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
-index 4ff948f567..6e920ff27f 100755
+index 524bd28dac..615c93b266 100755
 --- a/gfx/skia/moz.build
 +++ b/gfx/skia/moz.build
-@@ -489,6 +489,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
+@@ -488,6 +488,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
          '-Wno-unused-private-field',
      ]
  
@@ -131,10 +131,10 @@ index 301eb9a854..7cece5e06c 100644
  
  GeneratedFile(
 diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
-index 4e29fb6c7f..3adbe4ca9f 100644
+index f769e270fa..8f64710257 100644
 --- a/netwerk/dns/moz.build
 +++ b/netwerk/dns/moz.build
-@@ -107,6 +107,9 @@ LOCAL_INCLUDES += [
+@@ -109,4 +109,7 @@ LOCAL_INCLUDES += [
      "/netwerk/protocol/http",
  ]
  
@@ -142,8 +142,6 @@ index 4e29fb6c7f..3adbe4ca9f 100644
 +    CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 +
  USE_LIBS += ["icu"]
- 
- if CONFIG["CC_TYPE"] in ("clang", "gcc"):
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
 index 2c3f86948e..dd6901ba9a 100644
 --- a/toolkit/library/moz.build
@@ -159,7 +157,7 @@ index 2c3f86948e..dd6901ba9a 100644
      OS_LIBS += CONFIG["MOZ_JPEG_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index a78a32bdc0..73658c073e 100644
+index 00698656f6..1843188d11 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -460,6 +460,15 @@ add_old_configure_assignment(
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 feea1a98b0..74d9b24f19 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 c5230b3e0caf6fa208bab8f7fd4c30c7fe58a2c9 Mon Sep 17 00:00:00 2001
+From a7761d4886498eaa0e83d1c9b4399632cdbf314e 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/32] bmo#847568: Support system graphite2
+Subject: [PATCH 05/30] bmo#847568: Support system graphite2
 
 Allow building against system-wide graphite2.
 
@@ -20,10 +20,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  create mode 100644 gfx/graphite2/geckoextra/moz.build
 
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 7178ada497..4e3aef0f24 100644
+index 44d08cf06b..2f7ae39515 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1243,6 +1243,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+@@ -1244,6 +1244,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
  	'harfbuzz/hb.h',
      ]
  
@@ -134,7 +134,7 @@ index c51c36e2b4..4f02a9e2a5 100644
  if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
      CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 diff --git a/old-configure.in b/old-configure.in
-index 1707e98471..95098e4638 100644
+index f69f5f5456..1c1c8ecef3 100644
 --- a/old-configure.in
 +++ b/old-configure.in
 @@ -2204,6 +2204,27 @@ if test "$USE_FC_FREETYPE"; then
@@ -180,7 +180,7 @@ index dd6901ba9a..be73ac4bee 100644
      OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 73658c073e..77424c64c2 100644
+index 1843188d11..a68e1b347d 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -460,6 +460,19 @@ add_old_configure_assignment(
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 4b9deae7de..e89425812e 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 ae83763f3a4a21fb3d41d5e9fc4ea466fda2a7d4 Mon Sep 17 00:00:00 2001
+From 8a4627c0c910415b00bebeb976dc6ea8c3e0d5d0 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/32] bmo#1559213: Support system av1
+Subject: [PATCH 06/30] bmo#1559213: Support system av1
 
 Allow building against system-wide av1.
 
@@ -15,10 +15,10 @@ 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 6a2ed9e4a2..697bb9d0bf 100644
+index ab771212bf..75595d999c 100644
 --- a/config/external/moz.build
 +++ b/config/external/moz.build
-@@ -46,8 +46,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
+@@ -49,8 +49,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
      external_dirs += ["media/libvpx"]
  
  if CONFIG["MOZ_AV1"]:
@@ -31,10 +31,10 @@ index 6a2ed9e4a2..697bb9d0bf 100644
  if not CONFIG["MOZ_SYSTEM_PNG"]:
      external_dirs += ["media/libpng"]
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 4e3aef0f24..14bd336df4 100644
+index 2f7ae39515..96ab3a6466 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1300,6 +1300,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
+@@ -1301,6 +1301,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
          'proxy.h',
      ]
  
@@ -50,7 +50,7 @@ index 4e3aef0f24..14bd336df4 100644
      system_headers += [
          'vpx_mem/vpx_mem.h',
 diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build
-index 16ca8a9cbc..b349dcbe6d 100644
+index 8509aec6ef..7c5a1df63d 100644
 --- a/dom/media/platforms/moz.build
 +++ b/dom/media/platforms/moz.build
 @@ -78,6 +78,11 @@ if CONFIG["MOZ_AV1"]:
@@ -66,7 +66,7 @@ index 16ca8a9cbc..b349dcbe6d 100644
  if CONFIG["MOZ_OMX"]:
      EXPORTS += [
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 77424c64c2..60197e5456 100644
+index a68e1b347d..7b7975bd12 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -544,14 +544,29 @@ def av1(value):
diff --git a/http/firefox/patches/0007-Support-sndio-audio-framework.patch b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
index 259318c47e..f116a7afc9 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 7d80af5250a056be9f9c839c386c7a4029b87fff Mon Sep 17 00:00:00 2001
+From c6f2bf5c250fec953c853a941ad0d9d0606255b0 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/32] Support sndio audio framework
+Subject: [PATCH 07/30] Support sndio audio framework
 
 Bug: https://bugs.gentoo.org/785613
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -43,7 +43,7 @@ index 872484c311..28994a693d 100644
  
  if CONFIG['OS_TARGET'] == 'Darwin':
 diff --git a/old-configure.in b/old-configure.in
-index 95098e4638..f3b92b3695 100644
+index 1c1c8ecef3..b63dc03cc6 100644
 --- a/old-configure.in
 +++ b/old-configure.in
 @@ -2325,6 +2325,23 @@ fi
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 15b95b55b4..6b1cde0bb1 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 409a51cb5afd1b2fa1abc6953830b98ff3708263 Mon Sep 17 00:00:00 2001
+From e43f7431036904989cfd520f19de28a72be97ad9 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/32] bmo#878089: Don't fail when TERM is not set
+Subject: [PATCH 08/30] 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
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 6b1a3ac563..24333b2d4a 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 026eb522aab43f39b2c89a0dd8d450eb394ed77a Mon Sep 17 00:00:00 2001
+From 6eeeca1b673a60d3e51427b2a5cf3e916bdb012b 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/32] bmo#1516803: Fix building sandbox
+Subject: [PATCH 09/30] bmo#1516803: Fix building sandbox
 
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1516803
 Bug: https://bugs.gentoo.org/666580
@@ -11,7 +11,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
-index 0a3a14c96d..81c89bd947 100644
+index 573f667812..e62d1a99a4 100644
 --- a/security/sandbox/linux/moz.build
 +++ b/security/sandbox/linux/moz.build
 @@ -116,7 +116,7 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"):
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
deleted file mode 100644
index e2de1a1206..0000000000
--- a/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 49509912d5411e547c6eb56d06e141bc6205c081 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/32] 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>
----
- extensions/spellcheck/src/moz.build | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build
-index dcc1d54f74..06a2ad5a15 100644
---- a/extensions/spellcheck/src/moz.build
-+++ b/extensions/spellcheck/src/moz.build
-@@ -31,3 +31,8 @@ EXPORTS.mozilla += [
- 
- if CONFIG["CC_TYPE"] in ("clang", "gcc"):
-     CXXFLAGS += ["-Wno-error=shadow"]
-+
-+# spell checker triggers bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88561
-+# in GCC 7 and 8. It will be fixed in GCC 7.5 and 8.3
-+if CONFIG["CC_TYPE"] in ("gcc"):
-+    CXXFLAGS += ["-fno-devirtualize"]
--- 
-2.34.1
-
diff --git a/http/firefox/patches/0011-musl-Add-alternate-name-for-private-siginfo-struct-m.patch b/http/firefox/patches/0010-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
index f4f1bd785d..300846f461 100644
--- a/http/firefox/patches/0011-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
+++ b/http/firefox/patches/0010-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
@@ -1,7 +1,7 @@
-From 3f6da58bceab982f34554f24382db37eef176cfa Mon Sep 17 00:00:00 2001
+From d8ec0bd6f3b0ad2dfd8a97a864f08decaafdea69 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 8 Jan 2017 19:16:38 -0600
-Subject: [PATCH 11/32] musl: Add alternate name for private siginfo struct
+Subject: [PATCH 10/30] musl: Add alternate name for private siginfo struct
  member
 
 musl does not provide a macro for detecting its presence. For now,
diff --git a/http/firefox/patches/0012-musl-Fix-syscall-wrappers.patch b/http/firefox/patches/0011-musl-Fix-syscall-wrappers.patch
index dcf029cfd3..d9dda4991c 100644
--- a/http/firefox/patches/0012-musl-Fix-syscall-wrappers.patch
+++ b/http/firefox/patches/0011-musl-Fix-syscall-wrappers.patch
@@ -1,7 +1,7 @@
-From 89cf5ddec1c8e6311b1df36b3d42524106f83e22 Mon Sep 17 00:00:00 2001
+From 1b46c0fc085fe93c36320d7ac1004c83efccdccc Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 8 Jan 2017 19:19:23 -0600
-Subject: [PATCH 12/32] musl: Fix syscall wrappers
+Subject: [PATCH 11/30] 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,
diff --git a/http/firefox/patches/0013-musl-Only-use-system-heap-reporter-with-glibc.patch b/http/firefox/patches/0012-musl-Only-use-system-heap-reporter-with-glibc.patch
index d79b921739..08f02149a0 100644
--- a/http/firefox/patches/0013-musl-Only-use-system-heap-reporter-with-glibc.patch
+++ b/http/firefox/patches/0012-musl-Only-use-system-heap-reporter-with-glibc.patch
@@ -1,7 +1,7 @@
-From abe1d2ac2da8aa950c22e7afeaa8cb04fc267327 Mon Sep 17 00:00:00 2001
+From 68dd87a3dc06cf59396dccc3e031761f7237656e 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 13/32] musl: Only use system heap reporter with glibc
+Subject: [PATCH 12/30] musl: Only use system heap reporter with glibc
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
diff --git a/http/firefox/patches/0014-musl-Set-pthread-name-for-non-glibc-systems.patch b/http/firefox/patches/0013-musl-Set-pthread-name-for-non-glibc-systems.patch
index fb22ca5026..fe74bb1b11 100644
--- a/http/firefox/patches/0014-musl-Set-pthread-name-for-non-glibc-systems.patch
+++ b/http/firefox/patches/0013-musl-Set-pthread-name-for-non-glibc-systems.patch
@@ -1,7 +1,7 @@
-From 22643933640f8305b2b6321b7dabcb83f28ba7e7 Mon Sep 17 00:00:00 2001
+From 70d47d18420fe9e3de8f896c08f97ef2596c9c84 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 14/32] musl: Set pthread name for non glibc systems
+Subject: [PATCH 13/30] musl: Set pthread name for non glibc systems
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
diff --git a/http/firefox/patches/0015-musl-getcontext-is-only-avaliable-on-glibc-systems.patch b/http/firefox/patches/0014-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
index b8c24b3ec5..e9cf02e67f 100644
--- a/http/firefox/patches/0015-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
+++ b/http/firefox/patches/0014-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
@@ -1,7 +1,7 @@
-From ae527e3c05ff35b1781819d4ddcc9ba89141db2c Mon Sep 17 00:00:00 2001
+From 3283cc3981f99894dec1219fbf380489905827a9 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 15/32] musl: getcontext is only avaliable on glibc systems
+Subject: [PATCH 14/30] 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 a66043eeb8..fe0bd3c149 100644
+index d065387552..aaca9e81e4 100644
 --- a/tools/profiler/core/platform-linux-android.cpp
 +++ b/tools/profiler/core/platform-linux-android.cpp
-@@ -572,8 +572,10 @@ static void PlatformInit(PSLockRef aLock) {}
+@@ -603,8 +603,10 @@ static void PlatformInit(PSLockRef aLock) {}
  
  #if defined(HAVE_NATIVE_UNWIND)
  void Registers::SyncPopulate() {
diff --git a/http/firefox/patches/0015-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch b/http/firefox/patches/0015-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
new file mode 100644
index 0000000000..121c8cdc24
--- /dev/null
+++ b/http/firefox/patches/0015-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
@@ -0,0 +1,51 @@
+From beed745f96bbc18a3c22a728095c9a2eef7435ee 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 15/30] musl: sys/auvx.h avaliable on more then just glibc
+ systems
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ .../system_wrappers/source/cpu_features_linux.cc     | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc b/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
+index 335bed4da3..c2c98dae8a 100644
+--- a/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
++++ b/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
+@@ -12,13 +12,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#ifdef __GLIBC_PREREQ
+-#define WEBRTC_GLIBC_PREREQ(a, b) __GLIBC_PREREQ(a, b)
+-#else
+-#define WEBRTC_GLIBC_PREREQ(a, b) 0
+-#endif
+-
+-#if WEBRTC_GLIBC_PREREQ(2, 16)
++#if defined(__linux__)
+ #include <sys/auxv.h>
+ #else
+ #include <errno.h>
+@@ -40,7 +34,7 @@ uint64_t GetCPUFeaturesARM(void) {
+   int architecture = 0;
+   uint64_t hwcap = 0;
+   const char* platform = NULL;
+-#if WEBRTC_GLIBC_PREREQ(2, 16)
++#if defined(__linux__)
+   hwcap = getauxval(AT_HWCAP);
+   platform = (const char*)getauxval(AT_PLATFORM);
+ #else
+@@ -64,7 +58,7 @@ uint64_t GetCPUFeaturesARM(void) {
+     }
+     close(fd);
+   }
+-#endif  // WEBRTC_GLIBC_PREREQ(2, 16)
++#endif  // (__linux__)
+ #if defined(__aarch64__)
+   architecture = 8;
+   if ((hwcap & HWCAP_FP) != 0)
+-- 
+2.34.1
+
diff --git a/http/firefox/patches/0017-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch b/http/firefox/patches/0016-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
index 512d8d20b6..9de0db79ff 100644
--- a/http/firefox/patches/0017-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
+++ b/http/firefox/patches/0016-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
@@ -1,7 +1,7 @@
-From 33fffd37b81292f4f28f71b0ce73d5e14c64719c Mon Sep 17 00:00:00 2001
+From 6d36ed9e971861321bb381e25516500069314eb6 Mon Sep 17 00:00:00 2001
 From: Johannes <johannes.brechtmann@gmail.com>
 Date: Fri, 1 May 2020 17:20:29 +0200
-Subject: [PATCH 17/32] musl: make SYS_fork non-fatal, musl uses it for fork(2)
+Subject: [PATCH 16/30] 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 6b07186e8c..a4b69b08cf 100644
+index eb72d944c8..8ce22d6f65 100644
 --- a/security/sandbox/linux/SandboxFilter.cpp
 +++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -1506,6 +1506,10 @@ class ContentSandboxPolicy : public SandboxPolicyCommon {
+@@ -1537,6 +1537,10 @@ class ContentSandboxPolicy : public SandboxPolicyCommon {
          // usually do something reasonable on error.
        case __NR_clone:
          return ClonePolicy(Error(EPERM));
diff --git a/http/firefox/patches/0016-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch b/http/firefox/patches/0016-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
deleted file mode 100644
index 84642b8a38..0000000000
--- a/http/firefox/patches/0016-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 04dc6d6531cb200b6cdb92fab525dfb231376d56 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 16/32] musl: sys/auvx.h avaliable on more then just glibc
- systems
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- .../webrtc/system_wrappers/source/cpu_features_linux.c   | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c b/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c
-index 9c5645068a..05fea37ee0 100644
---- a/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c
-+++ b/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c
-@@ -11,10 +11,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <features.h>
--#ifndef __GLIBC_PREREQ
--#define __GLIBC_PREREQ(a, b) 0
--#endif
--#if __GLIBC_PREREQ(2, 16)
-+#if defined(__linux__)
- #include <sys/auxv.h>
- #else
- #include <fcntl.h>
-@@ -32,7 +29,7 @@ uint64_t WebRtc_GetCPUFeaturesARM(void) {
-   int architecture = 0;
-   unsigned long hwcap = 0;
-   const char* platform = NULL;
--#if __GLIBC_PREREQ(2, 16)
-+#if defined(__linux__)
-   hwcap = getauxval(AT_HWCAP);
-   platform = (const char*)getauxval(AT_PLATFORM);
- #else
-@@ -56,7 +53,7 @@ uint64_t WebRtc_GetCPUFeaturesARM(void) {
-     }
-     close(fd);
-   }
--#endif  // __GLIBC_PREREQ(2,16)
-+#endif  // (__linux__)
- #if defined(__aarch64__)
-   architecture = 8;
-   if ((hwcap & HWCAP_FP) != 0)
--- 
-2.34.1
-
diff --git a/http/firefox/patches/0018-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch b/http/firefox/patches/0017-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
index 46e9cff188..de7778009c 100644
--- a/http/firefox/patches/0018-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
+++ b/http/firefox/patches/0017-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
@@ -1,7 +1,7 @@
-From 183e4f90f968068b663857755142d79dc0963778 Mon Sep 17 00:00:00 2001
+From 08a7a0d7fa52e1bdacdcb47e847cf5ecd980ee6f Mon Sep 17 00:00:00 2001
 From: Rasmus Thomsen <oss@cogitri.dev>
 Date: Wed, 28 Oct 2020 17:50:24 +0100
-Subject: [PATCH 18/32] musl: include net/if.h before linux/if.h to avoid
+Subject: [PATCH 17/30] musl: include net/if.h before linux/if.h to avoid
  redefinition
 
 Bug: https://bugs.gentoo.org/751469
diff --git a/http/firefox/patches/0019-Make-PGO-use-toolchain.patch b/http/firefox/patches/0018-Make-PGO-use-toolchain.patch
index a115c9a684..3f72b05290 100644
--- a/http/firefox/patches/0019-Make-PGO-use-toolchain.patch
+++ b/http/firefox/patches/0018-Make-PGO-use-toolchain.patch
@@ -1,7 +1,7 @@
-From b0d84725cccf578dd1f614a264a29a8f3473a182 Mon Sep 17 00:00:00 2001
+From 45d43bb2dc1c1c033c860951c93261e98647f851 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:13:34 +0200
-Subject: [PATCH 19/32] Make PGO use toolchain
+Subject: [PATCH 18/30] Make PGO use toolchain
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
diff --git a/http/firefox/patches/0020-bmo-1516081-Disable-watchdog-during-PGO-builds.patch b/http/firefox/patches/0019-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
index 51f22211ca..70cf5c3c72 100644
--- a/http/firefox/patches/0020-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
+++ b/http/firefox/patches/0019-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
@@ -1,7 +1,7 @@
-From 4e0bae4eb9f51834b7010d1ab91844695fb2528c Mon Sep 17 00:00:00 2001
+From 2502829abc1a02a08cc1934538c3d30e6f4f6fae Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:27:06 +0200
-Subject: [PATCH 20/32] bmo#1516081: Disable watchdog during PGO builds
+Subject: [PATCH 19/30] 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>
diff --git a/http/firefox/patches/0021-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch b/http/firefox/patches/0020-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
index b68ba5ddc1..ef8f9b2e69 100644
--- a/http/firefox/patches/0021-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
+++ b/http/firefox/patches/0020-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
@@ -1,7 +1,7 @@
-From 8e8b47da9ac6f33ac35ca07e5e76f22720b96865 Mon Sep 17 00:00:00 2001
+From 0501ed4bbdbf8d16a69a4460d2ada33ac259365d Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Wed, 15 Apr 2020 00:27:25 +0200
-Subject: [PATCH 21/32] bmo#1516803: force one LTO partition for sandbox when
+Subject: [PATCH 20/30] bmo#1516803: force one LTO partition for sandbox when
  using GCC
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -10,7 +10,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
-index 81c89bd947..a5b76067a7 100644
+index e62d1a99a4..913b9ba2ce 100644
 --- a/security/sandbox/linux/moz.build
 +++ b/security/sandbox/linux/moz.build
 @@ -114,9 +114,10 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"):
diff --git a/http/firefox/patches/0022-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch b/http/firefox/patches/0021-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
index 3d13a1a562..7ccfecade2 100644
--- a/http/firefox/patches/0022-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
+++ b/http/firefox/patches/0021-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
@@ -1,7 +1,7 @@
-From a999c252cfc8195e01c566523335a7b6433019cf Mon Sep 17 00:00:00 2001
+From 4aa13b6df03765bd648583d533f584564c7f8537 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:47:13 +0200
-Subject: [PATCH 22/32] bmo#1196777: Set GDK_FOCUS_CHANGE_MASK
+Subject: [PATCH 21/30] 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,7 +10,7 @@ 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 620e2f47f2..0f6b701441 100644
+index 0abded9175..486c2dda6d 100644
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
 @@ -161,7 +161,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTURE_MASK | GDK_EXPOSURE_MASK |
diff --git a/http/firefox/patches/0023-Fix-building-with-PGO-when-using-GCC.patch b/http/firefox/patches/0022-Fix-building-with-PGO-when-using-GCC.patch
index 61a585f472..81de54b8f2 100644
--- a/http/firefox/patches/0023-Fix-building-with-PGO-when-using-GCC.patch
+++ b/http/firefox/patches/0022-Fix-building-with-PGO-when-using-GCC.patch
@@ -1,7 +1,7 @@
-From 2d23d70e94cefb707cb77ec931d48e4a8aa8954b Mon Sep 17 00:00:00 2001
+From 98e1e605c8fdf7b021d6f1888ce6baed5c1097b5 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 2 Jul 2020 18:05:03 +0200
-Subject: [PATCH 23/32] Fix building with PGO when using GCC
+Subject: [PATCH 22/30] Fix building with PGO when using GCC
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
diff --git a/http/firefox/patches/0024-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch b/http/firefox/patches/0023-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
index 14728c5e5c..85c305f07f 100644
--- a/http/firefox/patches/0024-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
+++ b/http/firefox/patches/0023-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
@@ -1,7 +1,7 @@
-From 152aa9e23736fd99647e0b61f627e9a3d40fed56 Mon Sep 17 00:00:00 2001
+From 6e220b49aee7dbdcafd255f6260517c5c551f9b1 Mon Sep 17 00:00:00 2001
 From: Mike Hommey <mh@glandium.org>
 Date: Mon, 26 Nov 2018 09:59:56 +0900
-Subject: [PATCH 24/32] libaom: Use NEON_FLAGS instead of VPX_ASFLAGS for
+Subject: [PATCH 23/30] libaom: Use NEON_FLAGS instead of VPX_ASFLAGS for
  libaom neon code
 
 Bug: https://bugs.gentoo.org/730606
diff --git a/http/firefox/patches/0025-build-Disable-Werror.patch b/http/firefox/patches/0024-build-Disable-Werror.patch
index 1ded1bcad2..f45ecb889d 100644
--- a/http/firefox/patches/0025-build-Disable-Werror.patch
+++ b/http/firefox/patches/0024-build-Disable-Werror.patch
@@ -1,7 +1,7 @@
-From 98672d8bbca50efacbdd35285be336b27f24fa95 Mon Sep 17 00:00:00 2001
+From abc720ed6f0451e3f1c5ff9ae074ae02684306f7 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Sat, 29 Aug 2020 22:06:15 +0200
-Subject: [PATCH 25/32] build: Disable -Werror
+Subject: [PATCH 24/30] 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 dcb353859f..8a25b43201 100755
+index 0d925a9b80..2ac91626c4 100755
 --- a/build/moz.configure/warnings.configure
 +++ b/build/moz.configure/warnings.configure
-@@ -212,7 +212,8 @@ with only_when(depends(target)(lambda t: t.kernel == "WINNT")):
+@@ -216,7 +216,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.
diff --git a/http/firefox/patches/0026-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch b/http/firefox/patches/0025-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
index 1259d790fc..32bd0eb897 100644
--- a/http/firefox/patches/0026-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
+++ b/http/firefox/patches/0025-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
@@ -1,7 +1,7 @@
-From f8bcf72a3fdb62f27f23d7bcbd1253f82ff027e1 Mon Sep 17 00:00:00 2001
+From 685e82ac82921720c6cd9c6c45703ff034f081e7 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Sat, 29 Aug 2020 22:30:59 +0200
-Subject: [PATCH 26/32] LTO: Only enable LTO for Rust when complete build uses
+Subject: [PATCH 25/30] 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 abd2181858..bb6b58db85 100644
+index 75570d32b9..924722a506 100644
 --- a/config/makefiles/rust.mk
 +++ b/config/makefiles/rust.mk
 @@ -87,6 +87,7 @@ endif
@@ -21,7 +21,7 @@ index abd2181858..bb6b58db85 100644
  ifndef DEVELOPER_OPTIONS
  ifndef MOZ_DEBUG_RUST
  # Enable link-time optimization for release builds, but not when linking
-@@ -103,6 +104,7 @@ endif
+@@ -106,6 +107,7 @@ endif
  endif
  endif
  endif
diff --git a/http/firefox/patches/0027-Make-elfhack-use-toolchain.patch b/http/firefox/patches/0026-Make-elfhack-use-toolchain.patch
index b10df9d023..c4e908080e 100644
--- a/http/firefox/patches/0027-Make-elfhack-use-toolchain.patch
+++ b/http/firefox/patches/0026-Make-elfhack-use-toolchain.patch
@@ -1,7 +1,7 @@
-From acd924914e8a6c23ed377f036f80346160b94adf Mon Sep 17 00:00:00 2001
+From cc2320222520ceda6578b476b6696aba29f250ac Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 28 Sep 2020 20:52:24 +0200
-Subject: [PATCH 27/32] Make elfhack use toolchain
+Subject: [PATCH 26/30] Make elfhack use toolchain
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in
-index 08cc3d6852..c2b575d87a 100644
+index 57ad54f113..ec991fa648 100644
 --- a/build/unix/elfhack/Makefile.in
 +++ b/build/unix/elfhack/Makefile.in
 @@ -20,7 +20,7 @@ test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX): %$(DLL_SUFFIX): %.$(OBJ_SUFFIX)
diff --git a/http/firefox/patches/0028-Disable-FFVPX-with-VA-API.patch b/http/firefox/patches/0027-Disable-FFVPX-with-VA-API.patch
index c6e839ad8f..42d639f84f 100644
--- a/http/firefox/patches/0028-Disable-FFVPX-with-VA-API.patch
+++ b/http/firefox/patches/0027-Disable-FFVPX-with-VA-API.patch
@@ -1,7 +1,7 @@
-From 1e48a24951577ea59ffcfef6aa3b51961b844053 Mon Sep 17 00:00:00 2001
+From 38068d0801ad85ba36673ab2ad6a53e0fd3ffdde Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:22:48 +0200
-Subject: [PATCH 28/32] Disable FFVPX with VA-API
+Subject: [PATCH 27/30] Disable FFVPX with VA-API
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
diff --git a/http/firefox/patches/0029-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch b/http/firefox/patches/0028-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
index 0375e2cbe0..2c6a271219 100644
--- a/http/firefox/patches/0029-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
+++ b/http/firefox/patches/0028-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
@@ -1,7 +1,7 @@
-From 9c7d7aa616c4f29c0c5e907d6c0b27ee926d6762 Mon Sep 17 00:00:00 2001
+From 58b0385412c6d96eb745e2fc5902df347e629f6d Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:48:06 +0200
-Subject: [PATCH 29/32] Enable FLAC on platforms without ffvpx via ffmpeg
+Subject: [PATCH 28/30] Enable FLAC on platforms without ffvpx via ffmpeg
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
diff --git a/http/firefox/patches/0030-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch b/http/firefox/patches/0029-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
index 5163cd021a..856361df3a 100644
--- a/http/firefox/patches/0030-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
+++ b/http/firefox/patches/0029-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
@@ -1,7 +1,7 @@
-From 461f5af7e1362eac4c751d40c3788d32c2a43572 Mon Sep 17 00:00:00 2001
+From 0b53fcfa8ee76ccc2d77abb947810f631efaecd9 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Fri, 11 Dec 2020 15:37:38 +0100
-Subject: [PATCH 30/32] bmo#1670333: OpenH264: Fix decoding if it starts on non
+Subject: [PATCH 29/30] bmo#1670333: OpenH264: Fix decoding if it starts on non
  IDR I-frame
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
diff --git a/http/firefox/patches/0031-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch b/http/firefox/patches/0030-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
index acdacfba6e..130edc41a1 100644
--- a/http/firefox/patches/0031-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
+++ b/http/firefox/patches/0030-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
@@ -1,7 +1,7 @@
-From b572aa129f6868cb0ffa29a8b1b3c6a6ac54013a Mon Sep 17 00:00:00 2001
+From 2da8000880fe27908f1b18aba65a1b5e5f479cd8 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Fri, 11 Dec 2020 15:46:25 +0100
-Subject: [PATCH 31/32] bmo#1663844: OpenH264: Allow using OpenH264 GMP decoder
+Subject: [PATCH 30/30] bmo#1663844: OpenH264: Allow using OpenH264 GMP decoder
  as fallback for video decoding
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
diff --git a/http/firefox/patches/0032-bmo-1745560-Fix-building-against-wayland-1.20.patch b/http/firefox/patches/0032-bmo-1745560-Fix-building-against-wayland-1.20.patch
deleted file mode 100644
index 30e6fc38da..0000000000
--- a/http/firefox/patches/0032-bmo-1745560-Fix-building-against-wayland-1.20.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a7c21dbcda513060e0d69a8bc682c48eb043730f Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sun, 12 Dec 2021 02:16:02 +0100
-Subject: [PATCH 32/32] bmo#1745560: Fix building against >=wayland-1.20
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- widget/gtk/mozwayland/mozwayland.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
-index 7a448e6321..b997c59d78 100644
---- a/widget/gtk/mozwayland/mozwayland.c
-+++ b/widget/gtk/mozwayland/mozwayland.c
-@@ -40,6 +40,13 @@ MOZ_EXPORT void wl_event_queue_destroy(struct wl_event_queue* queue) {}
- 
- MOZ_EXPORT void wl_proxy_marshal(struct wl_proxy* p, uint32_t opcode, ...) {}
- 
-+MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
-+    struct wl_proxy* proxy, uint32_t opcode,
-+    const struct wl_interface* interface, uint32_t version, uint32_t flags,
-+    ...) {
-+  return NULL;
-+}
-+
- MOZ_EXPORT void wl_proxy_marshal_array(struct wl_proxy* p, uint32_t opcode,
-                                        union wl_argument* args) {}
- 
--- 
-2.34.1
-