Updated to 94.0

5 files changed, 28 insertions, 79 deletions

diff --git a/.gitignore b/.gitignore
index 250647c..324e39a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -477,3 +477,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-92.0.1-20210927.tar.xz
 /firefox-93.0.source.tar.xz
 /firefox-langpacks-93.0-20210929.tar.xz
+/firefox-94.0.source.tar.xz
+/firefox-langpacks-94.0-20211031.tar.xz
diff --git a/firefox.spec b/firefox.spec
index b91fb5b..a5d3ccc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -156,13 +156,13 @@ ExcludeArch: armv7hl
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        93.0
-Release:        2%{?pre_tag}%{?dist}
+Version:        94.0
+Release:        1%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
 %if %{with langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20210929.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20211031.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source10:       firefox-mozconfig
@@ -237,7 +237,6 @@ Patch407:        mozilla-1667096.patch
 Patch408:        mozilla-1663844.patch
 Patch415:        mozilla-1670333.patch
 Patch420:        mochitest-wayland-workaround.patch
-Patch424:        mozilla-1725828.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -457,9 +456,9 @@ This package contains results of tests executed during build.
 #%patch61 -p1 -b .glibc-dynstack
 
 # Test patches
-%patch100 -p1 -b .firefox-tests-xpcshell
-%patch101 -p1 -b .firefox-tests-reftest
-%patch102 -p1 -b .firefox-tests-xpcshell-freeze
+#%patch100 -p1 -b .firefox-tests-xpcshell
+#%patch101 -p1 -b .firefox-tests-reftest
+#%patch102 -p1 -b .firefox-tests-xpcshell-freeze
 
 # Fedora patches
 %patch215 -p1 -b .addons
@@ -478,7 +477,6 @@ This package contains results of tests executed during build.
 %patch408 -p1 -b .1663844
 %patch415 -p1 -b .1670333
 %patch420 -p1 -b .mochitest-wayland-workaround
-%patch424 -p1 -b .1725828
 
 # PGO patches
 %if %{build_with_pgo}
@@ -1048,6 +1046,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Nov 1 2021 Martin Stransky <stransky@redhat.com> - 94.0-1
+- Updated to 94.0
+
 * Thu Oct 07 2021 Martin Stransky <stransky@redhat.com> - 93.0-2
 - Require NSS 3.70
 
diff --git a/mozilla-1667096.patch b/mozilla-1667096.patch
index ff340fc..ba87fbe 100644
--- a/mozilla-1667096.patch
+++ b/mozilla-1667096.patch
@@ -1,6 +1,6 @@
-diff -up firefox-88.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-88.0/media/ffvpx/libavcodec/codec_list.c
---- firefox-88.0/media/ffvpx/libavcodec/codec_list.c.1667096	2021-04-15 21:44:31.000000000 +0200
-+++ firefox-88.0/media/ffvpx/libavcodec/codec_list.c	2021-04-19 13:34:10.373138674 +0200
+diff -up firefox-94.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-94.0/media/ffvpx/libavcodec/codec_list.c
+--- firefox-94.0/media/ffvpx/libavcodec/codec_list.c.1667096	2021-10-28 20:03:38.000000000 +0200
++++ firefox-94.0/media/ffvpx/libavcodec/codec_list.c	2021-11-01 11:02:50.898723802 +0100
 @@ -11,4 +11,8 @@ static const AVCodec * const codec_list[
  #if CONFIG_MP3_DECODER
      &ff_mp3_decoder,
@@ -10,9 +10,9 @@ diff -up firefox-88.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-88.0/m
 +#endif
 +
      NULL };
-diff -up firefox-88.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-88.0/media/ffvpx/libavcodec/libfdk-aacdec.c
---- firefox-88.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096	2021-04-19 13:34:10.373138674 +0200
-+++ firefox-88.0/media/ffvpx/libavcodec/libfdk-aacdec.c	2021-04-19 13:34:10.373138674 +0200
+diff -up firefox-94.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-94.0/media/ffvpx/libavcodec/libfdk-aacdec.c
+--- firefox-94.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096	2021-11-01 11:02:50.899723835 +0100
++++ firefox-94.0/media/ffvpx/libavcodec/libfdk-aacdec.c	2021-11-01 11:02:50.899723835 +0100
 @@ -0,0 +1,409 @@
 +/*
 + * AAC decoder wrapper
@@ -423,9 +423,9 @@ diff -up firefox-88.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-88.
 +                      FF_CODEC_CAP_INIT_CLEANUP,
 +    .wrapper_name   = "libfdk",
 +};
-diff -up firefox-88.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-88.0/media/ffvpx/libavcodec/moz.build
---- firefox-88.0/media/ffvpx/libavcodec/moz.build.1667096	2021-04-15 21:44:32.000000000 +0200
-+++ firefox-88.0/media/ffvpx/libavcodec/moz.build	2021-04-19 13:34:10.374138704 +0200
+diff -up firefox-94.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-94.0/media/ffvpx/libavcodec/moz.build
+--- firefox-94.0/media/ffvpx/libavcodec/moz.build.1667096	2021-10-28 20:03:43.000000000 +0200
++++ firefox-94.0/media/ffvpx/libavcodec/moz.build	2021-11-01 11:02:50.899723835 +0100
 @@ -104,6 +104,12 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
          ]
          USE_LIBS += ['mozva']
@@ -439,12 +439,12 @@ diff -up firefox-88.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-88.0/medi
  if CONFIG['MOZ_LIBAV_FFT']:
      SOURCES += [
          'avfft.c',
-diff -up firefox-88.0/toolkit/moz.configure.1667096 firefox-88.0/toolkit/moz.configure
---- firefox-88.0/toolkit/moz.configure.1667096	2021-04-19 13:34:10.374138704 +0200
-+++ firefox-88.0/toolkit/moz.configure	2021-04-19 13:35:29.109506754 +0200
-@@ -1830,6 +1830,14 @@ with only_when(compile_environment):
-     set_config("LIBJPEG_TURBO_USE_NASM", True, when=jpeg_nasm)
-     set_config("LIBJPEG_TURBO_ASFLAGS", in_tree_jpeg)
+diff -up firefox-94.0/toolkit/moz.configure.1667096 firefox-94.0/toolkit/moz.configure
+--- firefox-94.0/toolkit/moz.configure.1667096	2021-11-01 11:02:50.899723835 +0100
++++ firefox-94.0/toolkit/moz.configure	2021-11-01 11:04:28.545873853 +0100
+@@ -1878,6 +1878,14 @@ with only_when(compile_environment):
+         & jpeg_arm_neon_vld1q_u8_x4,
+     )
  
 +# fdk aac support
 +option('--with-system-fdk-aac',
diff --git a/mozilla-1725828.patch b/mozilla-1725828.patch
deleted file mode 100644
index eed100a..0000000
--- a/mozilla-1725828.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
---- a/dom/media/gmp/GMPChild.cpp
-+++ b/dom/media/gmp/GMPChild.cpp
-@@ -232,8 +232,14 @@
-   }
- #elif defined(XP_LINUX)
-   constexpr static const char* whitelist[] = {
-+      // NSS libraries used by clearkey.
-       "libfreeblpriv3.so",
-       "libsoftokn3.so",
-+      // glibc libraries merged into libc.so.6; see bug 1725828 and
-+      // the corresponding code in GMPParent.cpp.
-+      "libdl.so.2",
-+      "libpthread.so.0",
-+      "librt.so.1",
-   };
- 
-   nsTArray<nsCString> libs;
-@@ -256,7 +262,7 @@
-           }
-           // End bug 1698718 logging.
- 
--          MOZ_CRASH("Couldn't load lib needed by NSS");
-+          MOZ_CRASH("Couldn't load lib needed by media plugin");
-         }
-       }
-     }
-diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
---- a/dom/media/gmp/GMPParent.cpp
-+++ b/dom/media/gmp/GMPParent.cpp
-@@ -876,6 +876,20 @@
-     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);
-
diff --git a/sources b/sources
index 8131dcb..293fa4c 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = b9ab1498be90ecf60822df7021f8812f124550d97f8cd687c69d3ab56fc5fb714bfe88c78c978a1794d211724909a9a5cad6a4b483fa05f762909c45d5075520
 SHA512 (mochitest-python.tar.gz) = 18e1aeb475df5fbf1fe3838897d5ac2f3114aa349030713fc2be27af087b1b12f57642621b87bd052f324a7cb7fbae5f36b21502191d85692f62c8cdd69c8bf2
-SHA512 (firefox-92.0.1.source.tar.xz) = 53361c231a4ac93a1808c9ccb29893d85b5e516fe939a770aac7f178abb4f43cbe3571097e5c5bf91b11fd95fc62b61f2aa215a45048357bfc9dad9eabdee9ef
-SHA512 (firefox-langpacks-92.0.1-20210927.tar.xz) = 60719e4efe3a9ebf7e80caf79c77b9f01b2fbd380977eefaec02f7a863a6a9d88563a827a2816065522909ebecd944afb97c26278440bded9a6dadaf491ef89c
-SHA512 (firefox-93.0.source.tar.xz) = b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91
-SHA512 (firefox-langpacks-93.0-20210929.tar.xz) = 24872b6a6e7be04b8ee39f2d51787e3d016ef8a731f1c763d486acc4e63a48e0ea876bda718c5939318d18ec56d6f3e18855e0fd520ec7d04fc4d2f3cbc6dd3d
+SHA512 (firefox-94.0.source.tar.xz) = 5eb65450a0f1842d28d73235f3ef95fa1dbf8cf1467c354f13df51313bd227aaf5a48b741ee49b13378aaaf054bff52004c1dd5a274eddef4a3cf1b913ef7071
+SHA512 (firefox-langpacks-94.0-20211031.tar.xz) = 9b850c2288b81de988ac615282422c22e2da13664136c0b42d61fba15096a38f4bed51aadd60c5bd3d59ab09ec941081e48b3e576c54a2e83de6edb4e7271ca0