http/firefox: version 94.0.1

34 files changed, 136 insertions, 172 deletions

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 529268100d..4d4dca65cd 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,5 +1,5 @@
            SPELL=firefox
-         VERSION=94.0
+         VERSION=94.0.1
   SECURITY_PATCH=155
           SOURCE="${SPELL}-${VERSION}.source.tar.xz"
    SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 8d55ad82ee..5f34eb6ec1 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2021-11-04 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 94.0.1
+	* patches/*: updated
+
 2021-11-02 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: version 94.0, SECURITY_PATCH++
 	* DEPENDS: nss >= 3.71
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 4db4100cc4..31a46709da 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 bda4c82b1f2e0015071edcc0dc3c0a10cfce0b86 Mon Sep 17 00:00:00 2001
+From a65ad7b4b488c9e5582048d76af70860b2a271ec 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/33] Don't use build id
+Subject: [PATCH 01/32] 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 e96ea982ed..8bfcc8aff3 100644
+index dcc78d3b16..c2633069e2 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 e96ea982ed..8bfcc8aff3 100644
  fi
  
 diff --git a/old-configure.in b/old-configure.in
-index 8f8ae6eb07..78c358a3b1 100644
+index 9c8cdb462a..1707e98471 100644
 --- a/old-configure.in
 +++ b/old-configure.in
 @@ -337,13 +337,6 @@ if test "$GNU_CC"; then
@@ -50,5 +50,5 @@ index 8f8ae6eb07..78c358a3b1 100644
      HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=
      _SAVE_LDFLAGS=$LDFLAGS
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0002-Fortify-sources-properly.patch b/http/firefox/patches/0002-Fortify-sources-properly.patch
index b46edb28a9..c7a51199d4 100644
--- a/http/firefox/patches/0002-Fortify-sources-properly.patch
+++ b/http/firefox/patches/0002-Fortify-sources-properly.patch
@@ -1,7 +1,7 @@
-From 1ce983808bbbfca3b8d1854d22b185674f24e861 Mon Sep 17 00:00:00 2001
+From 854be08b4f846169916d4064fd65f9cbb0f76570 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/33] Fortify sources properly
+Subject: [PATCH 02/32] 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 e8953cf55b..9018d3e580 100644
+index 4e210b8f0f..e060fd2dcc 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
 @@ -229,7 +229,6 @@ system_headers = [
@@ -37,5 +37,5 @@ index 16c9b33329..df38d9336c 100644
  
  #endif /* _SDP_OS_DEFS_H_ */
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0003-Check-additional-plugins-dir.patch b/http/firefox/patches/0003-Check-additional-plugins-dir.patch
index a594b528f1..47611e43b6 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 38e3e077b98644434ca6fc5ff346238822a704ee Mon Sep 17 00:00:00 2001
+From c073b9862be61fb1e897292a746d8c9d7ee37354 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/33] Check additional plugins dir
+Subject: [PATCH 03/32] 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.33.0
+2.33.1
 
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 e4e522f9cb..53849db3a8 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 8974ebbb7dc3edac809aeb24c8109dd19055659e Mon Sep 17 00:00:00 2001
+From 6371b00577970f715fec174eacb32c74a6946f68 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/33] bmo#847568: Support system harfbuzz
+Subject: [PATCH 04/32] 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 9018d3e580..a2977231ee 100644
+index e060fd2dcc..7178ada497 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1235,6 +1235,13 @@ if CONFIG['OS_TARGET'] == 'Android':
+@@ -1236,6 +1236,13 @@ if CONFIG['OS_TARGET'] == 'Android':
          'vr/gvr/capi/include/gvr.h',
      ]
  
@@ -39,10 +39,10 @@ index 9018d3e580..a2977231ee 100644
      system_headers += [
          'jack/jack.h',
 diff --git a/dom/base/moz.build b/dom/base/moz.build
-index f56e666a01..a93198fed9 100644
+index 145f20810f..49453e0d56 100644
 --- a/dom/base/moz.build
 +++ b/dom/base/moz.build
-@@ -561,6 +561,9 @@ FINAL_LIBRARY = "xul"
+@@ -562,6 +562,9 @@ FINAL_LIBRARY = "xul"
  if CONFIG["MOZ_X11"]:
      CXXFLAGS += CONFIG["TK_CFLAGS"]
  
@@ -145,10 +145,10 @@ index 8de4f64777..18ddb4e0b2 100644
  
  if CONFIG["CC_TYPE"] in ("clang", "gcc"):
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
-index 5e2d8cb4cd..4b7194e9e2 100644
+index 2c3f86948e..dd6901ba9a 100644
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -242,6 +242,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+@@ -260,6 +260,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
          "-lgvr",
      ]
  
@@ -159,7 +159,7 @@ index 5e2d8cb4cd..4b7194e9e2 100644
      OS_LIBS += CONFIG["MOZ_JPEG_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 56dd7bd195..542636bc22 100644
+index f63780b892..fb1c48abc3 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -460,6 +460,15 @@ add_old_configure_assignment(
@@ -179,5 +179,5 @@ index 56dd7bd195..542636bc22 100644
  # ==============================================================
  @depends(toolkit)
 -- 
-2.33.0
+2.33.1
 
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 a3c6e9897b..f3da4786dc 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 f1b68439b2b6cb4bdc10bcec99dea27c50600ec7 Mon Sep 17 00:00:00 2001
+From 5d03cddd1c0d8eb7acef44ff7272176d33e6be51 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/33] bmo#847568: Support system graphite2
+Subject: [PATCH 05/32] 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 a2977231ee..e97a65307f 100644
+index 7178ada497..4e3aef0f24 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1242,6 +1242,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+@@ -1243,6 +1243,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
  	'harfbuzz/hb.h',
      ]
  
@@ -134,10 +134,10 @@ index 4bb25233e7..a2dd99ceb4 100644
  if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
      CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 diff --git a/old-configure.in b/old-configure.in
-index 78c358a3b1..2a9b8ad1d7 100644
+index 1707e98471..95098e4638 100644
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -2205,6 +2205,27 @@ if test "$USE_FC_FREETYPE"; then
+@@ -2204,6 +2204,27 @@ if test "$USE_FC_FREETYPE"; then
      fi
  fi
  
@@ -166,10 +166,10 @@ index 78c358a3b1..2a9b8ad1d7 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 4b7194e9e2..077f3f2556 100644
+index dd6901ba9a..be73ac4bee 100644
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -242,6 +242,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+@@ -260,6 +260,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
          "-lgvr",
      ]
  
@@ -180,7 +180,7 @@ index 4b7194e9e2..077f3f2556 100644
      OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 542636bc22..965335e47d 100644
+index fb1c48abc3..d98e748bb9 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -460,6 +460,19 @@ add_old_configure_assignment(
@@ -204,5 +204,5 @@ index 542636bc22..965335e47d 100644
  # ==============================================================
  option('--with-system-harfbuzz', help="Use system harfbuzz (located with pkgconfig)")
 -- 
-2.33.0
+2.33.1
 
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 6673a3f9df..5beea65b62 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 110ce41a5cc536e9b28b8111a8b5d651ae798956 Mon Sep 17 00:00:00 2001
+From 34a104c3cc36d9a4297a51d7b1cf7195c8c28a1d 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/33] bmo#1559213: Support system av1
+Subject: [PATCH 06/32] bmo#1559213: Support system av1
 
 Allow building against system-wide 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 e97a65307f..ca0e6a0ad8 100644
+index 4e3aef0f24..14bd336df4 100644
 --- a/config/system-headers.mozbuild
 +++ b/config/system-headers.mozbuild
-@@ -1299,6 +1299,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
+@@ -1300,6 +1300,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
          'proxy.h',
      ]
  
@@ -66,7 +66,7 @@ index 16ca8a9cbc..b349dcbe6d 100644
  if CONFIG["MOZ_OMX"]:
      EXPORTS += [
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 965335e47d..b901b7cf75 100644
+index d98e748bb9..1e704a4765 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -544,14 +544,29 @@ def av1(value):
@@ -110,5 +110,5 @@ index 965335e47d..b901b7cf75 100644
  # JXL Image Codec Support
  # ==============================================================
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0007-Support-sndio-audio-framework.patch b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
index 36dea83475..197e60a202 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 715565594ac0572f86a84a900e07516a2971a707 Mon Sep 17 00:00:00 2001
+From a22ef7c7b78058d48f07a78e2ee97dc81c71ddd8 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/33] Support sndio audio framework
+Subject: [PATCH 07/32] 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 2a9b8ad1d7..f32f321842 100644
+index 95098e4638..f3b92b3695 100644
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -2326,6 +2326,23 @@ fi
+@@ -2325,6 +2325,23 @@ fi
  AC_SUBST(NECKO_WIFI)
  AC_SUBST(NECKO_WIFI_DBUS)
  
@@ -71,5 +71,5 @@ index 2a9b8ad1d7..f32f321842 100644
  dnl =
  dnl = Maintainer debug option (no --enable equivalent)
 -- 
-2.33.0
+2.33.1
 
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 6ec12db438..1140916fbe 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 1a143898aa9d158d69ac8e1217c37cf5aa7a698e Mon Sep 17 00:00:00 2001
+From 915273302b3e749678fce68f3ec4be34a806c5d5 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/33] bmo#878089: Don't fail when TERM is not set
+Subject: [PATCH 08/32] 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.33.0
+2.33.1
 
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 682b9062bc..6799b985de 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 f14769c19e6a48cfe96333afcc10db5e7b2bfcde Mon Sep 17 00:00:00 2001
+From c56a65360a1c42c7f0276e4cf36c9d9f33a3f716 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/33] bmo#1516803: Fix building sandbox
+Subject: [PATCH 09/32] 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 0a3a14c96d..81c89bd947 100644
  DEFINES["NS_NO_XPCOM"] = True
  DisableStlWrapping()
 -- 
-2.33.0
+2.33.1
 
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 08a18a1a24..12615d1510 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 269a1b5f3a2c4c729590329de09d4f9e0bf0ba4b Mon Sep 17 00:00:00 2001
+From ddda554a91933277152f4e5c5931b78db820d0ba 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/33] Fix building spellchecker when using GCC and PGO
+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>
@@ -23,5 +23,5 @@ index dcc1d54f74..06a2ad5a15 100644
 +if CONFIG["CC_TYPE"] in ("gcc"):
 +    CXXFLAGS += ["-fno-devirtualize"]
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0012-musl-Add-alternate-name-for-private-siginfo-struct-m.patch b/http/firefox/patches/0012-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
index af2d9564f7..9a0132590f 100644
--- a/http/firefox/patches/0012-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
+++ b/http/firefox/patches/0012-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
@@ -1,7 +1,7 @@
-From 7138322ad8f9514fce92af7b62c726c593cc4279 Mon Sep 17 00:00:00 2001
+From 58c047eee19d7bb652b44f3bcf00fd90b9d9dddc Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 8 Jan 2017 19:16:38 -0600
-Subject: [PATCH 12/33] musl: Add alternate name for private siginfo struct
+Subject: [PATCH 12/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0013-musl-Fix-syscall-wrappers.patch b/http/firefox/patches/0013-musl-Fix-syscall-wrappers.patch
index 4584e52675..512b41e940 100644
--- a/http/firefox/patches/0013-musl-Fix-syscall-wrappers.patch
+++ b/http/firefox/patches/0013-musl-Fix-syscall-wrappers.patch
@@ -1,7 +1,7 @@
-From 084d44eafba98636065c8159d2521e7763482fc5 Mon Sep 17 00:00:00 2001
+From acb6fb4a0105f01455629e448dbec9a32913b84e Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 8 Jan 2017 19:19:23 -0600
-Subject: [PATCH 13/33] musl: Fix syscall wrappers
+Subject: [PATCH 13/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0014-musl-Only-use-system-heap-reporter-with-glibc.patch b/http/firefox/patches/0014-musl-Only-use-system-heap-reporter-with-glibc.patch
index 95d272f51e..39f5c677cc 100644
--- a/http/firefox/patches/0014-musl-Only-use-system-heap-reporter-with-glibc.patch
+++ b/http/firefox/patches/0014-musl-Only-use-system-heap-reporter-with-glibc.patch
@@ -1,7 +1,7 @@
-From 8b3547892461992d6594ca3779e67c03e48d540e Mon Sep 17 00:00:00 2001
+From f3eb4ca6beeb6afe0b16593cbde67c32b3654686 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 14/33] musl: Only use system heap reporter with glibc
+Subject: [PATCH 14/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0015-musl-Set-pthread-name-for-non-glibc-systems.patch b/http/firefox/patches/0015-musl-Set-pthread-name-for-non-glibc-systems.patch
index 8d3d6aa113..19ac361be3 100644
--- a/http/firefox/patches/0015-musl-Set-pthread-name-for-non-glibc-systems.patch
+++ b/http/firefox/patches/0015-musl-Set-pthread-name-for-non-glibc-systems.patch
@@ -1,7 +1,7 @@
-From 36e7da9f598293bed4bd8cfc42886184861e8aba Mon Sep 17 00:00:00 2001
+From 3cab58ac693ba976ba9c5afdee9c345e4af3a5f2 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 15/33] musl: Set pthread name for non glibc systems
+Subject: [PATCH 15/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0016-musl-getcontext-is-only-avaliable-on-glibc-systems.patch b/http/firefox/patches/0016-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
index 10d669c952..a4a678bcc7 100644
--- a/http/firefox/patches/0016-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
+++ b/http/firefox/patches/0016-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
@@ -1,7 +1,7 @@
-From e53751589052c28c0b7a985a58267fcc04fbe52f Mon Sep 17 00:00:00 2001
+From 3091ac0a99f8ad59d6baf1a00e4754688e4598f4 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 16/33] musl: getcontext is only avaliable on glibc systems
+Subject: [PATCH 16/32] 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 9c7d727a49..36106ead7b 100644
+index a66043eeb8..fe0bd3c149 100644
 --- a/tools/profiler/core/platform-linux-android.cpp
 +++ b/tools/profiler/core/platform-linux-android.cpp
-@@ -570,8 +570,10 @@ static void PlatformInit(PSLockRef aLock) {}
+@@ -572,8 +572,10 @@ static void PlatformInit(PSLockRef aLock) {}
  
  #if defined(HAVE_NATIVE_UNWIND)
  void Registers::SyncPopulate() {
@@ -24,5 +24,5 @@ index 9c7d727a49..36106ead7b 100644
  }
  #endif
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0017-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch b/http/firefox/patches/0017-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
index b75127efb8..5edc670578 100644
--- a/http/firefox/patches/0017-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
+++ b/http/firefox/patches/0017-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
@@ -1,7 +1,7 @@
-From 4aa8cbeb5e8d02b109314861f1dd2b3e44f49b64 Mon Sep 17 00:00:00 2001
+From ea275741215702a199c73b6468535112638221c6 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 17/33] musl: sys/auvx.h avaliable on more then just glibc
+Subject: [PATCH 17/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0018-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch b/http/firefox/patches/0018-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
index 79a6ba8d36..ac8590407a 100644
--- a/http/firefox/patches/0018-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
+++ b/http/firefox/patches/0018-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
@@ -1,7 +1,7 @@
-From 9f0b152a5c4d5de3360c3d62e5082c57b9bd488f Mon Sep 17 00:00:00 2001
+From 9ac6801a837ab148171b3363ab3a29e3b565ffd3 Mon Sep 17 00:00:00 2001
 From: Johannes <johannes.brechtmann@gmail.com>
 Date: Fri, 1 May 2020 17:20:29 +0200
-Subject: [PATCH 18/33] musl: make SYS_fork non-fatal, musl uses it for fork(2)
+Subject: [PATCH 18/32] musl: make SYS_fork non-fatal, musl uses it for fork(2)
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -24,5 +24,5 @@ index 6b07186e8c..a4b69b08cf 100644
        case __NR_clone3:
          return Error(ENOSYS);
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0019-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch b/http/firefox/patches/0019-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
index 5ec2ba943e..4ad070c0dc 100644
--- a/http/firefox/patches/0019-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
+++ b/http/firefox/patches/0019-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
@@ -1,7 +1,7 @@
-From 0a01f365aebf83cb2db9a1dbe38090d50f7ea616 Mon Sep 17 00:00:00 2001
+From 70bcdf33735944eb3d2e18e95128f9589355adec Mon Sep 17 00:00:00 2001
 From: Rasmus Thomsen <oss@cogitri.dev>
 Date: Wed, 28 Oct 2020 17:50:24 +0100
-Subject: [PATCH 19/33] musl: include net/if.h before linux/if.h to avoid
+Subject: [PATCH 19/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0020-Make-PGO-use-toolchain.patch b/http/firefox/patches/0020-Make-PGO-use-toolchain.patch
index d817d437c3..e78c30dbed 100644
--- a/http/firefox/patches/0020-Make-PGO-use-toolchain.patch
+++ b/http/firefox/patches/0020-Make-PGO-use-toolchain.patch
@@ -1,7 +1,7 @@
-From 125dfceb283e3c07f006cbfdd2b865fb7e337bbd Mon Sep 17 00:00:00 2001
+From bb0d0a304ff3b88ab43209cca723a1fa03904aad Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:13:34 +0200
-Subject: [PATCH 20/33] Make PGO use toolchain
+Subject: [PATCH 20/32] Make PGO use toolchain
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -29,5 +29,5 @@ index 9ca9c97fce..9f86fe0940 100644
      # package.
      mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0021-bmo-1516081-Disable-watchdog-during-PGO-builds.patch b/http/firefox/patches/0021-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
index b1229e0c59..ff71052291 100644
--- a/http/firefox/patches/0021-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
+++ b/http/firefox/patches/0021-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
@@ -1,7 +1,7 @@
-From 83bc7e71e3aaabbe16ae784d01192a16c7f78db9 Mon Sep 17 00:00:00 2001
+From 3ee6407285485040421e55990e604313d3bfeeca Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:27:06 +0200
-Subject: [PATCH 21/33] bmo#1516081: Disable watchdog during PGO builds
+Subject: [PATCH 21/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch b/http/firefox/patches/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
index c1e34a19a1..5865586412 100644
--- a/http/firefox/patches/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
+++ b/http/firefox/patches/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
@@ -1,7 +1,7 @@
-From 23dddf9a0c0bfaa3703109b927cf0e66865778b5 Mon Sep 17 00:00:00 2001
+From 0539ac3b5a6574e8ba3a27b62681c0a49d89edcb Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Wed, 15 Apr 2020 00:27:25 +0200
-Subject: [PATCH 22/33] bmo#1516803: force one LTO partition for sandbox when
+Subject: [PATCH 22/32] bmo#1516803: force one LTO partition for sandbox when
  using GCC
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -28,5 +28,5 @@ index 81c89bd947..a5b76067a7 100644
  DEFINES["NS_NO_XPCOM"] = True
  DisableStlWrapping()
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0023-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch b/http/firefox/patches/0023-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
index 70d72af8c8..fe9a0001fa 100644
--- a/http/firefox/patches/0023-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
+++ b/http/firefox/patches/0023-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
@@ -1,7 +1,7 @@
-From 96529fd6004f0f793dca4b35e1449b8aec3fc3f7 Mon Sep 17 00:00:00 2001
+From a720277c807504568a210d74b46887cc8be97fe2 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:47:13 +0200
-Subject: [PATCH 23/33] bmo#1196777: Set GDK_FOCUS_CHANGE_MASK
+Subject: [PATCH 23/32] 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 378f4cd116..501c4ec903 100644
+index aec5588fae..c280cd0178 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 |
@@ -24,5 +24,5 @@ index 378f4cd116..501c4ec903 100644
  #if !GTK_CHECK_VERSION(3, 22, 0)
  typedef enum {
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0024-Fix-building-with-PGO-when-using-GCC.patch b/http/firefox/patches/0024-Fix-building-with-PGO-when-using-GCC.patch
index 4cac38ebde..107253fda1 100644
--- a/http/firefox/patches/0024-Fix-building-with-PGO-when-using-GCC.patch
+++ b/http/firefox/patches/0024-Fix-building-with-PGO-when-using-GCC.patch
@@ -1,7 +1,7 @@
-From 957a610b95cb91885d0478b9d20e26ca81cc3587 Mon Sep 17 00:00:00 2001
+From 1ca9aac1bc06cee521e0e71059db3bf0b9d17ba7 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 2 Jul 2020 18:05:03 +0200
-Subject: [PATCH 24/33] Fix building with PGO when using GCC
+Subject: [PATCH 24/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0025-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch b/http/firefox/patches/0025-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
index c2793df610..1208e6846e 100644
--- a/http/firefox/patches/0025-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
+++ b/http/firefox/patches/0025-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
@@ -1,7 +1,7 @@
-From 84edf8b2e1a038143b94d0f04b9435937e89bee8 Mon Sep 17 00:00:00 2001
+From 754e6ff1936cf8888e0062e8815c3a99f8a82b42 Mon Sep 17 00:00:00 2001
 From: Mike Hommey <mh@glandium.org>
 Date: Mon, 26 Nov 2018 09:59:56 +0900
-Subject: [PATCH 25/33] libaom: Use NEON_FLAGS instead of VPX_ASFLAGS for
+Subject: [PATCH 25/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0026-build-Disable-Werror.patch b/http/firefox/patches/0026-build-Disable-Werror.patch
index 21ef37b4d1..8504a5b392 100644
--- a/http/firefox/patches/0026-build-Disable-Werror.patch
+++ b/http/firefox/patches/0026-build-Disable-Werror.patch
@@ -1,7 +1,7 @@
-From 6212b2e505fa1c1a827e739103806c7cc7613031 Mon Sep 17 00:00:00 2001
+From cb6220c80ec4034c93e3e7ff298bd82256770f94 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Sat, 29 Aug 2020 22:06:15 +0200
-Subject: [PATCH 26/33] build: Disable -Werror
+Subject: [PATCH 26/32] build: Disable -Werror
 
 Bug: https://bugzilla.mozilla.org/822978
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -24,5 +24,5 @@ index 192f9574fe..2020d65ffc 100755
  # New in clang 11. We can't really do anything about this warning.
  check_and_add_gcc_warning("-Wno-psabi")
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch b/http/firefox/patches/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
index 171f632438..cd92ded677 100644
--- a/http/firefox/patches/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
+++ b/http/firefox/patches/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
@@ -1,7 +1,7 @@
-From d7692784c95394605e4febf56b34b6966a7f41ad Mon Sep 17 00:00:00 2001
+From 3e2964adcd0b04dd72a5c0a1d6ad8e1680e6a429 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Sat, 29 Aug 2020 22:30:59 +0200
-Subject: [PATCH 27/33] LTO: Only enable LTO for Rust when complete build uses
+Subject: [PATCH 27/32] LTO: Only enable LTO for Rust when complete build uses
  LTO
 
 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(+)
 
 diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 3c724e0db8..9a70072f8c 100644
+index e5a6d57ba7..1d7d80ca3f 100644
 --- a/config/makefiles/rust.mk
 +++ b/config/makefiles/rust.mk
-@@ -64,6 +64,7 @@ endif
+@@ -62,6 +62,7 @@ endif
  # These flags are passed via `cargo rustc` and only apply to the final rustc
  # invocation (i.e., only the top-level crate, not its dependencies).
  cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
@@ -21,7 +21,7 @@ index 3c724e0db8..9a70072f8c 100644
  ifndef DEVELOPER_OPTIONS
  ifndef MOZ_DEBUG_RUST
  # Enable link-time optimization for release builds, but not when linking
-@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes
+@@ -75,6 +76,7 @@ RUSTFLAGS += -Cembed-bitcode=yes
  endif
  endif
  endif
@@ -30,5 +30,5 @@ index 3c724e0db8..9a70072f8c 100644
  ifdef CARGO_INCREMENTAL
  export CARGO_INCREMENTAL
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0028-Make-elfhack-use-toolchain.patch b/http/firefox/patches/0028-Make-elfhack-use-toolchain.patch
index 49ce454e91..c798cf8b69 100644
--- a/http/firefox/patches/0028-Make-elfhack-use-toolchain.patch
+++ b/http/firefox/patches/0028-Make-elfhack-use-toolchain.patch
@@ -1,7 +1,7 @@
-From 7f82d69b06dfd2b3777a5d23f830153f15a5bc49 Mon Sep 17 00:00:00 2001
+From b0d4e17b82a626c6102ce7ee9f2d5f80d97a212c Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 28 Sep 2020 20:52:24 +0200
-Subject: [PATCH 28/33] Make elfhack use toolchain
+Subject: [PATCH 28/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0029-Disable-FFVPX-with-VA-API.patch b/http/firefox/patches/0029-Disable-FFVPX-with-VA-API.patch
index 085bb6999c..258264e2b9 100644
--- a/http/firefox/patches/0029-Disable-FFVPX-with-VA-API.patch
+++ b/http/firefox/patches/0029-Disable-FFVPX-with-VA-API.patch
@@ -1,7 +1,7 @@
-From 92857d4a4f9a69c21f8394ff53ae34491eef2ab0 Mon Sep 17 00:00:00 2001
+From 28fd1be3e3b9cfcf27a790fc5c5e14ae4b8113ef Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:22:48 +0200
-Subject: [PATCH 29/33] Disable FFVPX with VA-API
+Subject: [PATCH 29/32] Disable FFVPX with VA-API
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 16 insertions(+), 16 deletions(-)
 
 diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
-index 6e84abde70..fab21747f5 100644
+index 9b0342ce82..4e377082ae 100644
 --- a/dom/media/platforms/PDMFactory.cpp
 +++ b/dom/media/platforms/PDMFactory.cpp
-@@ -481,12 +481,6 @@ void PDMFactory::CreateRddPDMs() {
+@@ -486,12 +486,6 @@ void PDMFactory::CreateRddPDMs() {
      CreateAndStartupPDM<AppleDecoderModule>();
    }
  #endif
@@ -25,7 +25,7 @@ index 6e84abde70..fab21747f5 100644
  #ifdef MOZ_FFMPEG
    if (StaticPrefs::media_ffmpeg_enabled() &&
        StaticPrefs::media_rdd_ffmpeg_enabled() &&
-@@ -494,6 +488,12 @@ void PDMFactory::CreateRddPDMs() {
+@@ -499,6 +493,12 @@ void PDMFactory::CreateRddPDMs() {
      mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
          FFmpegRuntimeLinker::LinkStatusCode());
    }
@@ -38,7 +38,7 @@ index 6e84abde70..fab21747f5 100644
  #endif
    CreateAndStartupPDM<AgnosticDecoderModule>();
  }
-@@ -525,11 +525,6 @@ void PDMFactory::CreateContentPDMs() {
+@@ -535,11 +535,6 @@ void PDMFactory::CreateContentPDMs() {
      CreateAndStartupPDM<OmxDecoderModule>();
    }
  #endif
@@ -50,7 +50,7 @@ index 6e84abde70..fab21747f5 100644
  #ifdef MOZ_FFMPEG
    if (StaticPrefs::media_ffmpeg_enabled() &&
        !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -537,6 +532,11 @@ void PDMFactory::CreateContentPDMs() {
+@@ -547,6 +542,11 @@ void PDMFactory::CreateContentPDMs() {
          FFmpegRuntimeLinker::LinkStatusCode());
    }
  #endif
@@ -62,7 +62,7 @@ index 6e84abde70..fab21747f5 100644
  #ifdef MOZ_WIDGET_ANDROID
    if (StaticPrefs::media_android_media_codec_enabled()) {
      StartupPDM(AndroidDecoderModule::Create(),
-@@ -571,11 +571,6 @@ void PDMFactory::CreateDefaultPDMs() {
+@@ -581,11 +581,6 @@ void PDMFactory::CreateDefaultPDMs() {
      CreateAndStartupPDM<OmxDecoderModule>();
    }
  #endif
@@ -74,7 +74,7 @@ index 6e84abde70..fab21747f5 100644
  #ifdef MOZ_FFMPEG
    if (StaticPrefs::media_ffmpeg_enabled() &&
        !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -583,6 +578,11 @@ void PDMFactory::CreateDefaultPDMs() {
+@@ -593,6 +588,11 @@ void PDMFactory::CreateDefaultPDMs() {
          FFmpegRuntimeLinker::LinkStatusCode());
    }
  #endif
@@ -87,5 +87,5 @@ index 6e84abde70..fab21747f5 100644
    if (StaticPrefs::media_android_media_codec_enabled()) {
      StartupPDM(AndroidDecoderModule::Create(),
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0030-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch b/http/firefox/patches/0030-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
index c5ce3e4a6e..c63bf303cf 100644
--- a/http/firefox/patches/0030-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
+++ b/http/firefox/patches/0030-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
@@ -1,7 +1,7 @@
-From b9e6602ccd69713fd1cf6a922955dacaab8cd303 Mon Sep 17 00:00:00 2001
+From 9b223bec6a30fa66f90304b6fd548643201a431e Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:48:06 +0200
-Subject: [PATCH 30/33] Enable FLAC on platforms without ffvpx via ffmpeg
+Subject: [PATCH 30/32] 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.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0031-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch b/http/firefox/patches/0031-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
index d039be8a51..63c6208246 100644
--- a/http/firefox/patches/0031-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
+++ b/http/firefox/patches/0031-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
@@ -1,7 +1,7 @@
-From 8f0a39adcf0966187e98e5318a97c0af532b19d1 Mon Sep 17 00:00:00 2001
+From 7e3d196f2d7bd6cd8ec57b7f28a45e4e5db7535c Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Fri, 11 Dec 2020 15:37:38 +0100
-Subject: [PATCH 31/33] bmo#1670333: OpenH264: Fix decoding if it starts on non
+Subject: [PATCH 31/32] bmo#1670333: OpenH264: Fix decoding if it starts on non
  IDR I-frame
 
 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -38,7 +38,7 @@ index 59bba16577..0304e3e89f 100644
              NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
                                         "@ pts:%" PRId64 " dur:%" PRId64
 diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
-index fab21747f5..cceaa944aa 100644
+index 4e377082ae..e778eb9948 100644
 --- a/dom/media/platforms/PDMFactory.cpp
 +++ b/dom/media/platforms/PDMFactory.cpp
 @@ -58,6 +58,8 @@
@@ -50,7 +50,7 @@ index fab21747f5..cceaa944aa 100644
  namespace mozilla {
  
  #define PDM_INIT_LOG(msg, ...) \
-@@ -526,10 +528,12 @@ void PDMFactory::CreateContentPDMs() {
+@@ -536,10 +538,12 @@ void PDMFactory::CreateContentPDMs() {
    }
  #endif
  #ifdef MOZ_FFMPEG
@@ -67,7 +67,7 @@ index fab21747f5..cceaa944aa 100644
    }
  #endif
  #ifdef MOZ_FFVPX
-@@ -546,8 +550,9 @@ void PDMFactory::CreateContentPDMs() {
+@@ -556,8 +560,9 @@ void PDMFactory::CreateContentPDMs() {
  
    CreateAndStartupPDM<AgnosticDecoderModule>();
  
@@ -92,5 +92,5 @@ index 4fc81c0b37..72f3255b6f 100644
    static void EnsureInit();
  };
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0032-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch b/http/firefox/patches/0032-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
index b7ee5f76c5..b4801211dc 100644
--- a/http/firefox/patches/0032-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
+++ b/http/firefox/patches/0032-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
@@ -1,7 +1,7 @@
-From ecb3c2eb66b4aced1003262100dd0c0aafee0bbd Mon Sep 17 00:00:00 2001
+From 1bc8185805c27e52ca65454f8b4e0e6f9ea60d1c Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Fri, 11 Dec 2020 15:46:25 +0100
-Subject: [PATCH 32/33] bmo#1663844: OpenH264: Allow using OpenH264 GMP decoder
+Subject: [PATCH 32/32] 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 f1e2cf935b..406fd8a622 100644
      mDecodedData.Clear();
      mDecodePromise.RejectIfExists(
 -- 
-2.33.0
+2.33.1
 
diff --git a/http/firefox/patches/0033-bmo-1725828-Preload-dependencies-for-the-Widevine-CD.patch b/http/firefox/patches/0033-bmo-1725828-Preload-dependencies-for-the-Widevine-CD.patch
deleted file mode 100644
index 50e1d50ccc..0000000000
--- a/http/firefox/patches/0033-bmo-1725828-Preload-dependencies-for-the-Widevine-CD.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From caec13d016cae398acdb633a81d9009194ed7d01 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 23 Sep 2021 16:31:41 +0200
-Subject: [PATCH 33/33] bmo#1725828: Preload dependencies for the Widevine CDM
- when sandboxing it on Linux
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- dom/media/gmp/GMPChild.cpp  |  8 +++++++-
- dom/media/gmp/GMPParent.cpp | 16 ++++++++++++++--
- 2 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
-index f7e745d2c0..dc17f3a3be 100644
---- a/dom/media/gmp/GMPParent.cpp
-+++ b/dom/media/gmp/GMPParent.cpp
-@@ -876,6 +874,20 @@ RefPtr<GenericPromise> GMPParent::ParseChromiumManifest(
-     return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
-   }
- 
-+#ifdef XP_LINUX
-+  // These glibc libraries were merged into libc.so.6 as of glibc
-+  // 2.34; they now exist only as stub libraries for compatibility and
-+  // newly linked code won't depend on them, so we need to ensure
-+  // they're loaded for plugins that may have been linked against a
-+  // different version of glibc.  (See also bug 1725828.)
-+  if (!mDisplayName.EqualsASCII("clearkey")) {
-+    if (!mLibs.IsEmpty()) {
-+      mLibs.AppendLiteral(", ");
-+    }
-+    mLibs.AppendLiteral("libdl.so.2, libpthread.so.0, librt.so.1");
-+  }
-+#endif
-+
-   nsCString codecsString = NS_ConvertUTF16toUTF8(m.mX_cdm_codecs);
-   nsTArray<nsCString> codecs;
-   SplitAt(",", codecsString, codecs);
--- 
-2.33.0
-