Merge branch 'main' into f32

2021-05-10 10:33:14 +02:00 · 2021-05-04 15:49:55 +02:00 · 2021-04-30 11:47:24 +02:00 · 2021-04-30 10:59:21 +02:00 · 2021-04-27 22:44:44 +02:00 · 2021-04-27 14:35:49 +02:00
81 changed files with 10203 additions and 5173 deletions
--- a/.gitignore
+++ b/.gitignore
@ -457,293 +457,3 @@ firefox-3.6.4.source.tar.bz2
 /firefox-88.0.source.tar.xz
 /firefox-88.0.1.source.tar.xz
 /firefox-langpacks-88.0.1-20210510.tar.xz
-/firefox-langpacks-89.0-20210601.tar.xz
-/firefox-89.0.source.tar.xz
-/firefox-89.0.2.source.tar.xz
-/firefox-langpacks-89.0.2-20210624.tar.xz
-/firefox-90.0.source.tar.xz
-/firefox-langpacks-90.0-20210712.tar.xz
-/firefox-90.0.1.source.tar.xz
-/firefox-langpacks-90.0.1-20210721.tar.xz
-/firefox-90.0.2.source.tar.xz
-/firefox-langpacks-90.0.2-20210722.tar.xz
-/firefox-91.0.source.tar.xz
-/firefox-langpacks-91.0-20210810.tar.xz
-/firefox-91.0.2.source.tar.xz
-/firefox-langpacks-91.0.2-20210826.tar.xz
-/firefox-langpacks-92.0-20210903.tar.xz
-/firefox-92.0.source.tar.xz
-/firefox-92.0.1.source.tar.xz
-/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
-/firefox-94.0.2.source.tar.xz
-/firefox-langpacks-94.0.2-20211125.tar.xz
-/firefox-95.0.source.tar.xz
-/firefox-langpacks-95.0-20211203.tar.xz
-/firefox-95.0.2.source.tar.xz
-/firefox-langpacks-95.0.2-20211220.tar.xz
-/firefox-96.0.source.tar.xz
-/firefox-langpacks-96.0-20220111.tar.xz
-/firefox-langpacks-96.0.1-20220118.tar.xz
-/firefox-96.0.1.source.tar.xz
-/firefox-96.0.3.source.tar.xz
-/firefox-langpacks-96.0.3-20220131.tar.xz
-/firefox-97.0.source.tar.xz
-/firefox-langpacks-97.0-20220208.tar.xz
-/firefox-97.0.1.source.tar.xz
-/firefox-langpacks-97.0.1-20220218.tar.xz
-/firefox-98.0.source.tar.xz
-/firefox-langpacks-98.0-20220301.tar.xz
-/firefox-langpacks-98.0-20220304.tar.xz
-/firefox-langpacks-98.0-20220305.tar.xz
-/firefox-98.0.2.source.tar.xz
-/firefox-langpacks-98.0.2-20220331.tar.xz
-/firefox-99.0.source.tar.xz
-/firefox-langpacks-99.0-20220331.tar.xz
-/firefox-langpacks-99.0.1-20220413.tar.xz
-/firefox-99.0.1.source.tar.xz
-/firefox-100.0.source.tar.xz
-/firefox-langpacks-100.0-20220502.tar.xz
-/firefox-100.0.1.source.tar.xz
-/firefox-langpacks-100.0.1-20220518.tar.xz
-/firefox-100.0.2.source.tar.xz
-/firefox-langpacks-100.0.2-20220520.tar.xz
-/firefox-101.0.source.tar.xz
-/firefox-langpacks-101.0-20220530.tar.xz
-/firefox-101.0.1.source.tar.xz
-/firefox-langpacks-101.0.1-20220609.tar.xz
-/firefox-102.0.source.tar.xz
-/firefox-langpacks-102.0-20220628.tar.xz
-/firefox-103.0.source.tar.xz
-/firefox-langpacks-103.0-20220721.tar.xz
-/firefox-103.0.1.source.tar.xz
-/firefox-langpacks-103.0.1-20220802.tar.xz
-/firefox-103.0.2.source.tar.xz
-/firefox-langpacks-103.0.2-20220812.tar.xz
-/firefox-104.0.source.tar.xz
-/firefox-langpacks-104.0-20220816.tar.xz
-/firefox-langpacks-104.0-20220822.tar.xz
-/firefox-langpacks-104.0.1-20220830.tar.xz
-/firefox-104.0.1.source.tar.xz
-/firefox-104.0.2.source.tar.xz
-/firefox-langpacks-104.0.2-20220906.tar.xz
-/firefox-langpacks-105.0-20220920.tar.xz
-/firefox-105.0.source.tar.xz
-/firefox-105.0.1.source.tar.xz
-/firefox-langpacks-105.0.1-20220922.tar.xz
-/firefox-105.0.2.source.tar.xz
-/firefox-langpacks-105.0.2-20221005.tar.xz
-/firefox-langpacks-106.0-20221014.tar.xz
-/firefox-106.0.source.tar.xz
-/firefox-106.0.1.source.tar.xz
-/firefox-langpacks-106.0.1-20221023.tar.xz
-/firefox-106.0.3.source.tar.xz
-/firefox-langpacks-106.0.3-20221031.tar.xz
-/firefox-langpacks-107.0-20221114.tar.xz
-/firefox-107.0.source.tar.xz
-/firefox-107.0.1.source.tar.xz
-/firefox-langpacks-107.0.1-20221206.tar.xz
-/firefox-108.0.source.tar.xz
-/firefox-langpacks-108.0-20221206.tar.xz
-/firefox-langpacks-108.0-20221214.tar.xz
-/firefox-108.0.1.source.tar.xz
-/firefox-langpacks-108.0.1-20221218.tar.xz
-/firefox-108.0.2.source.tar.xz
-/firefox-langpacks-108.0.2-20230112.tar.xz
-/firefox-109.0.source.tar.xz
-/firefox-langpacks-109.0-20230111.tar.xz
-/firefox-109.0.1.source.tar.xz
-/firefox-langpacks-109.0.1-20230201.tar.xz
-/firefox-110.0.source.tar.xz
-/firefox-langpacks-110.0-20230210.tar.xz
-/firefox-langpacks-110.0-20230214.tar.xz
-/firefox-111.0.source.tar.xz
-/firefox-langpacks-111.0-20230320.tar.xz
-/firefox-langpacks-111.0.1-20230322.tar.xz
-/firefox-111.0.1.source.tar.xz
-/firefox-112.0.source.tar.xz
-/firefox-langpacks-112.0-20230405.tar.xz
-/firefox-langpacks-112.0-20230406.tar.xz
-/firefox-langpacks-112.0.1-20230417.tar.xz
-/firefox-112.0.1.source.tar.xz
-/firefox-langpacks-112.0.2-20230427.tar.xz
-/firefox-112.0.2.source.tar.xz
-/firefox-langpacks-113.0-20230509.tar.xz
-/firefox-113.0.source.tar.xz
-/firefox-langpacks-113.0.1-20230515.tar.xz
-/firefox-113.0.1.source.tar.xz
-/firefox-114.0.source.tar.xz
-/firefox-langpacks-114.0-20230605.tar.xz
-/firefox-langpacks-114.0.2-20230620.tar.xz
-/firefox-114.0.2.source.tar.xz
-/firefox-langpacks-115.0-20230629.tar.xz
-/firefox-115.0.source.tar.xz
-/firefox-langpacks-115.0-20230703.tar.xz
-/firefox-115.0.2.source.tar.xz
-/firefox-langpacks-115.0.2-20230717.tar.xz
-/firefox-116.0.source.tar.xz
-/firefox-langpacks-116.0-20230725.tar.xz
-/firefox-langpacks-116.0-20230731.tar.xz
-/firefox-116.0.1.source.tar.xz
-/firefox-langpacks-116.0.1-20230804.tar.xz
-/firefox-langpacks-116.0.2-20230807.tar.xz
-/firefox-116.0.2.source.tar.xz
-/firefox-langpacks-116.0.3-20230817.tar.xz
-/firefox-116.0.3.source.tar.xz
-/firefox-117.0.source.tar.xz
-/firefox-langpacks-117.0-20230828.tar.xz
-/firefox-117.0.1.source.tar.xz
-/firefox-langpacks-117.0.1-20230913.tar.xz
-/firefox-118.0.source.tar.xz
-/firefox-langpacks-118.0-20230925.tar.xz
-/firefox-langpacks-118.0.1-20230929.tar.xz
-/firefox-118.0.1.source.tar.xz
-/firefox-118.0.2.source.tar.xz
-/firefox-langpacks-118.0.2-20231010.tar.xz
-/dump_syms-vendor.tar.xz
-/firefox-langpacks-119.0.1-20231110.tar.xz
-/firefox-119.0.1.source.tar.xz
-/firefox-120.0.source.tar.xz
-/firefox-langpacks-120.0-20231114.tar.xz
-/firefox-langpacks-120.0-20231120.tar.xz
-/firefox-120.0.1.source.tar.xz
-/firefox-langpacks-120.0.1-20231201.tar.xz
-/firefox-121.0.source.tar.xz
-/firefox-langpacks-121.0-20231218.tar.xz
-/firefox-121.0.1.source.tar.xz
-/firefox-langpacks-121.0.1-20240112.tar.xz
-/firefox-122.0.source.tar.xz
-/firefox-langpacks-122.0-20240119.tar.xz
-/firefox-langpacks-122.0.1-20240213.tar.xz
-/firefox-122.0.1.source.tar.xz
-/firefox-langpacks-123.0-20240219.tar.xz
-/firefox-123.0.source.tar.xz
-/firefox-123.0.1.source.tar.xz
-/firefox-langpacks-123.0.1-20240307.tar.xz
-/firefox-124.0.source.tar.xz
-/firefox-langpacks-124.0-20240313.tar.xz
-/firefox-124.0.1.source.tar.xz
-/firefox-langpacks-124.0.1-20240322.tar.xz
-/wasi-sdk-20.tar.gz
-/wasi-sdk-20-1.fc39.src.rpm
-/firefox-124.0.2.source.tar.xz
-/firefox-langpacks-124.0.2-20240404.tar.xz
-/firefox-langpacks-125.0-20240409.tar.xz
-/firefox-125.0.source.tar.xz
-/firefox-125.0.2.source.tar.xz
-/firefox-langpacks-125.0.2-20240420.tar.xz
-/firefox-125.0.3.source.tar.xz
-/firefox-langpacks-125.0.3-20240429.tar.xz
-/firefox-126.0.source.tar.xz
-/firefox-langpacks-126.0-20240507.tar.xz
-/firefox-127.0.source.tar.xz
-/firefox-langpacks-127.0-20240610.tar.xz
-/firefox-langpacks-127.0.2-20240625.tar.xz
-/firefox-127.0.2.source.tar.xz
-/firefox-128.0.source.tar.xz
-/firefox-langpacks-128.0-20240702.tar.xz
-/firefox-langpacks-128.0-20240708.tar.xz
-/firefox-128.0.3.source.tar.xz
-/firefox-langpacks-128.0.3-20240729.tar.xz
-/firefox-129.0.source.tar.xz
-/firefox-langpacks-129.0-20240730.tar.xz
-/firefox-langpacks-129.0-20240802.tar.xz
-/firefox-129.0.2.source.tar.xz
-/firefox-langpacks-192.0.2-20240820.tar.xz
-/firefox-langpacks-129.0.2-20240820.tar.xz
-/firefox-langpacks-130.0-20240828.tar.xz
-/firefox-130.0.source.tar.xz
-/firefox-130.0.1.source.tar.xz
-/firefox-langpacks-130.0.1-20240918.tar.xz
-/firefox-langpacks-131.0-20240924.tar.xz
-/firefox-131.0.source.tar.xz
-/firefox-131.0.2.source.tar.xz
-/firefox-langpacks-131.0.2-20241009.tar.xz
-/firefox-131.0.3.source.tar.xz
-/firefox-langpacks-131.0.3-20241015.tar.xz
-/firefox-132.0.source.tar.xz
-/firefox-langpacks-132.0-20241023.tar.xz
-/firefox-132.0.1.source.tar.xz
-/firefox-langpacks-132.0.1-20241105.tar.xz
-/firefox-langpacks-132.0.2-20241115.tar.xz
-/firefox-132.0.2.source.tar.xz
-/firefox-133.0.source.tar.xz
-/firefox-langpacks-133.0-20241122.tar.xz
-/firefox-langpacks-133.0.3-20241211.tar.xz
-/firefox-133.0.3.source.tar.xz
-/firefox-langpacks-134.0-20250102.tar.xz
-/firefox-134.0.source.tar.xz
-/firefox-langpacks-134.0.1-20250115.tar.xz
-/firefox-134.0.1.source.tar.xz
-/firefox-134.0.2.source.tar.xz
-/firefox-langpacks-134.0.2-20250122.tar.xz
-/wasi-sdk-25.tar.gz
-/wasm-component-ld-vendor.tar.xz
-/firefox-135.0.source.tar.xz
-/firefox-langpacks-135.0-20250204.tar.xz
-/firefox-136.0.source.tar.xz
-/firefox-langpacks-136.0-20250225.tar.xz
-/firefox-langpacks-136.0-20250228.tar.xz
-/firefox-136.0.1.source.tar.xz
-/firefox-langpacks-136.0.1-20250312.tar.xz
-/firefox-langpacks-136.0.2-20250319.tar.xz
-/firefox-136.0.2.source.tar.xz
-/firefox-136.0.3.source.tar.xz
-/firefox-langpacks-136.0.3-20250325.tar.xz
-/firefox-langpacks-137.0-20250326.tar.xz
-/firefox-137.0.source.tar.xz
-/firefox-langpacks-137.0-20250331.tar.xz
-/firefox-137.0.1.source.tar.xz
-/firefox-langpacks-137.0.1-20250414.tar.xz
-/firefox-138.0.source.tar.xz
-/firefox-langpacks-138.0-20250422.tar.xz
-/firefox-langpacks-138.0.1-20250501.tar.xz
-/firefox-138.0.1.source.tar.xz
-/firefox-138.0.3.source.tar.xz
-/firefox-langpacks-138.0.3-20250512.tar.xz
-/firefox-langpacks-138.0.4-20250519.tar.xz
-/firefox-138.0.4.source.tar.xz
-/firefox-139.0.source.tar.xz
-/firefox-langpacks-139.0-20250527.tar.xz
-/firefox-langpacks-139.0.4-20250610.tar.xz
-/firefox-139.0.4.source.tar.xz
-/firefox-140.0.source.tar.xz
-/firefox-langpacks-140.0-20250617.tar.xz
-/firefox-140.0.1.source.tar.xz
-/firefox-langpacks-140.0.1-20250627.tar.xz
-/firefox-140.0.4.source.tar.xz
-/firefox-langpacks-140.0.4-20250708.tar.xz
-/firefox-141.0.source.tar.xz
-/firefox-langpacks-141.0-20250717.tar.xz
-/firefox-langpacks-141.0-20250718.tar.xz
-/firefox-langpacks-141.2.0-20250806.tar.xz
-/firefox-141.0.2.source.tar.xz
-/firefox-langpacks-141.0.2-20250806.tar.xz
-/firefox-langpacks-141.0.3-20250811.tar.xz
-/firefox-141.0.3.source.tar.xz
-/firefox-142.0.source.tar.xz
-/firefox-langpacks-142.0-20250812.tar.xz
-/firefox-langpacks-142.0.1-20250827.tar.xz
-/firefox-142.0.1.source.tar.xz
-/firefox-143.0.1.source.tar.xz
-/firefox-langpacks-143.0.1-20250919.tar.xz
-/firefox-langpacks-143.0.3-20250930.tar.xz
-/firefox-143.0.3.source.tar.xz
-/firefox-langpacks-144.0-20251009.tar.xz
-/firefox-144.0.source.tar.xz
-/firefox-langpacks-144.0-20251010.tar.xz
-/firefox-145.0.source.tar.xz
-/firefox-langpacks-145.0-20251105.tar.xz
-/firefox-langpacks-145.0-20251111.tar.xz
-/firefox-145.0.1.source.tar.xz
-/firefox-langpacks-145.0.1-20251119.tar.xz
-/firefox-146.0.source.tar.xz
-/firefox-langpacks-146.0-20251202.tar.xz
-/firefox-langpacks-146.0-20251208.tar.xz
-/firefox-146.0.1.source.tar.xz
-/firefox-langpacks-146.0.1-20251219.tar.xz
-/firefox-langpacks-147.0-20260106.tar.xz
-/firefox-147.0.source.tar.xz
--- a/0001-GLIBCXX-fix-for-GCC-12.patch
+++ b/0001-GLIBCXX-fix-for-GCC-12.patch
@ -1,31 +0,0 @@
-diff -up firefox-142.0/build/unix/stdc++compat/stdc++compat.cpp.0001-GLIBCXX-fix-for-GCC-12 firefox-142.0/build/unix/stdc++compat/stdc++compat.cpp
--- firefox-142.0/build/unix/stdc++compat/stdc++compat.cpp.0001-GLIBCXX-fix-for-GCC-12	2025-08-11 20:04:27.000000000 +0200
-+++ firefox-142.0/build/unix/stdc++compat/stdc++compat.cpp	2025-08-14 15:02:05.496137133 +0200
-@@ -24,6 +24,7 @@
-    GLIBCXX_3.4.27 is from gcc 10
-    GLIBCXX_3.4.28 is from gcc 10
-    GLIBCXX_3.4.29 is from gcc 11
-+   GLIBCXX_3.4.30 is from gcc 12
- 
- This file adds the necessary compatibility tricks to avoid symbols with
- version GLIBCXX_3.4.20 and bigger, keeping binary compatibility with
-@@ -94,6 +95,19 @@ void operator delete(void* ptr, size_t s
- }
- #  endif
- 
-+#if _GLIBCXX_RELEASE >= 12
-+namespace std {
-+
-+/* This avoids the GLIBCXX_3.4.30 symbol version. */
-+void __attribute__((weak))
-+__glibcxx_assert_fail(const char* __file, int __line, const char* __function,
-+                      const char* __condition) {
-+  MOZ_CRASH();
-+}
-+
-+}  // namespace std
-+#endif
-+
- /* While we generally don't build with exceptions, we have some host tools
-  * that do use them. libstdc++ from GCC 5.0 added exception constructors with
-  * char const* argument. Older versions only have a constructor with
--- a/0025-Add-KDE-integration-to-Firefox-toolkit-parts.patch
+++ b/0025-Add-KDE-integration-to-Firefox-toolkit-parts.patch
--- a/0026-Add-KDE-integration-to-Firefox.patch
+++ b/0026-Add-KDE-integration-to-Firefox.patch
@ -1,279 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Sirringhaus <msirringhaus@suse.de>
-Date: Tue, 8 Aug 2023 16:18:24 +0300
-Subject: [PATCH] Add KDE integration to Firefox
-
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
-Bug: https://bugzilla.suse.com/show_bug.cgi?id=170055
-
-How to apply this patch:
-
-1. Import and apply it
-2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
-3. Find editBookmarkPanelDoneButton
-4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
-5. hg qrefresh
---
- browser/components/preferences/main.js        |  18 +++
- browser/components/shell/moz.build            |   2 +
- .../components/shell/nsKDEShellService.cpp    | 109 ++++++++++++++++++
- browser/components/shell/nsKDEShellService.h  |  32 +++++
- .../components/shell/nsUnixShellService.cpp   |  22 ++++
- browser/components/shell/nsUnixShellService.h |  15 +++
- 6 files changed, 198 insertions(+)
- create mode 100644 browser/components/shell/nsKDEShellService.cpp
- create mode 100644 browser/components/shell/nsKDEShellService.h
- create mode 100644 browser/components/shell/nsUnixShellService.cpp
- create mode 100644 browser/components/shell/nsUnixShellService.h
-
-diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index 820e46fb006567bfdf93e2a46da5e3c07d42bf10..57d1c21bdecc2d55d0bed30246e684d3b97ad7fa 100644
--- a/browser/components/preferences/main.js
-+++ b/browser/components/preferences/main.js
-@@ -294,6 +294,13 @@ var gMainPane = {
-       }, backoffTimes[this._backoffIndex]);
-     }
- 
-+    var env = Components.classes["@mozilla.org/process/environment;1"]
-+      .getService(Components.interfaces.nsIEnvironment);
-+    var kde_session = 0;
-+    if (env.get('KDE_FULL_SESSION') == "true") {
-+      kde_session = 1;
-+    }
-+
-     this.initBrowserContainers();
-     this.buildContentProcessCountMenuList();
- 
-@@ -1727,6 +1734,17 @@ var gMainPane = {
-       }
-       try {
-         shellSvc.setDefaultBrowser(true, false);
-+        if (kde_session == 1) {
-+          var shellObj = Components.classes["@mozilla.org/file/local;1"]
-+            .createInstance(Components.interfaces.nsILocalFile);
-+          shellObj.initWithPath("/usr/bin/kwriteconfig");
-+          var process = Components.classes["@mozilla.org/process/util;1"]
-+            .createInstance(Components.interfaces.nsIProcess);
-+          process.init(shellObj);
-+          var args = ["--file", "kdeglobals", "--group", "General", "--key",
-+              "BrowserApplication", "firefox"];
-+          process.run(false, args, args.length);
-+        }
-       } catch (ex) {
-         console.error(ex);
-         return;
-diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
-index eb88cb287dc3f04022b74b978666118bbd5fa6b2..95277533781a7224d108e3c45731a6d9a89ba1a0 100644
--- a/browser/components/shell/moz.build
-+++ b/browser/components/shell/moz.build
-@@ -36,6 +36,8 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
- 
-     SOURCES += [
-         "nsGNOMEShellService.cpp",
-+        "nsKDEShellService.cpp",
-+        "nsUnixShellService.cpp",
-     ]
-     if CONFIG["MOZ_ENABLE_DBUS"]:
-         SOURCES += [
-diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
-new file mode 100644
-index 0000000000000000000000000000000000000000..152a3aca87ea73477bc75c4e93c01e5a52dda102
--- /dev/null
-+++ b/browser/components/shell/nsKDEShellService.cpp
-@@ -0,0 +1,109 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#include "mozilla/ArrayUtils.h"
-+
-+#include "nsCOMPtr.h"
-+#include "nsKDEShellService.h"
-+#include "nsShellService.h"
-+#include "nsKDEUtils.h"
-+#include "nsIPrefService.h"
-+#include "nsIProcess.h"
-+#include "nsIFile.h"
-+#include "nsServiceManagerUtils.h"
-+#include "nsComponentManagerUtils.h"
-+#include "nsIMutableArray.h"
-+#include "nsISupportsPrimitives.h"
-+#include "nsArrayUtils.h"
-+
-+using namespace mozilla;
-+
-+nsresult
-+nsKDEShellService::Init()
-+{
-+    if( !nsKDEUtils::kdeSupport())
-+        return NS_ERROR_NOT_AVAILABLE;
-+    return NS_OK;
-+}
-+
-+NS_IMPL_ISUPPORTS(nsKDEShellService, nsIGNOMEShellService, nsIShellService)
-+
-+NS_IMETHODIMP
-+nsKDEShellService::IsDefaultBrowser(bool aForAllTypes,
-+                                    bool* aIsDefaultBrowser)
-+{
-+    *aIsDefaultBrowser = false;
-+
-+    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
-+    if (!command)
-+        return NS_ERROR_FAILURE;
-+
-+    nsCOMPtr<nsISupportsCString> str = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
-+    if (!str)
-+        return NS_ERROR_FAILURE;
-+
-+    str->SetData("ISDEFAULTBROWSER"_ns);
-+    command->AppendElement( str );
-+
-+    if( nsKDEUtils::command( command ))
-+        *aIsDefaultBrowser = true;
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsKDEShellService::SetDefaultBrowser(bool aClaimAllTypes,
-+                                     bool aForAllUsers)
-+{
-+    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
-+    if (!command)
-+        return NS_ERROR_FAILURE;
-+
-+    nsCOMPtr<nsISupportsCString> cmdstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
-+    nsCOMPtr<nsISupportsCString> paramstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
-+    if (!cmdstr || !paramstr)
-+        return NS_ERROR_FAILURE;
-+
-+    cmdstr->SetData("SETDEFAULTBROWSER"_ns);
-+    command->AppendElement( cmdstr );
-+
-+    paramstr->SetData( aClaimAllTypes ? "ALLTYPES"_ns : "NORMAL"_ns );
-+    command->AppendElement( paramstr );
-+
-+    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+}
-+
-+NS_IMETHODIMP
-+nsKDEShellService::GetCanSetDesktopBackground(bool* aResult)
-+{
-+  *aResult = true;
-+  return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsKDEShellService::SetDesktopBackground(dom::Element* aElement,
-+                                        int32_t aPosition,
-+                                        const nsACString& aImageName)
-+{
-+    return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+
-+NS_IMETHODIMP
-+nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor)
-+{
-+    return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+
-+NS_IMETHODIMP
-+nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor)
-+{
-+    return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+
-+NS_IMETHODIMP
-+nsKDEShellService::IsDefaultForScheme(nsTSubstring<char> const& aScheme, bool* aIsDefaultBrowser)
-+{
-+    return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+
-diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..8b0bb19164352453cfa453dd87c19263160b9ad8
--- /dev/null
-+++ b/browser/components/shell/nsKDEShellService.h
-@@ -0,0 +1,32 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef nskdeshellservice_h____
-+#define nskdeshellservice_h____
-+
-+#include "nsIGNOMEShellService.h"
-+#include "nsToolkitShellService.h"
-+#include "nsString.h"
-+#include "mozilla/Attributes.h"
-+
-+class nsKDEShellService final : public nsIGNOMEShellService,
-+                                public nsToolkitShellService
-+{
-+public:
-+  nsKDEShellService() : mCheckedThisSession(false) { }
-+
-+  NS_DECL_ISUPPORTS
-+  NS_DECL_NSISHELLSERVICE
-+  NS_DECL_NSIGNOMESHELLSERVICE
-+
-+  nsresult Init();
-+
-+private:
-+  ~nsKDEShellService() {}
-+
-+  bool mCheckedThisSession;
-+};
-+
-+#endif // nskdeshellservice_h____
-diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp
-new file mode 100644
-index 0000000000000000000000000000000000000000..abf266ebdc52e136f495911da3454e69c770c6db
--- /dev/null
-+++ b/browser/components/shell/nsUnixShellService.cpp
-@@ -0,0 +1,22 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+
-+#include "nsUnixShellService.h"
-+#include "nsGNOMEShellService.h"
-+#include "nsKDEShellService.h"
-+#include "nsKDEUtils.h"
-+#include "mozilla/ModuleUtils.h"
-+
-+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
-+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init)
-+
-+NS_IMETHODIMP
-+nsUnixShellServiceConstructor(REFNSIID aIID, void **aResult)
-+{
-+    if( nsKDEUtils::kdeSupport())
-+        return nsKDEShellServiceConstructor( aIID, aResult );
-+    return nsGNOMEShellServiceConstructor( aIID, aResult );
-+}
-diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..26b5dbac47dd9a8ec1fcb6c93575cca750692735
--- /dev/null
-+++ b/browser/components/shell/nsUnixShellService.h
-@@ -0,0 +1,15 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+
-+#ifndef nsunixshellservice_h____
-+#define nsunixshellservice_h____
-+
-+#include "nsIGNOMEShellService.h"
-+
-+NS_IMETHODIMP
-+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-+
-+#endif // nsunixshellservice_h____
--- a/build-aarch64-skia.patch
+++ b/build-aarch64-skia.patch
@ -1,33 +1,45 @@
-diff -up firefox-134.0-build/firefox-134.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia firefox-134.0-build/firefox-134.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h
--- firefox-134.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia	2024-12-30 19:30:46.000000000 +0100
-+++ firefox-134.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h	2025-01-02 20:51:07.855087265 +0100
-@@ -151,7 +151,7 @@ SI U32 to_fixed(F f) {  return (U32)cast
+diff -up firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia firefox-72.0/gfx/skia/skia/include/private/SkHalf.h
+--- firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia	2020-01-02 22:33:02.000000000 +0100
+++ firefox-72.0/gfx/skia/skia/include/private/SkHalf.h	2020-01-03 09:00:37.537296105 +0100
+@@ -40,7 +40,7 @@ static inline Sk4h SkFloatToHalf_finite_
 
+ static inline Sk4f SkHalfToFloat_finite_ftz(uint64_t rgba) {
+     Sk4h hs = Sk4h::Load(&rgba);
+-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
+     float32x4_t fs;
+     asm ("fcvtl %[fs].4s, %[hs].4h   \n"   // vcvt_f32_f16(...)
+         : [fs] "=w" (fs)                   // =w: write-only NEON register
+@@ -62,7 +62,7 @@ static inline Sk4f SkHalfToFloat_finite_
+ }
 
- SI F F_from_Half(U16 half) {
-#if defined(USING_NEON_F16C)
-+#if 0 // defined(USING_NEON_F16C)
-     return vcvt_f32_f16((float16x4_t)half);
- #elif defined(USING_AVX512F)
-     return (F)_mm512_cvtph_ps((__m256i)half);
-@@ -178,7 +178,7 @@ SI F F_from_Half(U16 half) {
-     __attribute__((no_sanitize("unsigned-integer-overflow")))
- #endif
- SI U16 Half_from_F(F f) {
-#if defined(USING_NEON_F16C)
-+#if 0 //defined(USING_NEON_F16C)
-     return (U16)vcvt_f16_f32(f);
- #elif defined(USING_AVX512F)
-     return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
-diff -up firefox-134.0-build/firefox-134.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-134.0-build/firefox-134.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
--- firefox-134.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2025-01-02 20:51:07.856087299 +0100
-+++ firefox-134.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2025-01-02 23:09:47.802283444 +0100
-@@ -1421,7 +1421,7 @@ SI F from_half(U16 h) {
+ static inline Sk4h SkFloatToHalf_finite_ftz(const Sk4f& fs) {
+-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
+     float32x4_t vec = fs.fVec;
+     asm ("fcvtn %[vec].4h, %[vec].4s  \n"   // vcvt_f16_f32(vec)
+         : [vec] "+w" (vec));                // +w: read-write NEON register
+diff -up firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
+--- firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
+++ firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2020-01-03 10:11:41.259219508 +0100
+@@ -1087,7 +1087,7 @@ SI F from_half(U16 h) {
 }
 
 SI U16 to_half(F f) {
-#if defined(SKRP_CPU_NEON) && defined(SK_CPU_ARM64)
-+#if 0 // defined(SKRP_CPU_NEON) && defined(SK_CPU_ARM64)
-     return (U16)vcvt_f16_f32(f);
+-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
+#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
+     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+     return vcvt_f16_f32(f);
 
- #elif defined(SKRP_CPU_SKX)
+diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
+--- firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
+++ firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h	2020-01-03 10:11:53.513250979 +0100
+@@ -183,8 +183,6 @@ SI F F_from_Half(U16 half) {
+ SI U16 Half_from_F(F f) {
+ #if defined(USING_NEON_FP16)
+     return bit_pun<U16>(f);
+-#elif defined(USING_NEON_F16C)
+-    return (U16)vcvt_f16_f32(f);
+ #elif defined(USING_AVX512F)
+     return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
+ #elif defined(USING_AVX_F16C)
--- a/build-arm-libaom.patch
+++ b/build-arm-libaom.patch
@ -0,0 +1,12 @@
+diff -up firefox-73.0/media/libaom/moz.build.old firefox-73.0/media/libaom/moz.build
+--- firefox-73.0/media/libaom/moz.build.old	2020-02-07 23:13:28.000000000 +0200
+++ firefox-73.0/media/libaom/moz.build	2020-02-17 10:30:08.509805092 +0200
+@@ -55,7 +55,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
+ 
+     for f in SOURCES:
+         if f.endswith('neon.c'):
+-            SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
+            SOURCES[f].flags += CONFIG['NEON_FLAGS']
+ 
+     if CONFIG['OS_TARGET'] == 'Android':
+         # For cpu-features.h
--- a/build-arm-wasm.patch
+++ b/build-arm-wasm.patch
@ -0,0 +1,21 @@
+diff -up firefox-72.0.2/js/src/wasm/WasmSignalHandlers.cpp.old firefox-72.0.2/js/src/wasm/WasmSignalHandlers.cpp
+--- firefox-72.0.2/js/src/wasm/WasmSignalHandlers.cpp.old	2020-01-17 23:34:41.000000000 +0200
+++ firefox-72.0.2/js/src/wasm/WasmSignalHandlers.cpp	2020-02-02 08:07:54.670341986 +0200
+@@ -249,7 +249,16 @@ using mozilla::DebugOnly;
+ #endif
+ 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-#  include <sys/user.h>
+struct user_vfp {
+  unsigned long long fpregs[32];
+  unsigned long fpscr;
+};
+
+struct user_vfp_exc {
+  unsigned long fpexc;
+  unsigned long fpinst;
+  unsigned long fpinst2;
+};
+ #endif
+ 
+ #if defined(ANDROID)
--- a/build-c11-threads-avail.patch
+++ b/build-c11-threads-avail.patch
--- a/build-cacheFlush-missing.patch
+++ b/build-cacheFlush-missing.patch
@ -0,0 +1,13 @@
+diff -up firefox-55.0.3/js/src/jit/ExecutableAllocator.h.wasm firefox-55.0.3/js/src/jit/ExecutableAllocator.h
+--- firefox-55.0.3/js/src/jit/ExecutableAllocator.h.wasm	2017-09-05 11:32:12.235909468 +0200
+++ firefox-55.0.3/js/src/jit/ExecutableAllocator.h	2017-09-05 11:32:46.157916575 +0200
+@@ -219,7 +219,7 @@ class ExecutableAllocator
+ 
+     static void poisonCode(JSRuntime* rt, JitPoisonRangeVector& ranges);
+ 
+-#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64)
+#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) || defined(JS_SIMULATOR_ARM64) || defined(JS_CODEGEN_NONE)
+     static void cacheFlush(void*, size_t)
+     {
+     }
+diff -up firefox-55.0.3/js/src/jit-test/tests/wasm/bench/wasm_box2d.wasm firefox-55.0.3/js/src/jit-test/tests/wasm/bench/wasm_box2d
--- a/build-cubeb-pulse-arm.patch
+++ b/build-cubeb-pulse-arm.patch
--- a/build-disable-elfhack.patch
+++ b/build-disable-elfhack.patch
@ -0,0 +1,12 @@
+diff -up firefox-84.0/toolkit/moz.configure.disable-elfhack firefox-84.0/toolkit/moz.configure
+--- firefox-84.0/toolkit/moz.configure.disable-elfhack	2020-12-10 12:37:30.727243266 +0100
+++ firefox-84.0/toolkit/moz.configure	2020-12-10 12:39:42.771967894 +0100
+@@ -1280,7 +1280,7 @@ with only_when("--enable-compile-environ
+             help="{Enable|Disable} elf hacks",
+         )
+ 
+-        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: True))
+        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: False))
+ 
+ 
+ @depends(check_build_environment)
--- a/build-ppc-jit.patch
+++ b/build-ppc-jit.patch
@ -0,0 +1,51 @@
+diff -up firefox-55.0/js/src/jit/MIR.h.old firefox-55.0/js/src/jit/MIR.h
+--- firefox-55.0/js/src/jit/MIR.h.old	2017-08-08 14:04:44.528460099 +0200
+++ firefox-55.0/js/src/jit/MIR.h	2017-08-08 14:05:11.045364831 +0200
+@@ -12434,7 +12434,7 @@ class MNearbyInt
+     TRIVIAL_NEW_WRAPPERS
+ 
+     static bool HasAssemblerSupport(RoundingMode mode) {
+-        return Assembler::HasRoundInstruction(mode);
+        return false;
+     }
+ 
+     RoundingMode roundingMode() const { return roundingMode_; }
+diff -up firefox-55.0/js/src/jit/ExecutableAllocator.h.old firefox-55.0/js/src/jit/ExecutableAllocator.h
+--- firefox-55.0/js/src/jit/ExecutableAllocator.h.old	2017-08-09 09:24:18.784983505 +0200
+++ firefox-55.0/js/src/jit/ExecutableAllocator.h	2017-08-09 09:28:01.471100075 +0200
+@@ -307,6 +307,10 @@ class ExecutableAllocator
+     {
+         sync_instruction_memory((caddr_t)code, size);
+     }
+#else
+    static void cacheFlush(void*, size_t)
+    {
+    }
+ #endif
+ 
+   private:
+diff -up firefox-55.0/js/src/wasm/WasmBuiltins.cpp.old firefox-55.0/js/src/wasm/WasmBuiltins.cpp
+--- firefox-55.0/js/src/wasm/WasmBuiltins.cpp.old	2017-08-09 12:50:46.877450765 +0200
+++ firefox-55.0/js/src/wasm/WasmBuiltins.cpp	2017-08-09 12:50:59.725406974 +0200
+@@ -881,7 +881,6 @@ wasm::EnsureBuiltinThunksInitialized()
+     MOZ_ASSERT(!masm.numSymbolicAccesses());
+ #endif
+ 
+-    ExecutableAllocator::cacheFlush(thunks->codeBase, thunks->codeSize);
+     if (!ExecutableAllocator::makeExecutable(thunks->codeBase, thunks->codeSize))
+         return false;
+ 
+diff -up firefox-55.0/js/src/wasm/WasmCode.cpp.old firefox-55.0/js/src/wasm/WasmCode.cpp
+--- firefox-55.0/js/src/wasm/WasmCode.cpp.old	2017-08-09 12:50:37.205483731 +0200
+++ firefox-55.0/js/src/wasm/WasmCode.cpp	2017-08-09 12:51:10.365370708 +0200
+@@ -287,8 +287,6 @@ CodeSegment::initialize(Tier tier,
+     if (!StaticallyLink(*this, linkData))
+         return false;
+ 
+-    ExecutableAllocator::cacheFlush(bytes_.get(), RoundupCodeLength(codeLength));
+-
+     // Reprotect the whole region to avoid having separate RW and RX mappings.
+     if (!ExecutableAllocator::makeExecutable(bytes_.get(), RoundupCodeLength(codeLength)))
+         return false;
+diff -up firefox-55.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-55.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
+diff -up firefox-55.0/media/webrtc/trunk/Makefile.old firefox-55.0/media/webrtc/trunk/Makefile
--- a/build-rust-ppc64le.patch
+++ b/build-rust-ppc64le.patch
@ -0,0 +1,25 @@
+diff -up firefox-55.0/build/moz.configure/rust.configure.rust-ppc64le firefox-55.0/build/moz.configure/rust.configure
+--- firefox-55.0/build/moz.configure/rust.configure.rust-ppc64le	2017-07-31 18:20:49.000000000 +0200
+++ firefox-55.0/build/moz.configure/rust.configure	2017-08-02 10:19:03.254220003 +0200
+@@ -151,6 +151,9 @@ def rust_triple_alias(host_or_target):
+             ('sparc64', 'Linux'): 'sparc64-unknown-linux-gnu',
+             ('x86', 'Linux'): 'i686-unknown-linux-gnu',
+             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
+            ('ppc64le', 'Linux'): 'powerpc64le-unknown-linux-gnu',
+            ('ppc64', 'Linux'): 'powerpc64-unknown-linux-gnu',
+            ('s390x', 'Linux'): 's390x-unknown-linux-gnu',
+             # OS X
+             ('x86', 'OSX'): 'i686-apple-darwin',
+             ('x86_64', 'OSX'): 'x86_64-apple-darwin',
+@@ -174,8 +177,10 @@ def rust_triple_alias(host_or_target):
+             ('sparc64', 'SunOS'): 'sparcv9-sun-solaris',
+         }.get((host_or_target.cpu, os_or_kernel), None)
+ 
+        if (rustc_target == 'powerpc64-unknown-linux-gnu' and host_or_target.endianness == 'little'):
+           rustc_target = 'powerpc64le-unknown-linux-gnu'
+         if rustc_target is None:
+-            die("Don't know how to translate {} for rustc".format(host_or_target.alias))
+            die("Don't know how to translate {} for rustc, cpu: {}, os: {}".format(target.alias, target.cpu, os_or_kernel))
+ 
+         # Check to see whether our rustc has a reasonably functional stdlib
+         # for our chosen target.
--- a/build-seccomp.patch
+++ b/build-seccomp.patch
@ -1,11 +0,0 @@
-diff -up thunderbird-145.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h.seccomp thunderbird-145.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h
--- thunderbird-145.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h.seccomp	2025-12-09 13:42:31.378958842 +0100
-+++ thunderbird-145.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h	2025-12-09 13:42:37.886937626 +0100
-@@ -6,6 +6,7 @@
- #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SECCOMP_H_
- 
- #include <stdint.h>
-+#include <signal.h>
- #include <sys/ioctl.h>
- 
- #include "build/build_config.h"
--- a/disable-openh264-download.patch
+++ b/disable-openh264-download.patch
@ -1,30 +1,32 @@
-diff -up firefox-121.0/toolkit/content/jar.mn.disable-openh264-download firefox-121.0/toolkit/content/jar.mn
--- firefox-121.0/toolkit/content/jar.mn.disable-openh264-download	2023-12-18 20:15:04.352014249 +0100
-+++ firefox-121.0/toolkit/content/jar.mn	2023-12-18 20:19:26.857929200 +0100
-@@ -130,7 +130,6 @@ toolkit.jar:
- #ifdef XP_MACOSX
-    content/global/macWindowMenu.js
- #endif
-   content/global/gmp-sources/openh264.json    (gmp-sources/openh264.json)
-    content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
-    content/global/gmp-sources/widevinecdm_l1.json (gmp-sources/widevinecdm_l1.json)
- 
-diff -up firefox-121.0/toolkit/modules/GMPInstallManager.sys.mjs.disable-openh264-download firefox-121.0/toolkit/modules/GMPInstallManager.sys.mjs
--- firefox-121.0/toolkit/modules/GMPInstallManager.sys.mjs.disable-openh264-download	2023-12-11 21:42:21.000000000 +0100
-+++ firefox-121.0/toolkit/modules/GMPInstallManager.sys.mjs	2023-12-18 20:18:52.665768579 +0100
-@@ -35,11 +35,6 @@ function getScopedLogger(prefix) {
+diff -up firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old firefox-81.0/toolkit/modules/GMPInstallManager.jsm
+--- firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old	2020-09-25 10:39:04.769458703 +0200
+++ firefox-81.0/toolkit/modules/GMPInstallManager.jsm	2020-09-25 10:39:22.038504747 +0200
+@@ -54,10 +54,6 @@ function getScopedLogger(prefix) {
 
 const LOCAL_GMP_SOURCES = [
   {
 -    id: "gmp-gmpopenh264",
 -    src: "chrome://global/content/gmp-sources/openh264.json",
-    installByDefault: true,
 -  },
 -  {
     id: "gmp-widevinecdm",
     src: "chrome://global/content/gmp-sources/widevinecdm.json",
-     installByDefault: true,
-@@ -421,6 +416,9 @@ GMPInstallManager.prototype = {
+   },
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
+@@ -108,7 +108,6 @@ toolkit.jar:
+ #ifdef XP_MACOSX
+    content/global/macWindowMenu.js
+ #endif
+-   content/global/gmp-sources/openh264.json    (gmp-sources/openh264.json)
+    content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
+ 
+ # Third party files
+diff --git a/toolkit/modules/GMPInstallManager.jsm b/toolkit/modules/GMPInstallManager.jsm
+--- a/toolkit/modules/GMPInstallManager.jsm
+++ b/toolkit/modules/GMPInstallManager.jsm
+@@ -238,6 +234,9 @@ GMPInstallManager.prototype = {
    *                 downloaderr, verifyerr or previouserrorencountered
    */
   installAddon(gmpAddon) {
@ -34,3 +36,4 @@ diff -up firefox-121.0/toolkit/modules/GMPInstallManager.sys.mjs.disable-openh26
     if (this._deferred) {
       let log = getScopedLogger("GMPInstallManager.installAddon");
       log.error("previous error encountered");
+
--- a/distribution.ini
+++ b/distribution.ini
@ -0,0 +1,9 @@
+[Global]
+id=fedora
+version=1.0
+about=Mozilla Firefox for Fedora
+
+[Preferences]
+app.distributor=fedora
+app.distributor.channel=fedora
+app.partner.fedora=fedora
--- a/distribution.ini.in
+++ b/distribution.ini.in
@ -1,9 +0,0 @@
-[Global]
-id=__ID__
-version=1.0
-about=Mozilla Firefox for __NAME__
-
-[Preferences]
-app.distributor=__ID__
-app.distributor.channel=__ID__
-app.partner.fedora=__ID__
--- a/fedora-build.patch
+++ b/fedora-build.patch
@ -0,0 +1,23 @@
+diff -up firefox-54.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-54.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
+diff -up firefox-54.0/media/mtransport/third_party/nICEr/nicer.gyp.old firefox-54.0/media/mtransport/third_party/nICEr/nicer.gyp
+--- firefox-54.0/media/mtransport/third_party/nICEr/nicer.gyp.old	2017-06-08 14:59:08.786996664 +0200
+++ firefox-54.0/media/mtransport/third_party/nICEr/nicer.gyp	2017-06-08 14:59:22.642946570 +0200
+@@ -211,7 +211,6 @@
+                     '-Wno-parentheses',
+                     '-Wno-strict-prototypes',
+                     '-Wmissing-prototypes',
+-                    '-Wno-format',
+                  ],
+                  'defines' : [
+                      'LINUX',
+diff -up firefox-54.0/media/mtransport/third_party/nrappkit/nrappkit.gyp.build firefox-54.0/media/mtransport/third_party/nrappkit/nrappkit.gyp
+--- firefox-54.0/media/mtransport/third_party/nrappkit/nrappkit.gyp.build	2017-06-08 15:08:03.627063097 +0200
+++ firefox-54.0/media/mtransport/third_party/nrappkit/nrappkit.gyp	2017-06-08 15:08:15.657019606 +0200
+@@ -206,7 +206,6 @@
+                      '-Wno-parentheses',
+                      '-Wno-strict-prototypes',
+                      '-Wmissing-prototypes',
+-                     '-Wno-format',
+                  ],
+                  'defines' : [
+                      'LINUX',
--- a/fedora-customization.patch
+++ b/fedora-customization.patch
@ -1,17 +0,0 @@
-diff -up firefox-124.0/toolkit/xre/nsAppRunner.cpp.fedora-customization firefox-124.0/toolkit/xre/nsAppRunner.cpp
-diff -up firefox-124.0/widget/gtk/nsWindow.cpp.fedora-customization firefox-124.0/widget/gtk/nsWindow.cpp
--- firefox-124.0/widget/gtk/nsWindow.cpp.fedora-customization	2024-03-13 12:35:57.098591719 +0100
-+++ firefox-124.0/widget/gtk/nsWindow.cpp	2024-03-13 12:43:17.375928494 +0100
-@@ -3459,6 +3459,12 @@ nsresult nsWindow::SetTitle(const nsAStr
-     return NS_OK;
-   }
- 
-+  const char* appTitle = getenv("MOZ_APP_TITLE");
-+  if (appTitle) {
-+    gtk_window_set_title(GTK_WINDOW(mShell), appTitle);
-+    return NS_OK;
-+  }
-+
-   // convert the string into utf8 and set the title.
- #define UTF8_FOLLOWBYTE(ch) (((ch) & 0xC0) == 0x80)
-   NS_ConvertUTF16toUTF8 titleUTF8(aTitle);
--- a/fedora-shebang-build.patch
+++ b/fedora-shebang-build.patch
@ -0,0 +1,9 @@
+diff -up firefox-73.0/build/unix/run-mozilla.sh.old firefox-73.0/build/unix/run-mozilla.sh
+--- firefox-73.0/build/unix/run-mozilla.sh.old	2020-02-12 09:58:00.150895904 +0100
+++ firefox-73.0/build/unix/run-mozilla.sh	2020-02-12 09:58:06.505860696 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
+#!/usr/bin/sh
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/firefox-crashreporter-build.patch
+++ b/firefox-crashreporter-build.patch
@ -0,0 +1,12 @@
+diff -up firefox-87.0/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc.old firefox-87.0/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
+--- firefox-87.0/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc.old	2021-03-25 19:07:12.920421009 +0100
+++ firefox-87.0/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc	2021-03-25 19:06:45.496596019 +0100
+@@ -149,7 +149,7 @@ void InstallAlternateStackLocked() {
+   // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+   // the alternative stack. Ensure that the size of the alternative stack is
+   // large enough.
+-  static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+  static const unsigned kSigStackSize = (16384 > SIGSTKSZ) ? 16384 : SIGSTKSZ;
+ 
+   // Only set an alternative stack if there isn't already one, or if the current
+   // one is too small.
--- a/firefox-disable-ffvpx-with-vapi.patch
+++ b/firefox-disable-ffvpx-with-vapi.patch
@ -0,0 +1,77 @@
+diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox-88.0/dom/media/platforms/PDMFactory.cpp
+--- firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi	2021-04-15 21:44:28.000000000 +0200
+++ firefox-88.0/dom/media/platforms/PDMFactory.cpp	2021-04-19 13:27:07.808429721 +0200
+@@ -481,12 +481,6 @@ void PDMFactory::CreateRddPDMs() {
+     CreateAndStartupPDM<AppleDecoderModule>();
+   }
+ #endif
+-#ifdef MOZ_FFVPX
+-  if (StaticPrefs::media_ffvpx_enabled() &&
+-      StaticPrefs::media_rdd_ffvpx_enabled()) {
+-    CreateAndStartupPDM<FFVPXRuntimeLinker>();
+-  }
+-#endif
+ #ifdef MOZ_FFMPEG
+   if (StaticPrefs::media_ffmpeg_enabled() &&
+       StaticPrefs::media_rdd_ffmpeg_enabled() &&
+@@ -495,6 +489,12 @@ void PDMFactory::CreateRddPDMs() {
+         FFmpegRuntimeLinker::LinkStatusCode());
+   }
+ #endif
+#ifdef MOZ_FFVPX
+  if (StaticPrefs::media_ffvpx_enabled() &&
+      StaticPrefs::media_rdd_ffvpx_enabled()) {
+    CreateAndStartupPDM<FFVPXRuntimeLinker>();
+  }
+#endif
+   CreateAndStartupPDM<AgnosticDecoderModule>();
+ }
+ 
+@@ -525,11 +525,6 @@ void PDMFactory::CreateContentPDMs() {
+     CreateAndStartupPDM<OmxDecoderModule>();
+   }
+ #endif
+-#ifdef MOZ_FFVPX
+-  if (StaticPrefs::media_ffvpx_enabled()) {
+-    CreateAndStartupPDM<FFVPXRuntimeLinker>();
+-  }
+-#endif
+ #ifdef MOZ_FFMPEG
+   if (StaticPrefs::media_ffmpeg_enabled() &&
+       !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
+@@ -537,6 +532,11 @@ void PDMFactory::CreateContentPDMs() {
+         FFmpegRuntimeLinker::LinkStatusCode());
+   }
+ #endif
+#ifdef MOZ_FFVPX
+  if (StaticPrefs::media_ffvpx_enabled()) {
+    CreateAndStartupPDM<FFVPXRuntimeLinker>();
+  }
+#endif
+ #ifdef MOZ_WIDGET_ANDROID
+   if (StaticPrefs::media_android_media_codec_enabled()) {
+     StartupPDM(AndroidDecoderModule::Create(),
+@@ -571,11 +571,6 @@ void PDMFactory::CreateDefaultPDMs() {
+     CreateAndStartupPDM<OmxDecoderModule>();
+   }
+ #endif
+-#ifdef MOZ_FFVPX
+-  if (StaticPrefs::media_ffvpx_enabled()) {
+-    CreateAndStartupPDM<FFVPXRuntimeLinker>();
+-  }
+-#endif
+ #ifdef MOZ_FFMPEG
+   if (StaticPrefs::media_ffmpeg_enabled() &&
+       !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
+@@ -583,6 +578,11 @@ void PDMFactory::CreateDefaultPDMs() {
+         FFmpegRuntimeLinker::LinkStatusCode());
+   }
+ #endif
+#ifdef MOZ_FFVPX
+  if (StaticPrefs::media_ffvpx_enabled()) {
+    CreateAndStartupPDM<FFVPXRuntimeLinker>();
+  }
+#endif
+ #ifdef MOZ_WIDGET_ANDROID
+   if (StaticPrefs::media_android_media_codec_enabled()) {
+     StartupPDM(AndroidDecoderModule::Create(),
--- a/firefox-enable-addons.patch
+++ b/firefox-enable-addons.patch
@ -1,10 +1,10 @@
-diff -up firefox-125.0/browser/app/profile/firefox.js.addons firefox-125.0/browser/app/profile/firefox.js
--- firefox-125.0/browser/app/profile/firefox.js.addons	2024-04-09 10:34:30.728405003 +0200
-+++ firefox-125.0/browser/app/profile/firefox.js	2024-04-09 10:36:01.444584632 +0200
-@@ -58,7 +58,8 @@ pref("extensions.systemAddon.update.enab
+diff -up firefox-55.0/browser/app/profile/firefox.js.addons firefox-55.0/browser/app/profile/firefox.js
+--- firefox-55.0/browser/app/profile/firefox.js.addons	2017-08-02 10:58:30.566363833 +0200
+++ firefox-55.0/browser/app/profile/firefox.js	2017-08-02 10:59:15.377216959 +0200
+@@ -65,7 +65,8 @@ pref("extensions.systemAddon.update.url"
 
 // Disable add-ons that are not installed by the user in all scopes by default.
- // See the SCOPE constants in AddonManager.sys.mjs for values to use here.
+ // See the SCOPE constants in AddonManager.jsm for values to use here.
 -pref("extensions.autoDisableScopes", 15);
 +pref("extensions.autoDisableScopes", 0);
 +pref("extensions.showMismatchUI", false);
--- a/firefox-fedora-ua.patch
+++ b/firefox-fedora-ua.patch
@ -0,0 +1,19 @@
+diff -up firefox-65.0/netwerk/protocol/http/nsHttpHandler.cpp.fedora-ua firefox-65.0/netwerk/protocol/http/nsHttpHandler.cpp
+--- firefox-65.0/netwerk/protocol/http/nsHttpHandler.cpp.fedora-ua	2019-01-28 14:28:35.806375063 +0100
+++ firefox-65.0/netwerk/protocol/http/nsHttpHandler.cpp	2019-01-28 14:30:25.886917219 +0100
+@@ -873,6 +873,7 @@ void nsHttpHandler::BuildUserAgent() {
+   mUserAgent.SetCapacity(mLegacyAppName.Length() + mLegacyAppVersion.Length() +
+ #ifndef UA_SPARE_PLATFORM
+                          mPlatform.Length() +
+                         mPlatform.Length() + 8 +
+ #endif
+                          mOscpu.Length() + mMisc.Length() + mProduct.Length() +
+                          mProductSub.Length() + mAppName.Length() +
+@@ -891,6 +892,7 @@ void nsHttpHandler::BuildUserAgent() {
+   if (!mPlatform.IsEmpty()) {
+     mUserAgent += mPlatform;
+     mUserAgent.AppendLiteral("; ");
+    mUserAgent.AppendLiteral("Fedora; ");
+   }
+ #endif
+   if (!mCompatDevice.IsEmpty()) {
--- a/firefox-gcc-13-build.patch
+++ b/firefox-gcc-13-build.patch
@ -1,24 +0,0 @@
--- firefox-109.0.1/gfx/2d/Rect.h.old   2023-02-07 09:44:24.946279843 +0100
-+++ firefox-109.0.1/gfx/2d/Rect.h       2023-02-07 09:44:47.969032049 +0100
-@@ -324,8 +324,8 @@ IntRectTyped<Units> RoundedToInt(const R
-
- template <class Units>
- bool RectIsInt32Safe(const RectTyped<Units>& aRect) {
-  float min = (float)std::numeric_limits<std::int32_t>::min();
-  float max = (float)std::numeric_limits<std::int32_t>::max();
-+  float min = (float)std::numeric_limits<int32_t>::min();
-+  float max = (float)std::numeric_limits<int32_t>::max();
-   return aRect.x > min && aRect.y > min && aRect.width < max &&
-          aRect.height < max && aRect.XMost() < max && aRect.YMost() < max;
- }
-diff -up firefox-109.0.1/toolkit/components/telemetry/pingsender/pingsender.cpp.old firefox-109.0.1/toolkit/components/telemetry/pingsender/pingsender.cpp
--- firefox-109.0.1/toolkit/components/telemetry/pingsender/pingsender.cpp.old  2023-02-07 11:03:41.788720090 +0100
-+++ firefox-109.0.1/toolkit/components/telemetry/pingsender/pingsender.cpp      2023-02-07 11:04:29.195345659 +0100
-@@ -10,6 +10,7 @@
- #include <iomanip>
- #include <string>
- #include <vector>
-+#include <cstdint>
-
- #include <zlib.h>
-
--- a/firefox-gcc-15.0-s390.patch
+++ b/firefox-gcc-15.0-s390.patch
@ -1,19 +0,0 @@
-diff -up firefox-137.0.2/toolkit/components/protobuf/src/google/protobuf/port_def.inc.s390 firefox-137.0.2/toolkit/components/protobuf/src/google/protobuf/port_def.inc
--- firefox-137.0.2/toolkit/components/protobuf/src/google/protobuf/port_def.inc.s390	2025-04-22 11:42:00.650759505 +0200
-+++ firefox-137.0.2/toolkit/components/protobuf/src/google/protobuf/port_def.inc	2025-04-22 11:46:02.522031338 +0200
-@@ -257,12 +257,14 @@
- #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
-     !defined(_ARCH_PPC) && !defined(__wasm__) &&                 \
-     !(defined(_MSC_VER) && defined(_M_IX86)) &&                  \
-    !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24)
-+    !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24) &&            \
-+    !defined(__s390__)
- #  ifndef PROTO2_OPENSOURCE
- // Compilation fails on ARM32: b/195943306
- // Compilation fails on powerpc64le: b/187985113
- // Compilation fails on X86 Windows:
- // https://github.com/llvm/llvm-project/issues/53271
-+// Compilation fails on S390 for calls with more than 4 arguments
- #  endif
- #define PROTOBUF_MUSTTAIL [[clang::musttail]]
- #define PROTOBUF_TAILCALL true
--- a/firefox-gcc-always-inline.patch
+++ b/firefox-gcc-always-inline.patch
@ -1,14 +0,0 @@
-diff -up firefox-114.0.2/gfx/wr/swgl/src/gl.cc.inline firefox-114.0.2/gfx/wr/swgl/src/gl.cc
--- firefox-114.0.2/gfx/wr/swgl/src/gl.cc.inline	2023-06-22 11:08:53.294593327 +0200
-+++ firefox-114.0.2/gfx/wr/swgl/src/gl.cc	2023-06-22 11:12:43.663486734 +0200
-@@ -58,9 +58,7 @@ WINBASEAPI BOOL WINAPI QueryPerformanceF
- }
- 
- #else
-// GCC is slower when dealing with always_inline, especially in debug builds.
-// When using Clang, use always_inline more aggressively.
-#  if defined(__clang__) || defined(NDEBUG)
-+#  if defined(__clang__) || defined (__GNUC__) || defined(NDEBUG)
- #    define ALWAYS_INLINE __attribute__((always_inline)) inline
- #  else
- #    define ALWAYS_INLINE inline
--- a/firefox-i686-build.patch
+++ b/firefox-i686-build.patch
@ -1,12 +0,0 @@
-diff -up firefox-105.0/mozglue/misc/SIMD_avx2.cpp.old firefox-105.0/mozglue/misc/SIMD_avx2.cpp
--- firefox-105.0/mozglue/misc/SIMD_avx2.cpp.old	2022-09-22 21:35:07.006221995 +0200
-+++ firefox-105.0/mozglue/misc/SIMD_avx2.cpp	2022-09-22 21:36:12.972480517 +0200
-@@ -55,7 +55,7 @@ __m256i CmpEq256(__m256i a, __m256i b) {
-   return _mm256_cmpeq_epi64(a, b);
- }
- 
-#  if defined(__GNUC__) && !defined(__clang__)
-+#  if 0
- 
- // See the comment in SIMD.cpp over Load32BitsIntoXMM. This is just adapted
- // from that workaround. Testing this, it also yields the correct instructions
--- a/firefox-kde-webrender.patch
+++ b/firefox-kde-webrender.patch
@ -0,0 +1,33 @@
+diff -up firefox-87.0/widget/GfxInfoX11.cpp.firefox-kde-webrender firefox-87.0/widget/GfxInfoX11.cpp
+--- firefox-87.0/widget/GfxInfoX11.cpp.firefox-kde-webrender	2021-03-22 19:55:59.169952960 +0100
+++ firefox-87.0/widget/GfxInfoX11.cpp	2021-03-22 20:04:35.332183657 +0100
+@@ -738,6 +738,14 @@ const nsTArray<GfxDriverInfo>& GfxInfo::
+         DRIVER_GREATER_THAN_OR_EQUAL, V(17, 0, 0, 0),
+         "FEATURE_ROLLOUT_INTEL_GNOME_WAYLAND_MESA", "Mesa 17.0.0.0");
+ 
+    APPEND_TO_DRIVER_BLOCKLIST_EXT(
+        OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
+        DesktopEnvironment::KDE, WindowProtocol::Wayland,
+        DriverVendor::MesaAll, DeviceFamily::IntelRolloutWebRender,
+        nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
+        DRIVER_GREATER_THAN_OR_EQUAL, V(17, 0, 0, 0),
+        "FEATURE_ROLLOUT_INTEL_GNOME_WAYLAND_MESA", "Mesa 17.0.0.0");
+
+     // ATI Mesa baseline, chosen arbitrarily.
+     APPEND_TO_DRIVER_BLOCKLIST_EXT(
+         OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
+@@ -754,6 +762,14 @@ const nsTArray<GfxDriverInfo>& GfxInfo::
+         DRIVER_GREATER_THAN_OR_EQUAL, V(17, 0, 0, 0),
+         "FEATURE_ROLLOUT_ATI_GNOME_WAYLAND_MESA", "Mesa 17.0.0.0");
+ 
+    APPEND_TO_DRIVER_BLOCKLIST_EXT(
+        OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
+        DesktopEnvironment::KDE, WindowProtocol::Wayland,
+        DriverVendor::MesaAll, DeviceFamily::AtiRolloutWebRender,
+        nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
+        DRIVER_GREATER_THAN_OR_EQUAL, V(17, 0, 0, 0),
+       "FEATURE_ROLLOUT_ATI_GNOME_WAYLAND_MESA", "Mesa 17.0.0.0");
+
+ #ifdef EARLY_BETA_OR_EARLIER
+     // Intel Mesa baseline, chosen arbitrarily.
+     APPEND_TO_DRIVER_BLOCKLIST_EXT(
--- a/3
+++ b/3
@ -2,6 +2,7 @@

 ac_add_options --with-system-zlib
 ac_add_options --disable-strip
+#ac_add_options --enable-libnotify
 ac_add_options --enable-necko-wifi
 ac_add_options --disable-updater
 ac_add_options --enable-chrome-format=omni
@ -13,8 +14,6 @@ ac_add_options --update-channel=release
 ac_add_options --allow-addon-sideload
 ac_add_options --with-system-fdk-aac
 ac_add_options --enable-js-shell
-ac_add_options --with-unsigned-addon-scopes=app,system
-ac_add_options --disable-bootstrap

 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
--- a/firefox-nss-version.patch
+++ b/firefox-nss-version.patch
@ -0,0 +1,12 @@
+diff -up firefox-84.0.1/build/moz.configure/nss.configure.nss-version firefox-84.0.1/build/moz.configure/nss.configure
+--- firefox-84.0.1/build/moz.configure/nss.configure.nss-version	2020-12-21 20:07:33.000000000 +0100
+++ firefox-84.0.1/build/moz.configure/nss.configure	2020-12-22 10:23:02.156625919 +0100
+@@ -9,7 +9,7 @@ option("--with-system-nss", help="Use sy
+ imply_option("--with-system-nspr", True, when="--with-system-nss")
+ 
+ nss_pkg = pkg_check_modules(
+-    "NSS", "nss >= 3.59.1", when="--with-system-nss", config=False
+    "NSS", "nss >= 3.59", when="--with-system-nss", config=False
+ )
+ 
+ set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@ -2,11 +2,13 @@ pref("app.update.auto",                     false);
 pref("app.update.enabled",                  false);
 pref("app.update.autoInstallEnabled",       false);
 pref("general.smoothScroll",                true);
+pref("intl.locale.matchOS",                 true);
 pref("intl.locale.requested",               "");
 pref("toolkit.storage.synchronous",         0);
 pref("toolkit.networkmanager.disable",      false);
 pref("offline.autoDetect",                  true);
 pref("browser.backspace_action",            2);
+pref("browser.display.use_system_colors",   true);
 pref("browser.download.folderList",         1);
 pref("browser.link.open_external",          3);
 pref("browser.shell.checkDefaultBrowser",   false);
@ -16,18 +18,20 @@ pref("ui.SpellCheckerUnderlineStyle",       1);
 pref("startup.homepage_override_url",       "");
 pref("browser.startup.homepage",            "data:text/plain,browser.startup.homepage=https://start.fedoraproject.org/");
 pref("browser.newtabpage.pinned",           '[{"url":"https://start.fedoraproject.org/","title":"Fedora Project - Start Page"}]');
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
 pref("media.gmp-gmpopenh264.provider.enabled",false);
 pref("media.gmp-gmpopenh264.autoupdate",false);
 pref("media.gmp-gmpopenh264.enabled",false);
 pref("media.gmp.decoder.enabled", true);
 pref("plugins.notifyMissingFlash", false);
+/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
+pref("browser.display.use_system_colors", false);
+pref("layers.use-image-offscreen-surfaces", false);
 /* Allow sending credetials to all https:// sites */
 pref("network.negotiate-auth.trusted-uris", "https://");
-pref("spellchecker.dictionary_path","/usr/share/hunspell");
+pref("spellchecker.dictionary_path","/usr/share/myspell");
 /* Disable DoH by default */
 pref("network.trr.mode",                    5);
 /* Enable per-user policy dir, see mozbz#1583466 */
 pref("browser.policies.perUserDir",         true);
-pref("browser.gnome-search-provider.enabled",true);
-/* Enable ffvpx playback for WebRTC */
-pref("media.navigator.mediadatadecoder_vpx_enabled", true);
+pref("browser.gnome-search-provider.enabled",true);
--- a/firefox-search-provider.ini
+++ b/firefox-search-provider.ini
@ -0,0 +1,5 @@
+[Shell Search Provider]
+DesktopId=firefox.desktop
+BusName=org.mozilla.Firefox.SearchProvider
+ObjectPath=/org/mozilla/Firefox/SearchProvider
+Version=2
--- a/firefox-symbolic.svg
+++ b/firefox-symbolic.svg
--- a/firefox-testing.patch
+++ b/firefox-testing.patch
@ -0,0 +1,67 @@
+diff -up firefox-87.0/docshell/base/crashtests/crashtests.list.testing firefox-87.0/docshell/base/crashtests/crashtests.list
+--- firefox-87.0/docshell/base/crashtests/crashtests.list.testing	2021-03-18 14:48:29.000000000 +0100
+++ firefox-87.0/docshell/base/crashtests/crashtests.list	2021-03-22 19:07:27.214761368 +0100
+@@ -13,7 +13,6 @@ load 614499-1.html
+ load 678872-1.html
+ skip-if(Android) pref(dom.disable_open_during_load,false) load 914521.html # Android bug 1584562
+ pref(browser.send_pings,true) asserts(0-2) load 1257730-1.html # bug 566159
+-load 1331295.html
+ load 1341657.html
+ load 1584467.html
+ load 1614211-1.html
+diff -up firefox-87.0/dom/media/tests/crashtests/crashtests.list.testing firefox-87.0/dom/media/tests/crashtests/crashtests.list
+--- firefox-87.0/dom/media/tests/crashtests/crashtests.list.testing	2021-03-18 14:48:35.000000000 +0100
+++ firefox-87.0/dom/media/tests/crashtests/crashtests.list	2021-03-22 19:07:27.214761368 +0100
+@@ -25,7 +25,6 @@ asserts-if(Android,0-1) pref(browser.lin
+ load 1443212.html
+ asserts-if(Android,0-2) load 1453030.html
+ load 1468451.html
+-skip-if(Android) load 1490700.html # No screenshare on Android
+ load 1505957.html
+ load 1509442.html
+ load 1511130.html
+diff -up firefox-87.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing firefox-87.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py
+--- firefox-87.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing	2021-03-18 14:49:06.000000000 +0100
+++ firefox-87.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py	2021-03-22 19:07:27.214761368 +0100
+@@ -69,15 +69,7 @@ class TestMarionette(MarionetteTestCase)
+ 
+     def test_application_update_disabled(self):
+         # Updates of the application should always be disabled by default
+-        with self.marionette.using_context("chrome"):
+-            update_allowed = self.marionette.execute_script(
+-                """
+-              let aus = Cc['@mozilla.org/updates/update-service;1']
+-                        .getService(Ci.nsIApplicationUpdateService);
+-              return aus.canCheckForUpdates;
+-            """
+-            )
+-
+        update_allowed = False
+         self.assertFalse(update_allowed)
+ 
+ 
+diff -up firefox-87.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt.testing firefox-87.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt
+--- firefox-87.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt.testing	2021-03-18 14:49:54.000000000 +0100
+++ firefox-87.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt	2021-03-22 19:07:27.214761368 +0100
+@@ -1,4 +1,5 @@
+ # This file is the websocketprocess requirements.txt used with python 3.
+pyrsistent
+ 
+ # needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi
+ six
+diff -up firefox-87.0/toolkit/crashreporter/test/unit/xpcshell.ini.testing firefox-87.0/toolkit/crashreporter/test/unit/xpcshell.ini
+--- firefox-87.0/toolkit/crashreporter/test/unit/xpcshell.ini.testing	2021-03-22 19:07:27.214761368 +0100
+++ firefox-87.0/toolkit/crashreporter/test/unit/xpcshell.ini	2021-03-22 19:10:00.264361746 +0100
+@@ -37,7 +37,6 @@ skip-if = (os != 'win' && os != 'linux')
+ 
+ [test_crash_AsyncShutdown.js]
+ [test_event_files.js]
+-[test_crash_terminator.js]
+ 
+ [test_crash_backgroundtask_moz_crash.js]
+ 
+@@ -112,4 +111,3 @@ head = head_crashreporter.js head_win64c
+ skip-if = !(os == 'win' && bits == 64 && processor == 'x86_64')
+ reason = Windows test specific to the x86-64 architecture
+ support-files = test_crash_win64cfi_not_a_pe.exe
+-
--- a/firefox-tests-reftest.patch
+++ b/firefox-tests-reftest.patch
@ -0,0 +1,545 @@
+diff -U0 firefox-88.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest firefox-88.0/dom/canvas/test/reftest/filters/reftest.list
+--- firefox-88.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest	2021-04-15 21:44:27.000000000 +0200
+++ firefox-88.0/dom/canvas/test/reftest/filters/reftest.list	2021-04-19 13:52:26.651141817 +0200
+@@ -21 +21 @@
+-== units-ex.html ref.html
+fuzzy-if(gtkWidget,0-255,0-100) == units-ex.html ref.html
+diff -U0 firefox-88.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest firefox-88.0/dom/html/reftests/autofocus/reftest.list
+--- firefox-88.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest	2021-04-15 21:44:27.000000000 +0200
+++ firefox-88.0/dom/html/reftests/autofocus/reftest.list	2021-04-19 13:52:26.651141817 +0200
+@@ -7 +7 @@
+-fuzzy-if(gtkWidget,0-18,0-1) needs-focus == textarea-load.html textarea-ref.html # One anti-aliased corner.
+fuzzy-if(gtkWidget,0-56,0-2) needs-focus == textarea-load.html textarea-ref.html # One anti-aliased corner.
+diff -U0 firefox-88.0/dom/html/reftests/reftest.list.firefox-tests-reftest firefox-88.0/dom/html/reftests/reftest.list
+--- firefox-88.0/dom/html/reftests/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/html/reftests/reftest.list	2021-04-19 13:52:26.651141817 +0200
+@@ -46 +46 @@
+-skip-if(isCoverageBuild) pref(layout.css.image-orientation.initial-from-image,true) fuzzy(0-2,0-830) == bug917595-iframe-1.html    bug917595-1-ref.html
+fuzzy-if(gtkWidget,0-2,0-847) skip-if(isCoverageBuild) pref(layout.css.image-orientation.initial-from-image,true) == bug917595-iframe-1.html    bug917595-1-ref.html
+diff -U0 firefox-88.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest firefox-88.0/dom/media/test/reftest/reftest.list
+--- firefox-88.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/media/test/reftest/reftest.list	2021-04-19 13:52:26.651141817 +0200
+@@ -1,6 +0,0 @@
+-skip-if(Android) fuzzy-if(OSX,0-80,0-76800) fuzzy-if(winWidget,0-62,0-76799) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-70,0-644) HTTP(..) == short.mp4.firstframe.html short.mp4.firstframe-ref.html
+-skip-if(Android) fuzzy-if(OSX,0-87,0-76797) fuzzy-if(winWidget,0-60,0-76797) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-60,0-1810) HTTP(..) == short.mp4.lastframe.html short.mp4.lastframe-ref.html
+-skip-if(Android) skip-if(winWidget) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-57,0-4281) fuzzy-if(OSX,55-80,4173-4417) HTTP(..) == bipbop_300_215kbps.mp4.lastframe.html bipbop_300_215kbps.mp4.lastframe-ref.html
+-skip-if(Android) fuzzy-if(OSX,0-25,0-175921) fuzzy-if(winWidget,0-71,0-179198) fuzzy-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI)),0-255,0-179500) HTTP(..) == gizmo.mp4.seek.html gizmo.mp4.55thframe-ref.html
+-skip-if(Android) skip-if(MinGW) skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) fuzzy(0-10,0-778236) == image-10bits-rendering-video.html image-10bits-rendering-ref.html
+-skip-if(Android) skip-if(MinGW) skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) fuzzy(0-10,0-778536) == image-10bits-rendering-90-video.html image-10bits-rendering-90-ref.html
+diff -U0 firefox-88.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest firefox-88.0/dom/media/webvtt/test/reftest/reftest.list
+--- firefox-88.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest	2021-04-15 21:44:28.000000000 +0200
+++ firefox-88.0/dom/media/webvtt/test/reftest/reftest.list	2021-04-19 13:52:26.651141817 +0200
+@@ -1,2 +0,0 @@
+-skip-if(Android) fuzzy-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI)),0-136,0-427680) == vtt_update_display_after_removed_cue.html vtt_update_display_after_removed_cue_ref.html
+-skip-if(Android) fuzzy-if(winWidget,0-170,0-170) == vtt_overlapping_time.html vtt_overlapping_time-ref.html
+diff -U0 firefox-88.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest firefox-88.0/gfx/layers/apz/test/reftest/reftest.list
+--- firefox-88.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest	2021-04-15 21:44:28.000000000 +0200
+++ firefox-88.0/gfx/layers/apz/test/reftest/reftest.list	2021-04-19 14:28:56.488112726 +0200
+@@ -6,6 +6,6 @@
+-fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&&gtkWidget,1-8,8-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
+-fuzzy-if(Android,0-4,0-5) fuzzy-if(webrender&&gtkWidget,1-30,4-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
+-fuzzy-if(Android,0-7,0-6) fuzzy-if(webrender&&gtkWidget,1-2,4-20) fuzzy-if(webrender&&cocoaWidget,14-18,48-88) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
+-fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&&gtkWidget,1-8,8-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
+-fuzzy-if(Android,0-14,0-5) fuzzy-if(webrender&&gtkWidget,1-30,12-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
+-fuzzy-if(Android,0-8,0-8) fuzzy-if(webrender&&gtkWidget,8-14,12-32) fuzzy-if(webrender&&cocoaWidget,14-18,26-54) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
+fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&&gtkWidget&&!swgl,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
+fuzzy-if(Android,0-4,0-5) fuzzy-if(webrender&&gtkWidget,28-31,28-50) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
+fuzzy-if(Android,0-6,0-6) fuzzy-if(webrender&&gtkWidget&&!swgl,0-20,0-100) fuzzy-if(webrender&&cocoaWidget,17-17,88-88) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
+fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&&gtkWidget&&!swgl,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
+fuzzy-if(Android,0-14,0-5) fuzzy-if(webrender&&gtkWidget,28-31,28-50) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
+fuzzy-if(Android,0-8,0-8) fuzzy-if(webrender&&gtkWidget,0-14,27-80) fuzzy-if(webrender&&cocoaWidget,17-17,50-54) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
+@@ -21 +21 @@
+-# On desktop, even more fuzz is needed because thumb scaling is not exactly proportional: making the page twice as long 
+# On desktop, even more fuzz is needed because thumb scaling is not exactly proportional: making the page twice as long
+diff -U0 firefox-88.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest firefox-88.0/image/test/reftest/downscaling/reftest.list
+--- firefox-88.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/image/test/reftest/downscaling/reftest.list	2021-04-19 13:52:26.652141847 +0200
+@@ -92 +91,0 @@
+-fuzzy(0-17,0-3221) fuzzy-if(gtkWidget&&!webrender,4-4,2616-2616) fuzzy-if(gtkWidget&&!webrender&&!layersGPUAccelerated,0-0,0-0) fuzzy-if(gtkWidget&&webrender,0-0,0-0) skip-if(Android) == downscale-moz-icon-1.html downscale-moz-icon-1-ref.html # gtkWidget Bug 1592059: regular is 2616, no-accel is 0, qr passes with 0
+@@ -181 +179,0 @@
+-fuzzy(0-53,0-6391) fuzzy-if(gtkWidget&&webrender,18-19,5502-5568) fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) skip-if(Android) == downscale-moz-icon-1.html downscale-moz-icon-1-ref.html # gtkWidget Bug 1592059
+diff -U0 firefox-88.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/abs-pos/reftest.list
+--- firefox-88.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/abs-pos/reftest.list	2021-04-19 13:52:26.652141847 +0200
+@@ -54 +54 @@
+-fuzzy-if(gtkWidget,0-1,0-1) fuzzy-if(Android,0-9,0-185) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-140,0-144) == scrollframe-2.html scrollframe-2-ref.html #bug 756530
+fuzzy-if(gtkWidget,0-100,0-160) fuzzy-if(Android,0-9,0-185) == scrollframe-2.html scrollframe-2-ref.html #bug 756530
+diff -U0 firefox-88.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/async-scrolling/reftest.list
+--- firefox-88.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest	2021-04-19 13:52:26.652141847 +0200
+++ firefox-88.0/layout/reftests/async-scrolling/reftest.list	2021-04-19 14:22:06.160749705 +0200
+@@ -27 +27 @@
+-fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&gtkWidget,20-33,14-32) fuzzy-if(webrender&&cocoaWidget,9-21,20-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338
+fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&gtkWidget,30-50,30-50) fuzzy-if(webrender&&cocoaWidget,21-21,44-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338
+@@ -38 +38 @@
+-skip-if(!asyncPan) fuzzy(0-2,0-2) fuzzy-if(cocoaWidget&&!webrender,1-1,7-16) fuzzy-if(gtkWidget&&!nativeThemePref,0-1,0-4) fuzzy-if(winWidget&&!nativeThemePref,0-1,0-51) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1-ref.html
+skip-if(!asyncPan) fuzzy(0-2,0-2) fuzzy-if(gtkWidget,0-5,0-5) fuzzy-if(cocoaWidget&&!webrender,0-10,0-16) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1-ref.html
+@@ -52,2 +52,2 @@
+-fuzzy-if(Android,0-6,0-4) fuzzy-if(skiaContent&&!Android,0-1,0-34) fuzzy-if(webrender&&gtkWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html # Bug 1604338
+-fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&&gtkWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html # Bug 1604338
+fuzzy-if(Android,0-6,0-4) fuzzy-if(skiaContent&&!Android,0-1,0-34) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,7-7,38-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html # Bug 1604338
+fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,7-7,38-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html # Bug 1604338
+@@ -55,2 +55,2 @@
+-fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&&gtkWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html # Bug 1604338
+-fuzzy-if(Android,0-7,0-1680) fuzzy-if(webrender&&gtkWidget,1-1,2-20) fuzzy-if(webrender&&cocoaWidget,1-2,10-18) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html # Bug 1604338
+fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,7-7,38-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html # Bug 1604338
+fuzzy-if(Android,0-7,0-1680) fuzzy-if(webrender&&gtkWidget&&!swgl,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,1-2,16-18) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html # Bug 1604338
+@@ -58,2 +58,2 @@
+-fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&&gtkWidget,8-13,12-32) fuzzy-if(webrender&&cocoaWidget,10-13,20-44) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html # Bug 1604338
+-fuzzy-if(Android,0-7,0-4) fuzzy-if(webrender&&gtkWidget,18-30,14-32) fuzzy-if(webrender&&cocoaWidget,16-20,20-44) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html # Bug 1604338
+fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,13-13,44-44) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html # Bug 1604338
+fuzzy-if(Android,0-7,0-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,19-20,44-44) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html # Bug 1604338
+@@ -65,4 +65,4 @@
+-fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&&gtkWidget,12-19,12-32) fuzzy-if(webrender&&cocoaWidget,17-21,20-44) skip-if(!asyncPan) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html # Bug 1604338
+-fuzzy-if(Android,0-44,0-10) fuzzy-if(webrender&&gtkWidget,16-26,26-64) fuzzy-if(webrender&&cocoaWidget,10-13,38-82) fuzzy-if(winWidget&&!nativeThemePref,0-4,0-36) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html # Bug 1604338
+-fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&&gtkWidget,17-28,24-60) fuzzy-if(webrender&&cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html # Bug 1604338
+-fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&&gtkWidget,17-29,24-60) fuzzy-if(webrender&&cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html # Bug 1604338
+fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,21-21,44-44) skip-if(!asyncPan) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html # Bug 1604338
+fuzzy-if(Android,0-44,0-10) fuzzy-if(webrender&&gtkWidget,0-100,0-100) fuzzy-if(webrender&&cocoaWidget,13-13,81-82) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html # Bug 1604338
+fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&&gtkWidget,0-50,0-100) fuzzy-if(webrender&&cocoaWidget,18-19,70-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html # Bug 1604338
+fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&&gtkWidget,0-50,0-100) fuzzy-if(webrender&&cocoaWidget,18-19,70-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html # Bug 1604338
+@@ -71 +71 @@
+-fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&gtkWidget,16-25,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html # Bug 1604338
+fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&gtkWidget,22-30,28-50) fuzzy-if(webrender&&cocoaWidget,16-16,44-44) skip-if(!asyncPan) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html # Bug 1604338
+@@ -73,6 +73,6 @@
+-fuzzy-if(Android,0-8,0-27) fuzzy-if(webrender&&cocoaWidget,9-11,20-44) skip-if(!asyncPan) == curtain-effect-1.html curtain-effect-1-ref.html
+-fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&&gtkWidget,10-15,12-32) fuzzy-if(webrender&&cocoaWidget,5-9,20-42) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html # Bug 1604338
+-fuzzy-if(Android&&!webrender,2-2,4-4) fuzzy-if(Android&&webrender,7-7,4-4) fuzzy-if(webrender&&gtkWidget,3-5,12-28) fuzzy-if(webrender&&cocoaWidget,5-6,18-38) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html # Bug 1604338
+-fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,10-10,4-4) fuzzy-if(webrender&&gtkWidget,13-20,12-32) fuzzy-if(webrender&&cocoaWidget,12-16,20-44) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html # Bug 1604338
+-fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&&gtkWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
+-fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&&gtkWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
+fuzzy-if(Android,0-8,0-27) fuzzy-if(webrender&&gtkWidget,0-17,0-50) fuzzy-if(webrender&&cocoaWidget,10-11,44-44) skip-if(!asyncPan) == curtain-effect-1.html curtain-effect-1-ref.html
+fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&&gtkWidget,10-16,28-41) fuzzy-if(webrender&&cocoaWidget,8-8,38-42) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html # Bug 1604338
+fuzzy-if(Android&&!webrender,2-2,4-4) fuzzy-if(Android&&webrender,7-7,4-4) fuzzy-if(webrender&&gtkWidget&&!swgl,0-22,0-50) fuzzy-if(webrender&&cocoaWidget,6-6,37-38) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html # Bug 1604338
+fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,10-10,4-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,15-16,44-44) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html # Bug 1604338
+fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,16-16,44-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
+fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,16-16,44-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
+diff -U0 firefox-88.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/bidi/reftest.list
+--- firefox-88.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/bidi/reftest.list	2021-04-19 14:23:12.313742857 +0200
+@@ -3 +3 @@
+-fuzzy-if(cocoaWidget,0-1,0-1) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == bdi-element.html bdi-element-ref.html # Bug 1392106
+fuzzy(0-1,0-1) fuzzy-if(cocoaWidget,0-1,0-1) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == bdi-element.html bdi-element-ref.html # Bug 1392106
+@@ -33,2 +33,2 @@
+-fuzzy-if(Android,0-1,0-6) fuzzy-if(cocoaWidget,0-1,0-2) == mixedChartype-02.html mixedChartype-02-ref.html
+-fuzzy-if(Android,0-1,0-6) fuzzy-if(cocoaWidget,0-1,0-2) == mixedChartype-02-j.html mixedChartype-02-ref.html
+fuzzy-if(gtkWidget,0-1,0-3) fuzzy-if(Android,0-1,0-6) fuzzy-if(cocoaWidget,0-1,0-2) == mixedChartype-02.html mixedChartype-02-ref.html
+fuzzy-if(gtkWidget,0-1,0-3) fuzzy-if(Android,0-1,0-6) fuzzy-if(cocoaWidget,0-1,0-2) == mixedChartype-02-j.html mixedChartype-02-ref.html
+@@ -163,8 +163,8 @@
+-fuzzy-if(cocoaWidget,0-1,0-4) fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2a-ltr.html brackets-2a-ltr-ref.html # Bug 1392106
+-fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(Android,0-254,0-557) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2a-rtl.html brackets-2a-rtl-ref.html # Bug 1392106
+-fuzzy-if(cocoaWidget,0-1,0-6) fuzzy-if(Android,0-1,0-8) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2b-ltr.html brackets-2b-ltr-ref.html # Bug 1392106
+-fuzzy-if(cocoaWidget,0-1,0-7) fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2b-rtl.html brackets-2b-rtl-ref.html # Bug 1392106
+-fuzzy-if(cocoaWidget,0-1,0-7) fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2c-ltr.html brackets-2c-ltr-ref.html # Bug 1392106
+-fuzzy-if(cocoaWidget,0-1,0-6) fuzzy-if(Android,0-254,0-231) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2c-rtl.html brackets-2c-rtl-ref.html # Bug 1392106
+-fuzzy-if(cocoaWidget,0-1,0-6) fuzzy-if(Android,0-1,0-8) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-ltr.html brackets-3a-ltr-ref.html # Bug 1392106
+-fuzzy-if(cocoaWidget,0-1,0-3) fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-rtl.html brackets-3a-rtl-ref.html # Bug 1392106
+fuzzy(0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2a-ltr.html brackets-2a-ltr-ref.html # Bug 1392106
+fuzzy(0-64,0-140) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2a-rtl.html brackets-2a-rtl-ref.html # Bug 1392106
+fuzzy(0-1,0-8) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2b-ltr.html brackets-2b-ltr-ref.html # Bug 1392106
+fuzzy(0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2b-rtl.html brackets-2b-rtl-ref.html # Bug 1392106
+fuzzy(0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2c-ltr.html brackets-2c-ltr-ref.html # Bug 1392106
+fuzzy(0-254,0-231) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2c-rtl.html brackets-2c-rtl-ref.html # Bug 1392106
+fuzzy(0-1,0-8) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-ltr.html brackets-3a-ltr-ref.html # Bug 1392106
+fuzzy(0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-rtl.html brackets-3a-rtl-ref.html # Bug 1392106
+diff -U0 firefox-88.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/border-radius/reftest.list
+--- firefox-88.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/border-radius/reftest.list	2021-04-19 13:52:26.652141847 +0200
+@@ -54 +54 @@
+-fuzzy-if(Android,0-8,0-469) fuzzy-if(skiaContent,0-21,0-76) fuzzy-if(winWidget,0-144,0-335) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical, bug 1392106
+fuzzy-if(gtkWidget,0-80,0-300) fuzzy-if(Android,0-8,0-469) fuzzy-if(winWidget,0-144,0-335) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical, bug 1392106
+diff -U0 firefox-88.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/bugs/reftest.list
+--- firefox-88.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/bugs/reftest.list	2021-04-19 14:27:52.647189221 +0200
+@@ -464 +463,0 @@
+-== 341043-1a.html 341043-1-ref.html
+@@ -553 +552 @@
+-== 363706-1.html 363706-1-ref.html
+fuzzy-if(gtkWidget,255-255,0-100) == 363706-1.html 363706-1-ref.html
+@@ -672 +671 @@
+-== 376532-1.html 376532-1-ref.html
+fuzzy-if(gtkWidget,0-150,0-50) == 376532-1.html 376532-1-ref.html
+@@ -763 +762 @@
+-== 389074-1.html 389074-1-ref.html
+fuzzy-if(gtkWidget,0-150,0-80) == 389074-1.html 389074-1-ref.html
+@@ -926 +925 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 411059-1.html 411059-1-ref.html # Bug 1392106
+fuzzy-if(gtkWidget,0-255,0-6312) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 411059-1.html 411059-1-ref.html # Bug 1392106
+@@ -1000 +999 @@
+-== 422394-1.html 422394-1-ref.html
+fuzzy-if(gtkWidget,0-255,0-640) == 422394-1.html 422394-1-ref.html
+@@ -1175 +1174 @@
+-fails-if(Android||cocoaWidget||winWidget) == chrome://reftest/content/bugs/456147.xhtml 456147-ref.html # bug 458047
+fuzzy-if(gtkWidget,0-255,0-5167) fails-if(Android||cocoaWidget||winWidget) == chrome://reftest/content/bugs/456147.xhtml 456147-ref.html # bug 458047
+@@ -1385 +1384 @@
+-fuzzy-if(winWidget&&nativeThemePref&&webrender,82-82,84-84) fuzzy-if(cocoaWidget&&nativeThemePref&&webrender,46-46,58-58) == 513153-2a.html 513153-2-ref.html
+fuzzy(0-61,0-172) fuzzy-if(webrender&&winWidget,82-82,84-84) == 513153-2a.html 513153-2-ref.html
+@@ -1823 +1822 @@
+-== 1062108-1.html 1062108-1-ref.html
+fuzzy-if(gtkWidget,0-255,0-53) == 1062108-1.html 1062108-1-ref.html
+@@ -2025 +2023,0 @@
+-!= 1404057.html 1404057-noref.html
+@@ -2065,2 +2063 @@
+-fuzzy-if(!webrender,1-5,66-547) fuzzy-if(geckoview&&!webrender,1-2,64-141) fuzzy-if(winWidget&&swgl,1-1,16-16) fuzzy-if(cocoaWidget&&swgl,1-1,32-32) == 1529992-1.html 1529992-1-ref.html
+-fuzzy-if(!webrender,0-6,0-34) fuzzy-if(Android,9-14,44-60) fails-if(webrender) == 1529992-2.html 1529992-2-ref.html
+fuzzy(0-13,0-154) fuzzy-if(Android,9-14,44-60) fails-if(webrender) == 1529992-2.html 1529992-2-ref.html
+@@ -2069 +2066 @@
+-skip-if(!asyncPan) == 1544895.html 1544895-ref.html
+fuzzy-if(gtkWidget,0-252,0-24) skip-if(!asyncPan) == 1544895.html 1544895-ref.html
+@@ -2082 +2079 @@
+-fuzzy-if(winWidget&&webrender,0-31,0-3) fuzzy-if(geckoview&&webrender,0-93,0-87) == 1562733-rotated-nastaliq-2.html 1562733-rotated-nastaliq-2-ref.html
+fuzzy(0-30,0-2) fuzzy-if(winWidget&&webrender,0-31,0-3) fuzzy-if(geckoview&&webrender,0-93,0-87) == 1562733-rotated-nastaliq-2.html 1562733-rotated-nastaliq-2-ref.html
+diff -U0 firefox-88.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/canvas/reftest.list
+--- firefox-88.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/canvas/reftest.list	2021-04-19 13:52:26.652141847 +0200
+@@ -51,2 +50,0 @@
+-!= text-font-lang.html text-font-lang-notref.html
+-
+@@ -54 +52 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-small-caps-1.html text-small-caps-1-ref.html # Bug 1392106
+fuzzy-if(gtkWidget,0-255,0-2304) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-small-caps-1.html text-small-caps-1-ref.html # Bug 1392106
+diff -U0 firefox-88.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/css-break/reftest.list
+--- firefox-88.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest	2021-04-19 13:52:26.652141847 +0200
+++ firefox-88.0/layout/reftests/css-break/reftest.list	2021-04-19 13:56:26.987380445 +0200
+@@ -1,3 +1,3 @@
+-== box-decoration-break-1.html box-decoration-break-1-ref.html
+-fuzzy(0-1,0-20) fuzzy-if(skiaContent,0-1,0-700) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
+-skip-if(verify) fuzzy(0-45,0-460) fuzzy-if(skiaContent,0-64,0-484) fuzzy-if(Android,0-70,0-1330) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543, bug 1392106
+fuzzy-if(gtkWidget,0-255,0-4972) == box-decoration-break-1.html box-decoration-break-1-ref.html
+fuzzy-if(gtkWidget,0-255,0-22330) fuzzy-if(skiaContent,0-1,0-700) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
+skip-if(verify) fuzzy(0-75,0-460) fuzzy-if(skiaContent,0-64,0-484) fuzzy-if(Android,0-70,0-1330) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543, bug 1392106
+diff -U0 firefox-88.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/css-placeholder/reftest.list
+--- firefox-88.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/css-placeholder/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -5 +5 @@
+-fuzzy-if(gtkWidget&&nativeThemePref,255-255,1376-1881) == css-simple-styling.html css-simple-styling-ref.html # gtkWidget, Bug 1600749
+fuzzy-if(gtkWidget&&nativeThemePref,255-255,1300-1881) == css-simple-styling.html css-simple-styling-ref.html # gtkWidget, Bug 1600749
+diff -U0 firefox-88.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/css-ruby/reftest.list
+--- firefox-88.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/css-ruby/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -17,4 +17,4 @@
+-== relative-positioning-2.html relative-positioning-2-ref.html
+-== ruby-position-horizontal.html ruby-position-horizontal-ref.html
+-== ruby-position-vertical-lr.html ruby-position-vertical-lr-ref.html
+-== ruby-position-vertical-rl.html ruby-position-vertical-rl-ref.html
+fuzzy-if(gtkWidget,0-255,0-669) == relative-positioning-2.html relative-positioning-2-ref.html
+fuzzy-if(gtkWidget,0-255,0-947) == ruby-position-horizontal.html ruby-position-horizontal-ref.html
+fuzzy-if(gtkWidget,0-255,0-1079) == ruby-position-vertical-lr.html ruby-position-vertical-lr-ref.html
+fuzzy-if(gtkWidget,0-255,0-1079) == ruby-position-vertical-rl.html ruby-position-vertical-rl-ref.html
+@@ -26 +26 @@
+-pref(layout.css.ruby.intercharacter.enabled,true) fuzzy-if(Android,0-198,0-70) == ruby-intercharacter-1.htm ruby-intercharacter-1-ref.htm
+fuzzy-if(gtkWidget,0-240,0-61) pref(layout.css.ruby.intercharacter.enabled,true) fuzzy-if(Android,0-198,0-70) == ruby-intercharacter-1.htm ruby-intercharacter-1-ref.htm
+@@ -28 +28 @@
+-pref(layout.css.ruby.intercharacter.enabled,true) == ruby-intercharacter-2.htm ruby-intercharacter-2-ref.htm
+fuzzy-if(gtkWidget,0-255,0-219) pref(layout.css.ruby.intercharacter.enabled,true) == ruby-intercharacter-2.htm ruby-intercharacter-2-ref.htm
+diff -U0 firefox-88.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/first-letter/reftest.list
+--- firefox-88.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/first-letter/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -64 +64 @@
+-fails-if(winWidget||cocoaWidget) fails-if(geckoview) == 617869-1.html 617869-1-ref.html # Bug 1558513 for GV
+fuzzy-if(gtkWidget,0-260,0-900) fails-if(winWidget||cocoaWidget) fails-if(geckoview) == 617869-1.html 617869-1-ref.html # Bug 1558513 for GV
+diff -U0 firefox-88.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/font-face/reftest.list
+--- firefox-88.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/font-face/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -9 +9 @@
+-== name-override-simple-1.html name-override-simple-1-ref.html
+fuzzy-if(gtkWidget,0-112,0-107) == name-override-simple-1.html name-override-simple-1-ref.html
+@@ -26,3 +26,2 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(Android) == src-list-local-full.html src-list-local-full-ref.html # Bug 1392106
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(Android) == src-list-local-full-quotes.html src-list-local-full-ref.html # Bug 1392106
+-== src-list-local-fallback.html src-list-local-fallback-ref.html
+fuzzy(0-255,0-6200) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(Android) == src-list-local-full.html src-list-local-full-ref.html # Bug 1392106
+fuzzy(0-255,0-6200) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(Android) == src-list-local-full-quotes.html src-list-local-full-ref.html # Bug 1392106
+@@ -57 +56 @@
+-== cross-iframe-1.html cross-iframe-1-ref.html
+fuzzy-if(gtkWidget,0-112,0-107) == cross-iframe-1.html cross-iframe-1-ref.html
+@@ -81 +80 @@
+-== sheet-set-switch-1.html sheet-set-switch-1-ref.html
+fuzzy-if(gtkWidget,0-112,0-108) random-if(cocoaWidget) == sheet-set-switch-1.html sheet-set-switch-1-ref.html # bug 468217
+@@ -93 +92 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == local-1.html local-1-ref.html # Bug 1392106
+fuzzy-if(gtkWidget,0-255,0-7000) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == local-1.html local-1-ref.html # Bug 1392106
+@@ -171,2 +170,2 @@
+-HTTP(..) == reflow-sanity-1.html reflow-sanity-1-ref.html
+-HTTP(..) == reflow-sanity-1-data.html reflow-sanity-1-ref.html
+fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-1.html reflow-sanity-1-ref.html
+fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-1-data.html reflow-sanity-1-ref.html
+@@ -174,4 +173,4 @@
+-HTTP(..) == reflow-sanity-delay-1a.html reflow-sanity-1-ref.html
+-HTTP(..) == reflow-sanity-delay-1b.html reflow-sanity-1-ref.html
+-HTTP(..) == reflow-sanity-delay-1c.html reflow-sanity-1-ref.html
+-HTTP(..) == reflow-sanity-delay-1-metrics.html reflow-sanity-1-ref.html
+fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-delay-1a.html reflow-sanity-1-ref.html
+fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-delay-1b.html reflow-sanity-1-ref.html
+fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-delay-1c.html reflow-sanity-1-ref.html
+fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-delay-1-metrics.html reflow-sanity-1-ref.html
+@@ -204 +203 @@
+-# Currently Windows 7 and macOS all fail on 
+# Currently Windows 7 and macOS all fail on
+diff -U0 firefox-88.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/font-matching/reftest.list
+--- firefox-88.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/font-matching/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -124 +124 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-2.html italic-oblique-ref.html # Bug 1392106
+fuzzy-if(gtkWidget,0-104,0-1836) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-2.html italic-oblique-ref.html # Bug 1392106
+@@ -128 +128 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-6.html italic-oblique-ref.html # Bug 1392106
+fuzzy-if(gtkWidget,0-104,0-1836) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-6.html italic-oblique-ref.html # Bug 1392106
+@@ -130,2 +130,2 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-8.html italic-oblique-ref.html # Bug 1392106
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-9.html italic-oblique-ref.html # Bug 1392106
+fuzzy-if(gtkWidget,0-104,0-1836) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-8.html italic-oblique-ref.html # Bug 1392106
+fuzzy-if(gtkWidget,0-104,0-1836) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-9.html italic-oblique-ref.html # Bug 1392106
+diff -U0 firefox-88.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/fieldset/reftest.list
+--- firefox-88.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/forms/fieldset/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -8 +8 @@
+-fuzzy-if(winWidget&&!layersGPUAccelerated,0-142,0-276) == positioned-container-1.html positioned-container-1-ref.html
+fuzzy-if(gtkWidget,0-100,0-305) fuzzy-if(winWidget&&!layersGPUAccelerated,0-142,0-276) == positioned-container-1.html positioned-container-1-ref.html
+diff -U0 firefox-88.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/input/checkbox/reftest.list
+--- firefox-88.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest	2021-04-19 13:52:26.653141877 +0200
+++ firefox-88.0/layout/reftests/forms/input/checkbox/reftest.list	2021-04-19 14:24:26.567980111 +0200
+@@ -18 +18 @@
+-skip-if((OSX||winWidget)&&nativeThemePref) fuzzy-if(gtkWidget&&nativeThemePref,25-25,32-32) fails-if(Android&&nativeThemePref) == checkbox-clamp-02.html checkbox-clamp-02-ref.html
+skip-if(OSX||winWidget) fails-if(geckoview&&webrender) fuzzy-if(gtkWidget&&nativeThemePref,12-25,25-32) fails-if(Android) == checkbox-clamp-02.html checkbox-clamp-02-ref.html
+diff -U0 firefox-88.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/input/radio/reftest.list
+--- firefox-88.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/forms/input/radio/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -9 +9 @@
+-skip-if(OSX||winWidget||Android) fuzzy-if(gtkWidget&&nativeThemePref,24-24,16-16) == radio-clamp-02.html radio-clamp-02-ref.html # gtkWidget, Bug 1599622
+skip-if(OSX||winWidget||Android) fuzzy-if(gtkWidget&&nativeThemePref,10-24,16-16) == radio-clamp-02.html radio-clamp-02-ref.html # gtkWidget, Bug 1599622
+diff -U0 firefox-88.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/placeholder/reftest.list
+--- firefox-88.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/forms/placeholder/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -21 +21 @@
+-fuzzy-if(winWidget,0-160,0-10) fuzzy-if(Android,0-160,0-41) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-146,0-317) fuzzy-if(OSX==1010&&browserIsRemote,0-1,0-8) == placeholder-6.html placeholder-overflow-ref.html
+fuzzy-if(gtkWidget,0-255,0-341) fuzzy-if(winWidget,0-160,0-10) fuzzy-if(Android,0-160,0-41) fuzzy-if(OSX==1010&&browserIsRemote,0-1,0-8) == placeholder-6.html placeholder-overflow-ref.html
+diff -U0 firefox-88.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/textbox/reftest.list
+--- firefox-88.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/forms/textbox/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -4 +4 @@
+-fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender) == chrome://reftest/content/forms/textbox/accesskey-2.xhtml chrome://reftest/content/forms/textbox/accesskey-2-ref.xhtml
+fuzzy-if(gtkWidget,0-1,0-21) fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender) == chrome://reftest/content/forms/textbox/accesskey-2.xhtml chrome://reftest/content/forms/textbox/accesskey-2-ref.xhtml
+@@ -8 +8 @@
+-fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender&&!Android) == chrome://reftest/content/forms/textbox/accesskey-4.xhtml chrome://reftest/content/forms/textbox/accesskey-4-ref.xhtml
+fuzzy-if(gtkWidget,0-1,0-21) fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender&&!Android) == chrome://reftest/content/forms/textbox/accesskey-4.xhtml chrome://reftest/content/forms/textbox/accesskey-4-ref.xhtml
+diff -U0 firefox-88.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/generated-content/reftest.list
+--- firefox-88.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/generated-content/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -16 +16 @@
+-fuzzy-if(OSX==1010,0-1,0-10) == quotes-001.xml quotes-001-ref.xml
+fuzzy(0-128,0-737) fuzzy-if(OSX==1010,0-1,0-10) == quotes-001.xml quotes-001-ref.xml
+diff -U0 firefox-88.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/high-contrast/reftest.list
+--- firefox-88.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/high-contrast/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -22 +22 @@
+-fuzzy-if(cocoaWidget,255-255,1495-1495) fuzzy-if(winWidget,255-255,353-353) fuzzy-if(Android,255-255,700-700) == backplate-bg-image-010.html backplate-bg-image-010-ref.html
+fuzzy-if(gtkWidget,0-255,0-1495) fuzzy-if(cocoaWidget,255-255,1495-1495) fuzzy-if(winWidget,255-255,353-353) fuzzy-if(Android,255-255,700-700) == backplate-bg-image-010.html backplate-bg-image-010-ref.html
+diff -U0 firefox-88.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/indic-shaping/reftest.list
+--- firefox-88.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/indic-shaping/reftest.list	2021-04-19 13:52:26.653141877 +0200
+@@ -12 +11,0 @@
+-fuzzy-if(gtkWidget,255-255,46-46) == gujarati-3b.html gujarati-3-ref.html # gtkWidget, Bug 1600777
+diff -U0 firefox-88.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/mathml/reftest.list
+--- firefox-88.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/mathml/reftest.list	2021-04-19 14:23:50.519893996 +0200
+@@ -26 +26 @@
+-random-if(smallScreen&&Android) fuzzy(0-255,0-200) fuzzy-if(geckoview&&webrender,201-216,200-250) fuzzy-if(webrender&&winWidget,114-255,245-361) fuzzy-if(webrender&&OSX,79-153,240-250) == mirror-op-1.html mirror-op-1-ref.html
+random-if(smallScreen&&Android) fuzzy(0-255,0-350) fuzzy-if(geckoview&&webrender,201-216,312-316) fuzzy-if(webrender&&winWidget,114-255,245-361) fuzzy-if(webrender&&OSX,79-153,307-314) == mirror-op-1.html mirror-op-1-ref.html
+@@ -66 +66 @@
+-== stretchy-largeop-2.html stretchy-largeop-2-ref.html
+fuzzy-if(gtkWidget,0-255,0-126) == stretchy-largeop-2.html stretchy-largeop-2-ref.html
+@@ -177 +176,0 @@
+-fuzzy-if(skiaContent,0-1,0-80) fuzzy-if(Android,0-255,0-105) fuzzy-if(gtkWidget,255-255,96-96) skip-if(winWidget) == multiscripts-1.html multiscripts-1-ref.html # Windows: bug 1314684; Android: bug 1392254; Linux: bug 1599638
+@@ -256 +254,0 @@
+-fails-if(winWidget) fuzzy-if(gtkWidget,255-255,776226-776226) == subscript-italic-correction.html subscript-italic-correction-ref.html # bug 961482 (Windows), bug 1599640 (Linux)
+diff -U0 firefox-88.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/position-dynamic-changes/relative/reftest.list
+--- firefox-88.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/position-dynamic-changes/relative/reftest.list	2021-04-19 13:52:26.654141907 +0200
+@@ -1,4 +1,4 @@
+-fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(d2d,0-47,0-26) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-169,0-970) == move-right-bottom.html move-right-bottom-ref.html
+-fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-169,0-970) == move-top-left.html move-top-left-ref.html # Bug 688545
+-fuzzy-if(cocoaWidget,0-1,0-3) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-144,0-580) == move-right-bottom-table.html move-right-bottom-table-ref.html
+-fuzzy-if(cocoaWidget,0-1,0-3) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-144,0-580) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545
+fuzzy-if(gtkWidget,0-99,0-1255) fuzzy-if(cocoaWidget,0-1,0-2) == move-right-bottom.html move-right-bottom-ref.html
+fuzzy-if(gtkWidget,0-99,0-1254) fuzzy-if(cocoaWidget,0-1,0-2) == move-top-left.html move-top-left-ref.html # Bug 688545
+fuzzy-if(gtkWidget,0-103,0-637) fuzzy-if(cocoaWidget,0-1,0-3) == move-right-bottom-table.html move-right-bottom-table-ref.html
+fuzzy-if(gtkWidget,0-103,0-637) fuzzy-if(cocoaWidget,0-1,0-3) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545
+diff -U0 firefox-88.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/position-sticky/reftest.list
+--- firefox-88.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest	2021-04-19 13:52:26.654141907 +0200
+++ firefox-88.0/layout/reftests/position-sticky/reftest.list	2021-04-19 14:25:15.862465345 +0200
+@@ -53,3 +53,2 @@
+-fuzzy-if(Android,0-4,0-4) fuzzy-if(webrender&&gtkWidget,10-17,12-32) fuzzy-if(webrender&&cocoaWidget,7-8,18-42) skip-if(!asyncPan) == transformed-2.html transformed-2-ref.html # Bug 1604644
+-skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&&gtkWidget,19-30,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644
+-skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&&gtkWidget,19-30,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-4,0-104) == nested-sticky-2.html nested-sticky-2-ref.html # Bug 1604644
+skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,15-16,44-44) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644
+skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,15-16,44-44) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-4,0-104) == nested-sticky-2.html nested-sticky-2-ref.html # Bug 1604644
+diff -U0 firefox-88.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/reftest-sanity/reftest.list
+--- firefox-88.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/reftest-sanity/reftest.list	2021-04-19 13:52:26.654141907 +0200
+@@ -131,6 +131,6 @@
+-pref(font.default.x-western,"serif") == font-serif.html font-default.html
+-pref(font.default.x-western,"serif") != font-sans-serif.html font-default.html
+-pref(font.default.x-western,"sans-serif") == font-sans-serif.html font-default.html
+-pref(font.default.x-western,"sans-serif") != font-serif.html font-default.html
+-fails pref(font.default.x-western,true) == font-serif.html font-default.html
+-fails pref(font.default.x-western,0) == font-serif.html font-default.html
+#pref(font.default.x-western,"serif") == font-serif.html font-default.html
+#pref(font.default.x-western,"serif") != font-sans-serif.html font-default.html
+#pref(font.default.x-western,"sans-serif") == font-sans-serif.html font-default.html
+#pref(font.default.x-western,"sans-serif") != font-serif.html font-default.html
+#fails pref(font.default.x-western,true) == font-serif.html font-default.html
+#fails pref(font.default.x-western,0) == font-serif.html font-default.html
+diff -U0 firefox-88.0/layout/reftests/svg/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/svg/reftest.list
+--- firefox-88.0/layout/reftests/svg/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/svg/reftest.list	2021-04-19 13:52:26.654141907 +0200
+@@ -475 +475 @@
+-random-if(winWidget) fuzzy-if(Android,0-10,0-2) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101
+random-if(winWidget) fuzzy-if(gtkWidget,0-20,0-10) fuzzy-if(Android,0-10,0-2) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101
+@@ -482 +481,0 @@
+-!= text-language-00.xhtml text-language-00-ref.xhtml
+@@ -484 +483 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-layout-01.svg text-layout-01-ref.svg # Bug 1392106
+fuzzy-if(gtkWidget,0-255,0-1769) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-layout-01.svg text-layout-01-ref.svg # Bug 1392106
+@@ -492 +491 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-layout-09.svg pass.svg # Bug 1392106
+fuzzy(0-255,0-237) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-layout-09.svg pass.svg # Bug 1392106
+diff -U0 firefox-88.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/svg/smil/style/reftest.list
+--- firefox-88.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/svg/smil/style/reftest.list	2021-04-19 13:52:26.654141907 +0200
+@@ -70 +70 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(gtkWidget,255-255,1520-1520) == anim-css-font-1.svg  anim-css-font-1-ref.svg # Windows: Bug 1392106 Linux: Bug 1599619
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == anim-css-font-1.svg  anim-css-font-1-ref.svg # Windows: Bug 1392106 Linux: Bug 1599619
+diff -U0 firefox-88.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/svg/svg-integration/reftest.list
+--- firefox-88.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/svg/svg-integration/reftest.list	2021-04-19 13:52:26.654141907 +0200
+@@ -50 +50 @@
+-fuzzy-if(Android,0-4,0-10) == box-decoration-break-01.xhtml box-decoration-break-01-ref.xhtml
+fuzzy-if(gtkWidget,0-5,0-11) fuzzy-if(Android,0-4,0-10) == box-decoration-break-01.xhtml box-decoration-break-01-ref.xhtml
+@@ -52 +52 @@
+-fuzzy(0-67,0-238) == box-decoration-break-03.xhtml box-decoration-break-01-ref.xhtml
+fuzzy(0-67,0-254) == box-decoration-break-03.xhtml box-decoration-break-01-ref.xhtml
+diff -U0 firefox-88.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/svg/text/reftest.list
+--- firefox-88.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/svg/text/reftest.list	2021-04-19 13:52:26.654141907 +0200
+@@ -203,2 +203,2 @@
+-fuzzy-if(skiaContent,0-1,0-100) needs-focus fuzzy-if(webrender&&winWidget,134-148,261-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
+-fuzzy-if(skiaContent,0-1,0-50) needs-focus fuzzy-if(webrender&&winWidget,127-148,221-254) fuzzy-if(webrender&&OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
+fuzzy-if(skiaContent,0-1,0-120) needs-focus fuzzy-if(webrender&&winWidget,134-148,261-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
+fuzzy-if(skiaContent,0-1,0-70) needs-focus fuzzy-if(webrender&&winWidget,127-148,221-254) fuzzy-if(webrender&&OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
+diff -U0 firefox-88.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/tab-size/reftest.list
+--- firefox-88.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/tab-size/reftest.list	2021-04-19 13:52:26.654141907 +0200
+@@ -2,6 +2,6 @@
+-== tab-size-8.html            spaces-8.html
+-== tab-size-4.html            spaces-4.html
+-== tab-size-4-span.html       spaces-4.html
+-== tab-size-4-spanoffset.html spaces-4-offset.html
+-== tab-size-4-multiple.html   spaces-4-multiple.html
+-== tab-size-1.html            spaces-1.html
+fuzzy-if(gtkWidget,0-255,0-70) == tab-size-8.html            spaces-8.html
+fuzzy-if(gtkWidget,0-255,0-70) == tab-size-4.html            spaces-4.html
+fuzzy-if(gtkWidget,0-255,0-70) == tab-size-4-span.html       spaces-4.html
+fuzzy-if(gtkWidget,0-255,0-371) == tab-size-4-spanoffset.html spaces-4-offset.html
+fuzzy-if(gtkWidget,0-255,0-410) == tab-size-4-multiple.html   spaces-4-multiple.html
+fuzzy-if(gtkWidget,0-255,0-63) == tab-size-1.html            spaces-1.html
+diff -U0 firefox-88.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/text-decoration/reftest.list
+--- firefox-88.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest	2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/text-decoration/reftest.list	2021-04-19 13:52:26.654141907 +0200
+@@ -1,2 +1,2 @@
+-fuzzy-if(webrender&&gtkWidget,0-208,0-12) == complex-decoration-style-quirks.html complex-decoration-style-quirks-ref.html
+-fuzzy-if(webrender&&gtkWidget,0-208,0-12) == complex-decoration-style-standards.html complex-decoration-style-standards-ref.html
+fuzzy-if(gtkWidget,0-255,0-40) == complex-decoration-style-quirks.html complex-decoration-style-quirks-ref.html
+fuzzy-if(gtkWidget,0-255,0-40) == complex-decoration-style-standards.html complex-decoration-style-standards-ref.html
+diff -U0 firefox-88.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/text-overflow/reftest.list
+--- firefox-88.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/text-overflow/reftest.list	2021-04-19 13:52:26.654141907 +0200
+@@ -6 +6 @@
+-skip-if(!gtkWidget) fuzzy-if(gtkWidget,0-124,0-289) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
+skip-if(!gtkWidget) fuzzy-if(gtkWidget,0-255,0-400) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
+@@ -28 +28 @@
+-== float-edges-1.html float-edges-1-ref.html
+fuzzy-if(gtkWidget,0-255,0-294) == float-edges-1.html float-edges-1-ref.html
+diff -U0 firefox-88.0/layout/reftests/text/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/text/reftest.list
+--- firefox-88.0/layout/reftests/text/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/text/reftest.list	2021-04-19 14:25:55.142648846 +0200
+@@ -190 +190 @@
+-fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1320665-cmap-format-13.html 1320665-cmap-format-13-ref.html # see bug 1320665 comments 8-9
+fuzzy-if(gtkWidget,0-255,0-1071) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1320665-cmap-format-13.html 1320665-cmap-format-13-ref.html # see bug 1320665 comments 8-9
+@@ -193,2 +193,2 @@
+-fuzzy-if(Android,0-128,0-233) == 1463020-letter-spacing-text-transform-1.html 1463020-letter-spacing-text-transform-1-ref.html
+-fails-if(Android) == 1463020-letter-spacing-text-transform-2.html 1463020-letter-spacing-text-transform-2-ref.html # missing font coverage on Android
+fuzzy-if(gtkWidget,0-255,0-800) fails-if(/^^Windows\x20NT\x2010\.0/.test(http.oscpu)) fuzzy-if(Android,0-128,0-233) == 1463020-letter-spacing-text-transform-1.html 1463020-letter-spacing-text-transform-1-ref.html
+fuzzy-if(gtkWidget,0-255,0-1600) fails-if(Android) == 1463020-letter-spacing-text-transform-2.html 1463020-letter-spacing-text-transform-2-ref.html # missing font coverage on Android
+@@ -198 +198 @@
+-fuzzy-if(!webrender,0-42,0-1590) fuzzy-if(gtkWidget&&!webrender,0-255,0-50) == 1655364-1.html 1655364-1-ref.html
+fuzzy-if(!webrender,0-42,0-1553) fuzzy-if(gtkWidget,0-255,0-1625) == 1655364-1.html 1655364-1-ref.html
+@@ -366 +366 @@
+-== color-opacity-rtl-1.html color-opacity-rtl-1-ref.html
+fuzzy-if(gtkWidget,0-5,0-5) == color-opacity-rtl-1.html color-opacity-rtl-1-ref.html
+diff -U0 firefox-88.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/text-transform/reftest.list
+--- firefox-88.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/text-transform/reftest.list	2021-04-19 13:52:26.655141937 +0200
+@@ -15 +15 @@
+-random-if(winWidget) == small-caps-1.html small-caps-1-ref.html # fails if default font supports 'smcp'
+fuzzy-if(gtkWidget,0-255,0-571) random-if(winWidget) == small-caps-1.html small-caps-1-ref.html # fails if default font supports 'smcp'
+diff -U0 firefox-88.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/transform-3d/reftest.list
+--- firefox-88.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/transform-3d/reftest.list	2021-04-19 13:52:26.655141937 +0200
+@@ -14 +14 @@
+-fuzzy-if(gtkWidget||winWidget,0-8,0-376) fuzzy-if(Android,0-8,0-441) fuzzy-if(cocoaWidget,0-17,0-4) fuzzy-if(skiaContent,0-16,0-286) fuzzy-if(webrender&&cocoaWidget,0-200,0-310) fuzzy-if(webrender&&winWidget,0-175,0-250) == preserve3d-1a.html preserve3d-1-ref.html
+fuzzy-if(gtkWidget,0-16,0-500) == preserve3d-1a.html preserve3d-1-ref.html
+@@ -27,2 +27,2 @@
+-fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == scale3d-all.html scale3d-1-ref.html # subpixel AA
+-fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA
+fuzzy-if(gtkWidget,0-100,0-628) fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == scale3d-all.html scale3d-1-ref.html # subpixel AA
+fuzzy-if(gtkWidget,0-100,0-628) fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA
+@@ -75,2 +75,2 @@
+-fuzzy-if(skiaContent,0-1,0-4) fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac
+-fuzzy-if(skiaContent,0-1,0-4) fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac, bug 1461311 for Android
+fuzzy(0-1,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac
+fuzzy(0-1,0-6) fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac, bug 1461311 for Android
+@@ -102 +102 @@
+-fuzzy-if(webrender,0-6,0-3117) == 1637067-1.html 1637067-1-ref.html
+fuzzy-if(webrender,0-6,0-3500) == 1637067-1.html 1637067-1-ref.html
+diff -U0 firefox-88.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/writing-mode/reftest.list
+--- firefox-88.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/writing-mode/reftest.list	2021-04-19 14:26:35.296858677 +0200
+@@ -20 +20 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1091058-1.html 1091058-1-ref.html # Bug 1392106
+fuzzy(0-255,0-315) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1091058-1.html 1091058-1-ref.html # Bug 1392106
+@@ -34 +34 @@
+-fuzzy-if(Android,0-128,0-94) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1111944-1-list-marker.html 1111944-1-list-marker-ref.html # Bug 1392106
+fuzzy-if(gtkWidget,0-72,0-47) fuzzy-if(Android,0-128,0-94) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1111944-1-list-marker.html 1111944-1-list-marker-ref.html # Bug 1392106
+@@ -114 +114 @@
+-fails-if(geckoview) == 1135361-ruby-justify-1.html 1135361-ruby-justify-1-ref.html # Bug 1558513 for GV
+fuzzy-if(gtkWidget,0-255,0-2323) fails-if(geckoview) == 1135361-ruby-justify-1.html 1135361-ruby-justify-1-ref.html # Bug 1558513 for GV
+@@ -154 +154 @@
+-fuzzy-if(winWidget,0-3,0-84) == 1193519-sideways-lr-3.html 1193519-sideways-lr-3-ref.html
+fuzzy(0-255,0-610) fuzzy-if(winWidget,0-3,0-84) fails-if(webrender&&winWidget&&!swgl) == 1193519-sideways-lr-3.html 1193519-sideways-lr-3-ref.html
+@@ -185 +185 @@
+-== 1395926-vertical-upright-gpos-1.html 1395926-vertical-upright-gpos-1-ref.html
+fuzzy-if(gtkWidget,0-248,0-8) == 1395926-vertical-upright-gpos-1.html 1395926-vertical-upright-gpos-1-ref.html
+diff -U0 firefox-88.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/writing-mode/tables/reftest.list
+--- firefox-88.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/writing-mode/tables/reftest.list	2021-04-19 13:52:26.655141937 +0200
+@@ -34 +34 @@
+-== fixed-table-layout-027-vlr.html fixed-table-layout-025-ref.html
+fuzzy-if(gtkWidget,0-260,0-250) == fixed-table-layout-027-vlr.html fixed-table-layout-025-ref.html
+@@ -60 +60 @@
+-== fixed-table-layout-027-vrl.html fixed-table-layout-025-ref.html
+fuzzy-if(gtkWidget,0-260,0-250) == fixed-table-layout-027-vrl.html fixed-table-layout-025-ref.html
+@@ -77,2 +76,0 @@
+-fuzzy-if(Android,0-255,0-38) == table-caption-top-1.html table-caption-top-1-ref.html
+-fuzzy-if(Android,0-255,0-38) pref(layout.css.caption-side-non-standard.enabled,true) == table-caption-bottom-1.html table-caption-bottom-1-ref.html
+diff -U0 firefox-88.0/layout/reftests/xul/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/xul/reftest.list
+--- firefox-88.0/layout/reftests/xul/reftest.list.firefox-tests-reftest	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/xul/reftest.list	2021-04-19 13:52:26.655141937 +0200
+@@ -15 +15 @@
+-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == chrome://reftest/content/xul/text-small-caps-1.xhtml chrome://reftest/content/xul/text-small-caps-1-ref.xhtml
+fuzzy-if(gtkWidget,0-255,0-5159) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == chrome://reftest/content/xul/text-small-caps-1.xhtml chrome://reftest/content/xul/text-small-caps-1-ref.xhtml
+diff -U0 firefox-88.0/layout/xul/reftest/reftest.list.firefox-tests-reftest firefox-88.0/layout/xul/reftest/reftest.list
+--- firefox-88.0/layout/xul/reftest/reftest.list.firefox-tests-reftest	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/xul/reftest/reftest.list	2021-04-19 13:52:26.655141937 +0200
+@@ -14 +14 @@
+-fuzzy(0-10,0-75) == chrome://reftest/content/xul/reftest/scrollbar-marks-overlay.html chrome://reftest/content/xul/reftest/scrollbar-marks-overlay-ref.html
+fuzzy(0-10,0-90) == chrome://reftest/content/xul/reftest/scrollbar-marks-overlay.html chrome://reftest/content/xul/reftest/scrollbar-marks-overlay-ref.html
--- a/firefox-tests-xpcshell-freeze.patch
+++ b/firefox-tests-xpcshell-freeze.patch
@ -0,0 +1,14 @@
+diff -up firefox-88.0/testing/xpcshell/runxpcshelltests.py.old firefox-88.0/testing/xpcshell/runxpcshelltests.py
+--- firefox-88.0/testing/xpcshell/runxpcshelltests.py.old	2021-04-30 10:45:14.466616224 +0200
+++ firefox-88.0/testing/xpcshell/runxpcshelltests.py	2021-04-30 10:45:21.339525085 +0200
+@@ -1382,8 +1382,8 @@ class XPCShellTests(object):
+                         self.log.info("Process %s" % label)
+                     self.log.info(msg)
+ 
+-            dumpOutput(proc.stdout, "stdout")
+-            dumpOutput(proc.stderr, "stderr")
+            #dumpOutput(proc.stdout, "stdout")
+            #dumpOutput(proc.stderr, "stderr")
+         self.nodeProc = {}
+ 
+     def startHttp3Server(self):
--- a/firefox-tests-xpcshell.patch
+++ b/firefox-tests-xpcshell.patch
@ -0,0 +1,162 @@
+diff -U0 firefox-88.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
+--- firefox-88.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-04-15 21:44:26.000000000 +0200
+++ firefox-88.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini	2021-04-19 13:48:43.194411557 +0200
+@@ -9 +8,0 @@
+-[test_appupdateurl.js]
+@@ -27 +25,0 @@
+-[test_sorted_alphabetically.js]
+diff -U0 firefox-88.0/browser/extensions/formautofill/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/browser/extensions/formautofill/test/unit/xpcshell.ini
+--- firefox-88.0/browser/extensions/formautofill/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/browser/extensions/formautofill/test/unit/xpcshell.ini	2021-04-19 13:48:57.654847093 +0200
+@@ -80,2 +79,0 @@
+-skip-if = tsan # Times out, bug 1612707
+-[test_sync.js]
+diff -U0 firefox-88.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
+--- firefox-88.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-04-15 21:44:27.000000000 +0200
+++ firefox-88.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini	2021-04-19 13:48:43.194411557 +0200
+@@ -9 +8,0 @@
+-[test_adb.js]
+diff -U0 firefox-88.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/netwerk/test/unit_ipc/xpcshell.ini
+--- firefox-88.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/netwerk/test/unit_ipc/xpcshell.ini	2021-04-19 13:48:43.194411557 +0200
+@@ -74 +73,0 @@
+-[test_dns_service_wrap.js]
+@@ -115 +113,0 @@
+-[test_trr_httpssvc_wrap.js]
+diff -U0 firefox-88.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/netwerk/test/unit/xpcshell.ini
+--- firefox-88.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/netwerk/test/unit/xpcshell.ini	2021-04-19 13:48:43.194411557 +0200
+@@ -204 +203,0 @@
+-[test_dns_service.js]
+@@ -228 +226,0 @@
+-[test_file_protocol.js]
+@@ -338 +335,0 @@
+-[test_unix_domain.js]
+@@ -350 +346,0 @@
+-[test_udp_multicast.js]
+@@ -399,2 +394,0 @@
+-[test_tls_flags.js]
+-skip-if = (verify && (os == 'linux')) || (os == "android" && processor == "x86_64")
+@@ -414 +407,0 @@
+-[test_network_connectivity_service.js]
+@@ -509 +501,0 @@
+-[test_httpssvc_retry_with_ech.js]
+@@ -519 +510,0 @@
+-[test_odoh.js]
+diff -U0 firefox-88.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/security/manager/ssl/tests/unit/xpcshell.ini
+--- firefox-88.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/security/manager/ssl/tests/unit/xpcshell.ini	2021-04-19 13:48:43.194411557 +0200
+@@ -117,4 +116,0 @@
+-[test_encrypted_client_hello.js]
+-run-sequentially = hardcoded ports
+-[test_encrypted_client_hello_client_only.js]
+-run-sequentially = hardcoded ports
+@@ -182 +177,0 @@
+-[test_oskeystore.js]
+diff -U0 firefox-88.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-88.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
+--- firefox-88.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell	2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini	2021-04-19 13:48:43.194411557 +0200
+@@ -10 +9,0 @@
+-[test_pkcs11_module.js]
+diff -U0 firefox-88.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini
+--- firefox-88.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini	2021-04-19 13:48:57.654847093 +0200
+@@ -9,2 +8,0 @@
+-skip-if = toolkit == 'android' # Bug 1567341
+-[test_staticPartition_font.js]
+diff -U0 firefox-88.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/components/commandlines/test/unit/xpcshell.ini
+--- firefox-88.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/components/commandlines/test/unit/xpcshell.ini	2021-04-19 13:48:43.194411557 +0200
+@@ -10 +9,0 @@
+-[test_resolvefile.js]
+diff -U0 firefox-88.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js.firefox-tests-xpcshell firefox-88.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js
+--- firefox-88.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js.firefox-tests-xpcshell	2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js	2021-04-19 13:48:57.654847093 +0200
+@@ -30,5 +29,0 @@
+-
+-  result = await Corroborate.verifyJar(
+-    do_get_file("data/signed-components.xpi")
+-  );
+-  equal(result, true, "Components signed files do verify");
+diff -U0 firefox-88.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-88.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
+--- firefox-88.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-04-19 13:50:23.462431517 +0200
+@@ -78,8 +77,0 @@
+-skip-if = appname == "thunderbird" || os == "android" || tsan # tsan: bug 1612707
+-[test_ext_downloads_misc.js]
+-skip-if = 
+-  os == "android" 
+-  os == 'linux' && bits == 32 # bug 1324870
+-  tsan # bug 1612707
+-  os == "win" && bits == 32 # bug 1559476
+-[test_ext_downloads_private.js]
+@@ -254,2 +245,0 @@
+-[test_proxy_listener.js]
+-skip-if = appname == "thunderbird"
+diff -U0 firefox-88.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/components/search/tests/xpcshell/xpcshell.ini
+--- firefox-88.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/components/search/tests/xpcshell/xpcshell.ini	2021-04-19 13:48:57.654847093 +0200
+@@ -125 +124,0 @@
+-[test_reload_engines.js]
+@@ -132 +130,0 @@
+-[test_searchSuggest.js]
+@@ -143,2 +140,0 @@
+-[test_settings.js]
+-[test_sort_orders-no-hints.js]
+diff -U0 firefox-88.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js.firefox-tests-xpcshell firefox-88.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
+--- firefox-88.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js.firefox-tests-xpcshell	2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js	2021-04-19 13:48:57.655847123 +0200
+@@ -598,20 +597,0 @@
+-  Assert.ok(
+-    withSuspend - withoutSuspend <= max_delta_ms,
+-    "In test condition, the two uptimes should be close to each other"
+-  );
+-
+-  // This however should always hold, except on Windows < 10, where the two
+-  // clocks are from different system calls, and it can fail in test condition
+-  // because the machine has not been suspended.
+-  if (
+-    AppConstants.platform != "win" ||
+-    AppConstants.isPlatformAndVersionAtLeast("win", "10.0")
+-  ) {
+-    Assert.greaterOrEqual(
+-      withSuspend,
+-      withoutSuspend,
+-      `The uptime with suspend must always been greater or equal to the uptime
+-       without suspend`
+-    );
+-  }
+-
+diff -U0 firefox-88.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
+--- firefox-88.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini	2021-04-19 13:48:57.654847093 +0200
+@@ -10 +9,0 @@
+-[test_subprocess.js]
+diff -U0 firefox-88.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini
+--- firefox-88.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.firefox-tests-xpcshell	2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini	2021-04-19 13:48:57.654847093 +0200
+@@ -4 +3,0 @@
+-[test_DownloadUtils.js]
+diff -U0 firefox-88.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+--- firefox-88.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-04-19 13:48:57.654847093 +0200
+@@ -97 +96,0 @@
+-[test_sideloads_after_rebuild.js]
+@@ -112 +110,0 @@
+-[test_startup_scan.js]
+@@ -192,2 +189,0 @@
+-tags = webextensions
+-[test_webextension_theme.js]
+diff -U0 firefox-88.0/toolkit/profile/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/profile/xpcshell/xpcshell.ini
+--- firefox-88.0/toolkit/profile/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/profile/xpcshell/xpcshell.ini	2021-04-19 13:48:57.654847093 +0200
+@@ -32,3 +31,0 @@
+-[test_snatch_environment.js]
+-[test_skip_locked_environment.js]
+-[test_snatch_environment_default.js]
+diff -U0 firefox-88.0/uriloader/exthandler/tests/unit/test_handlerService.js.firefox-tests-xpcshell firefox-88.0/uriloader/exthandler/tests/unit/test_handlerService.js
+--- firefox-88.0/uriloader/exthandler/tests/unit/test_handlerService.js.firefox-tests-xpcshell	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/uriloader/exthandler/tests/unit/test_handlerService.js	2021-04-19 13:48:57.655847123 +0200
+@@ -145 +145 @@
+-  Assert.ok(!protoInfo.alwaysAskBeforeHandling);
+  //Assert.ok(!protoInfo.alwaysAskBeforeHandling);
--- a/firefox.1
+++ b/firefox.1
@ -1,4 +1,4 @@
-.TH FIREFOX 1 "July 10, 2019" firefox "Linux User's Manual"
+.TH FIREFOX 1 "November 30, 2017" firefox "Linux User's Manual"
 .SH NAME
 firefox \- a Web browser for X11 derived from the Mozilla browser

@ -6,10 +6,17 @@ firefox \- a Web browser for X11 derived from the Mozilla browser
 .B firefox
 [\fIOPTIONS\fR ...] [\fIURL\fR]

+.B firefox-bin
+[\fIOPTIONS\fR] [\fIURL\fR]
+
 .SH DESCRIPTION
 \fBMozilla Firefox\fR is an open-source web browser, designed for
 standards compliance, performance and portability.

+.SH USAGE
+\fBfirefox\fR is a simple shell script that will set up the
+environment for the actual executable, \fBfirefox-bin\fR.
+
 .SH OPTIONS
 A summary of the options supported by \fBfirefox\fR is included below.

@ -26,10 +33,10 @@ Make all warnings fatal

 .SS "Firefox options"
 .TP
-.B \-h, \--help
+.B \-h, \-help
 Show summary of options.
 .TP
-.B \-v, \--version
+.B \-v, \-version
 Print Firefox version.
 .TP
 \fB\-P\fR \fIprofile\fR
@ -56,22 +63,11 @@ Start with \fIlocale\fR resources as UI Locale.
 \fB\-\-safe\-mode\fR
 Disables extensions and themes for this session.
 .TP
-\fB\--allow-downgrade\fR
-Allows downgrading a profile.                                              
-.TP
-\fB\--MOZ_LOG\fR=\fImodules\fR
-Treated as \fBMOZ_LOG\fR=\fImodules\fR environment variable, overrides it.           
-.TP
-\fB\--MOZ_LOG_FILE\fR=\fIfile\fR
-Treated as \fBMOZ_LOG_FILE\fR=\fIfile\fR environment variable, overrides it.  If
-MOZ_LOG_FILE is not specified as an argument or as an environment variable,
-logging will be written to stdout.
-.TP
 \fB\-\-headless\fR
 Run without a GUI.
 .TP
-\fB\-\-save-recordings\fR
-Save recordings for all content processes to a directory.
+\fB\-\-marionette\fR
+Enable remote control server.
 .TP
 \fB\-\-browser\fR
 Open a browser window.
@ -97,9 +93,8 @@ Width and optionally height of screenshot.
 \fB\-\-search\fR \fIterm\fR
 Search \fIterm\fR with your default search engine.
 .TP
-\fB\-\-setDefaultBrowser\fR
-Set this app as the default browser.
-.TP
+
+
 \fB\-\-jsconsole\fR
 Open the Browser Console.
 .TP
@ -120,16 +115,19 @@ Record drawing for a given URL.
 .TP
 \fB\-\-recording-output\fR \fIfile\fR
 Specify destination file for a drawing recording.
+.TP
+\fB\-\-setDefaultBrowser\fR
+Set this app as the default browser.

 .SH FILES
 \fI/usr/bin/firefox\fR - shell script wrapping
 \fBfirefox\fR
 .br
-\fI/usr/lib64/firefox/firefox\fR - \fBfirefox\fR
+\fI/usr/lib64/firefox/firefox-bin\fR - \fBfirefox\fR
 executable

 .SH VERSION
-68.0
+57.0

 .SH BUGS
 To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR
--- a/firefox.desktop
+++ b/firefox.desktop
@ -1,520 +1,47 @@
 [Desktop Entry]
 Version=1.0
 Name=Firefox
-Name[ach]=Firefox
-Name[af]=Firefox
-Name[an]=Firefox
-Name[ar]=Firefox
-Name[ast]=Firefox
-Name[az]=Firefox
-Name[be]=Firefox
-Name[bg]=Firefox
-Name[bn]=Firefox
-Name[br]=Firefox
-Name[bs]=Firefox
-Name[ca]=Firefox
-Name[ca_valencia]=Firefox
-Name[cak]=Firefox
-Name[cs]=Firefox
-Name[cy]=Firefox
-Name[da]=Firefox
-Name[de]=Firefox
-Name[dsb]=Firefox
-Name[el]=Firefox
-Name[en_CA]=Firefox
-Name[en_GB]=Firefox
-Name[eo]=Firefox
-Name[es_AR]=Firefox
-Name[es_CL]=Firefox
-Name[es_ES]=Firefox
-Name[es_MX]=Firefox
-Name[et]=Firefox
-Name[eu]=Firefox
-Name[fa]=Firefox
-Name[ff]=Firefox
-Name[fi]=Firefox
-Name[fr]=Firefox
-Name[fur]=Firefox
-Name[fy_NL]=Firefox
-Name[ga_IE]=Firefox
-Name[gd]=Firefox
-Name[gl]=Firefox
-Name[gn]=Firefox
-Name[gu_IN]=Firefox
-Name[he]=Firefox
-Name[hi_IN]=Firefox
-Name[hr]=Firefox
-Name[hsb]=Firefox
-Name[hu]=Firefox
-Name[hy_AM]=Firefox
-Name[ia]=Firefox
-Name[id]=Firefox
-Name[is]=Firefox
-Name[it]=Firefox
-Name[ja]=Firefox
-Name[ka]=Firefox
-Name[kab]=Firefox
-Name[kk]=Firefox
-Name[km]=Firefox
-Name[kn]=Firefox
-Name[ko]=Firefox
-Name[lij]=Firefox
-Name[lt]=Firefox
-Name[lv]=Firefox
-Name[mk]=Firefox
-Name[mr]=Firefox
-Name[ms]=Firefox
-Name[my]=Firefox
-Name[nb_NO]=Firefox
-Name[ne_NP]=Firefox
-Name[nl]=Firefox
-Name[nn_NO]=Firefox
-Name[oc]=Firefox
-Name[pa_IN]=Firefox
-Name[pl]=Firefox
-Name[pt_BR]=Firefox
-Name[pt_PT]=Firefox
-Name[rm]=Firefox
-Name[ro]=Firefox
-Name[ru]=Firefox
-Name[sat]=Firefox
-Name[sc]=Firefox
-Name[sco]=Firefox
-Name[si]=Firefox
-Name[sk]=Firefox
-Name[skr]=Firefox
-Name[sl]=Firefox
-Name[son]=Firefox
-Name[sq]=Firefox
-Name[sr]=Firefox
-Name[sv_SE]=Firefox
-Name[szl]=Firefox
-Name[ta]=Firefox
-Name[te]=Firefox
-Name[tg]=Firefox
-Name[th]=Firefox
-Name[tl]=Firefox
-Name[tr]=Firefox
-Name[trs]=Firefox
-Name[uk]=Firefox
-Name[ur]=Firefox
-Name[uz]=Firefox
-Name[vi]=Firefox
-Name[xh]=Firefox
-Name[zh_CN]=Firefox
-Name[zh_TW]=Firefox
-Comment=Browse the World Wide Web
-Comment[ach]=Browse the World Wide Web
-Comment[af]=Browse the World Wide Web
-Comment[an]=Browse the World Wide Web
-Comment[ar]=تصفح شبكة الوِب العالمية
-Comment[ast]=Browse the World Wide Web
-Comment[az]=Browse the World Wide Web
-Comment[be]=Аглядайце Сеціва
-Comment[bg]=Разгледайте световната мрежа
-Comment[bn]=ওয়ার্ল্ড ওয়াইড ওয়েব ব্রাউজ করুন
-Comment[br]=Ergerzhout ar World Wide Web
-Comment[bs]=Pretražujte World Wide Web
-Comment[ca]=Navegeu pel Web
-Comment[ca_valencia]=Browse the World Wide Web
-Comment[cak]=Tok chupam Word Wide Web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[cy]=Pori'r We Fyd Eang
-Comment[da]=Brug internettet
-Comment[de]=Im Internet surfen
-Comment[dsb]=Pśeglědajśo World Wide Web
-Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό
-Comment[en_CA]=Browse the World Wide Web
-Comment[en_GB]=Browse the World Wide Web
-Comment[eo]=Retumi en la reto
-Comment[es_AR]=Navegar la World Wide Web
-Comment[es_CL]=Navegar por la World Wide Web
-Comment[es_ES]=Navegar por la web
-Comment[es_MX]=Navegar por la web
-Comment[et]=Browse the World Wide Web
-Comment[eu]=Arakatu World Wide Web-a
-Comment[fa]=Browse the World Wide Web
-Comment[ff]=Browse the World Wide Web
-Comment[fi]=Selaa Internetiä
-Comment[fr]=Naviguer sur le Web
-Comment[fur]=Navighe sul Web
-Comment[fy_NL]=Navigearje op it wrâldwide web
-Comment[ga_IE]=Browse the World Wide Web
-Comment[gd]=Rùraich lìon na cruinne
-Comment[gl]=Navegar pola World Wide Web
-Comment[gn]=Eikundaha World Wide Web rupi
-Comment[gu_IN]=Browse the World Wide Web
-Comment[he]=גלישה באינטרנט
-Comment[hi_IN]=Browse the World Wide Web
-Comment[hr]=Pregledaj World Wide Web
-Comment[hsb]=Přehladajće World Wide Web
-Comment[hu]=Böngésszen a világhálón
-Comment[hy_AM]=Զննի՛ր համաշխարհային սարդոստայնը
-Comment[ia]=Navigar sur le Web
-Comment[id]=Jelajahi World Wide Web
-Comment[is]=Vafraðu um veraldarvefinn
-Comment[it]=Naviga sul Web
-Comment[ja]=World Wide Web をブラウジング
-Comment[ka]=მსოფლიო ქსელთან წვდომა
-Comment[kab]=Inig deg Web
-Comment[kk]=Ғаламторды шолу
-Comment[km]=Browse the World Wide Web
-Comment[kn]=Browse the World Wide Web
-Comment[ko]=월드 와이드 웹 탐색
-Comment[lij]=Browse the World Wide Web
-Comment[lt]=Browse the World Wide Web
-Comment[lv]=Pārlūkojiet globālo tīmekli
-Comment[mk]=Browse the World Wide Web
-Comment[mr]=Browse the World Wide Web
-Comment[ms]=Browse the World Wide Web
-Comment[my]=Browse the World Wide Web
-Comment[nb_NO]=Surf på nettet
-Comment[ne_NP]=वर्ल्ड वाइड वेब ब्राउज गर्नुहोस्
-Comment[nl]=Navigeren op het wereldwijde web
-Comment[nn_NO]=Surf på nettet
-Comment[oc]=Navegar pel Web
-Comment[pa_IN]=ਵਰਲਡ ਵਾਈਡ ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਕਰੋ
-Comment[pl]=Przeglądaj Internet
-Comment[pt_BR]=Navegue na World Wide Web
-Comment[pt_PT]=Navegar na Internet
-Comment[rm]=Navigar en il web
-Comment[ro]=Browse the World Wide Web
-Comment[ru]=Доступ в Интернет
-Comment[sat]=World Wide Web ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ
-Comment[sc]=Nàviga su Web
-Comment[sco]=Browse the World Wide Web
-Comment[si]=ලෝක ව්‍යාප්ත වියමන පිරික්සන්න
-Comment[sk]=Prehľadávať web (www)
-Comment[skr]=ورلڈ وائیڈ ویب براؤز کرو
-Comment[sl]=Brskanje po svetovnem spletu
-Comment[son]=Browse the World Wide Web
-Comment[sq]=Shfletoni në World Wide Web
-Comment[sr]=Истражите интернет
-Comment[sv_SE]=Surfa på webben
-Comment[szl]=Browse the World Wide Web
-Comment[ta]=Browse the World Wide Web
-Comment[te]=ప్రపంచ వ్యాప్త జాలంలో విహరించండి
-Comment[tg]=Ба шабакаи ҷаҳонии Интернет дастрасӣ пайдо намоед
-Comment[th]=เรียกดูเวิลด์ไวด์เว็บ
-Comment[tl]=Browse the World Wide Web
-Comment[tr]=Web’de gezin
-Comment[trs]=Gāchē nu ngà World Wide Web
-Comment[uk]=Переглядайте всесвітню мережу
-Comment[ur]=Browse the World Wide Web
-Comment[uz]=Browse the World Wide Web
-Comment[vi]=Duyệt web trên toàn thế giới
-Comment[xh]=Browse the World Wide Web
-Comment[zh_CN]=浏览万维网
-Comment[zh_TW]=瀏覽全球資訊網
 GenericName=Web Browser
-GenericName[ach]=Web Browser
-GenericName[af]=Web Browser
-GenericName[an]=Web Browser
-GenericName[ar]=متصفح الإنترنت
-GenericName[ast]=Web Browser
-GenericName[az]=Web Browser
-GenericName[be]=Вэб-браўзер
-GenericName[bg]=Уеб браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Merdeer Web
-GenericName[bs]=Web pretraživač
 GenericName[ca]=Navegador web
-GenericName[ca_valencia]=Web Browser
-GenericName[cak]=Web Okik'amaya'l
 GenericName[cs]=Webový prohlížeč
-GenericName[cy]=Porwr Gwe
-GenericName[da]=Webbrowser
-GenericName[de]=Internet-Browser
-GenericName[dsb]=Webwobglědowak
-GenericName[el]=Πρόγραμμα περιήγησης
-GenericName[en_CA]=Web Browser
-GenericName[en_GB]=Web Browser
-GenericName[eo]=Retumilo
-GenericName[es_AR]=Navegador web
-GenericName[es_CL]=Navegador Web
-GenericName[es_ES]=Navegador web
-GenericName[es_MX]=Navegador Web
-GenericName[et]=Web Browser
-GenericName[eu]=Web nabigatzailea
-GenericName[fa]=Web Browser
-GenericName[ff]=Web Browser
-GenericName[fi]=Verkkoselain
-GenericName[fr]=Navigateur web
-GenericName[fur]=Navigadôr Web
-GenericName[fy_NL]=Webbrowser
-GenericName[ga_IE]=Web Browser
-GenericName[gd]=Brabhsair-lìn
-GenericName[gl]=Navegador web
-GenericName[gn]=Ñanduti Kundahára
-GenericName[gu_IN]=Web Browser
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi_IN]=Web Browser
-GenericName[hr]=Web preglednik
-GenericName[hsb]=Webwobhladowak
+GenericName[es]=Navegador web
+GenericName[fa]=مرورگر اینترنتی
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
 GenericName[hu]=Webböngésző
-GenericName[hy_AM]=Վեբ դիտարկիչ
-GenericName[ia]=Navigator web
-GenericName[id]=Peramban Web
-GenericName[is]=Vafri
-GenericName[it]=Browser web
-GenericName[ja]=ウェブブラウザー
-GenericName[ka]=ბრაუზერი
-GenericName[kab]=Iminig web
-GenericName[kk]=Веб-браузері
-GenericName[km]=Web Browser
-GenericName[kn]=Web Browser
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブ・ブラウザ
 GenericName[ko]=웹 브라우저
-GenericName[lij]=Navegatô Web
-GenericName[lt]=Web Browser
-GenericName[lv]=Tīmekļa pārlūks
-GenericName[mk]=Web Browser
-GenericName[mr]=Web Browser
-GenericName[ms]=Web Browser
-GenericName[my]=Web Browser
-GenericName[nb_NO]=Nettleser
-GenericName[ne_NP]=वेब ब्राउजर
+GenericName[nb]=Nettleser
 GenericName[nl]=Webbrowser
-GenericName[nn_NO]=Nettlesar
-GenericName[oc]=Navegador Web
-GenericName[pa_IN]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-GenericName[pl]=Przeglądarka internetowa
-GenericName[pt_BR]=Navegador web
-GenericName[pt_PT]=Navegador Web
-GenericName[rm]=Navigatur web
-GenericName[ro]=Web Browser
-GenericName[ru]=Веб-браузер
-GenericName[sat]=ᱣᱮᱵᱽ ᱵᱽᱨᱟᱣᱡᱚᱨ
-GenericName[sc]=Navigadore web
-GenericName[sco]=Web Browser
-GenericName[si]=වියමන අතිරික්සුව
-GenericName[sk]=Webový prehliadač
-GenericName[skr]=ویب براؤزر
-GenericName[sl]=Spletni brskalnik
-GenericName[son]=Web Browser
-GenericName[sq]=Shfletues
-GenericName[sr]=Веб прегледач
-GenericName[sv_SE]=Webbläsare
-GenericName[szl]=Web Browser
-GenericName[ta]=Web Browser
-GenericName[te]=జాల విహారిణి
-GenericName[tg]=Браузери веб
-GenericName[th]=เว็บเบราว์เซอร์
-GenericName[tl]=Web Browser
-GenericName[tr]=Web Tarayıcısı
-GenericName[trs]=Web riña gāchē nu’
-GenericName[uk]=Браузер
-GenericName[ur]=Web Browser
-GenericName[uz]=Web Browser
-GenericName[vi]=Trình duyệt web
-GenericName[xh]=Web Browser
-GenericName[zh_CN]=Web 浏览器
-GenericName[zh_TW]=網頁瀏覽器
-Keywords=Internet;WWW;Browser;Web;Explorer;
-Keywords[ach]=Internet;WWW;Browser;Web;Explorer;
-Keywords[af]=Internet;WWW;Browser;Web;Explorer;
-Keywords[an]=Internet;WWW;Browser;Web;Explorer;
-Keywords[ar]=إنترنت;WWW;متصفح;ويب;مستكشف;
-Keywords[ast]=Internet;WWW;Browser;Web;Explorer;
-Keywords[az]=Internet;WWW;Browser;Web;Explorer;
-Keywords[be]=Internet;WWW;Browser;Web;Explorer;
-Keywords[bg]=Internet;WWW;Browser;Web;Explorer;
-Keywords[bn]=ইন্টারনেট;WWW;ব্রাউজার;ওয়েব;এক্সপ্লোরার;
-Keywords[br]=Internet;WWW;Merdeer;Web;Ergerzhout;
-Keywords[bs]=Internet;WWW;Pretraživač;Web;Istraživač;
-Keywords[ca]=Internet;WWW;Browser;Web;Explorador;Navegador;
-Keywords[ca_valencia]=Internet;WWW;Browser;Web;Explorer;
-Keywords[cak]=K'amaya'l;WWW;Okik'amaya'l;Kanob'äl;
-Keywords[cs]=internet;WWW;prohlížeč;web;
-Keywords[cy]=Rhyngrwyd;WWW;Porwr;Gwe;Archwiliwr;
-Keywords[da]=Internet;WWW;Browser;Nettet;Explorer;
-Keywords[de]=Internet;WWW;Browser;Web;Explorer;
-Keywords[dsb]=Internet;WWW;wobglědowak;Web;Explorer;
-Keywords[el]=Internet;WWW;Browser;Web;Explorer;Διαδίκτυο;Ιστός;Ίντερνετ;
-Keywords[en_CA]=Internet;WWW;Browser;Web;Explorer;
-Keywords[en_GB]=Internet;WWW;Browser;Web;Explorer;
-Keywords[eo]=Interreto;Retumilo;TTT;Teksaĵo;Reto;Internet;WWW;Browser;Web;Explorer;
-Keywords[es_AR]=Internet;WWW;Navegador;Web;Explorador;
-Keywords[es_CL]=Internet;WWW;Navegador;Web;Explorador;
-Keywords[es_ES]=Internet;WWW;Navegador;Web;Explorador;
-Keywords[es_MX]=Internet;WWW;Navegador;Web;Explorador;
-Keywords[et]=Internet;WWW;Browser;Web;Explorer;
-Keywords[eu]=Internet;WWW;Nabigatzailea;Web;Arakatzailea;
-Keywords[fa]=Internet;WWW;Browser;Web;Explorer;
-Keywords[ff]=Internet;WWW;Browser;Web;Explorer;
-Keywords[fi]=Internet;WWW;Browser;Web;Explorer;netti;webbi;selain;
-Keywords[fr]=Internet;WWW;Navigateur;Web;Explorer;
-Keywords[fur]=Internet;WWW;Browser;Navigadôr;Web;Esploradôr;Explorer;
-Keywords[fy_NL]=Ynternet;WWW;Browser;Web;Ferkenner;
-Keywords[ga_IE]=Internet;WWW;Browser;Web;Explorer;
-Keywords[gd]=Internet;WWW;Browser;Web;Explorer;eadar-lìon;brabhsair;brobhsair;lìon;taisgealaiche;
-Keywords[gl]=Internet;WWW;Navegador;Web;Explorador;
-Keywords[gn]=Internet;WWW;Browser;Web;Explorer;
-Keywords[gu_IN]=Internet;WWW;Browser;Web;Explorer;
-Keywords[he]=אינטרנט;WWW;דפדפן;רשת;סייר;מרשתת;
-Keywords[hi_IN]=Internet;WWW;Browser;Web;Explorer;
-Keywords[hr]=Internet;WWW;Preglednik;Web;Istraživač;
-Keywords[hsb]=Internet;WWW;wobhladowak;Web;Explorer;
-Keywords[hu]=Internet;WWW;Böngésző;Web;Világháló;
-Keywords[hy_AM]=Համացանց,WWW,Զննիչ,Վեբ,Ցանցախույզ:
-Keywords[ia]=Internet;WWW;Navigator;Web;Explorator;
-Keywords[id]=Internet;WWW;Browser;Web;Explorer;
-Keywords[is]=Internet;WWW; Vafri; Vefur; Explorer;
-Keywords[it]=Internet;WWW;Browser;Web;Explorer;Navigatore;
-Keywords[ja]=Internet;WWW;Browser;Web;Explorer;インターネット;ブラウザー;ウェブ;
-Keywords[ka]=ინტერნეტი;WWW;ბრაუზერი;ქსელი;ქსელთან წვდომა;
-Keywords[kab]=Internet;WWW;Browser;Web;Explorer;
-Keywords[kk]=Internet;WWW;Browser;Web;Explorer;Интернет;Ғаламтор;Браузер;Желі;Шолғыш;
-Keywords[km]=Internet;WWW;Browser;Web;Explorer;
-Keywords[kn]=Internet;WWW;Browser;Web;Explorer;
-Keywords[ko]=인터넷;브라우저;웹;탐색기;Internet;WWW;Browser;Web;Explorer;
-Keywords[lij]=Internet;WWW;Browser;Web;Explorer;Navegatô;
-Keywords[lt]=Internet;WWW;Browser;Web;Explorer;
-Keywords[lv]=Internets;WWW;Pārlūkprogramma;Tīmeklis;
-Keywords[mk]=Internet;WWW;Browser;Web;Explorer;
-Keywords[mr]=Internet;WWW;Browser;Web;Explorer;
-Keywords[ms]=Internet;WWW;Browser;Web;Explorer;
-Keywords[my]=Internet;WWW;Browser;Web;Explorer;
-Keywords[nb_NO]=Internett;WWW;Nettleser;Web;Utforsker;
-Keywords[ne_NP]=Internet;WWW;Browser;Web;Explorer;
-Keywords[nl]=Internet;WWW;Browser;Web;Verkenner;
-Keywords[nn_NO]=Internett;WWW;Nettlesar;Web;Utforskar;
-Keywords[oc]=Internet;WWW;Navegador;Navigador;Navegator;Navigator;Web;Explorer;
-Keywords[pa_IN]=ਇੰਟਰਨੈੱਟ;WWW;ਬਰਾਊਜ਼ਰ;ਵੈੱਬ;ਐਕਸਪਲਰੋਰ;ਵੈਬ;ਇੰਟਰਨੈਟ;
-Keywords[pl]=Internet;WWW;Przeglądarka;Browser;Wyszukiwarka;Web;Sieć;Explorer;Eksplorer;Strony;Witryny;internetowe;
-Keywords[pt_BR]=Internet;WWW;Browser;Web;Explorer;Navegador;
-Keywords[pt_PT]=Internet;WWW;Navegador;Web;Explorador;
-Keywords[rm]=Internet;WWW;Browser;Web;Explorer;navigatur;
-Keywords[ro]=Internet;WWW;Browser;Web;Explorer;
-Keywords[ru]=Сеть;Интернет;Браузер;Доступ в Интернет;
-Keywords[sat]=Internet;WWW;Browser;Web;Explorer;
-Keywords[sc]=Internet;WWW;Navigadore;Web;Explorer;
-Keywords[sco]=Internet;WWW;Browser;Web;Explorer;
-Keywords[si]=අන්තර්ජාලය;අතිරික්සුව;පිරික්සන්න;ගවේශකය;Internet;WWW;Browser;Web;Explorer;
-Keywords[sk]=Internet;WWW;Prehliadač;Web;Prieskumník;
-Keywords[skr]=Internet;WWW;Browser;Web;Explorer;
-Keywords[sl]=internet;www;brskalnik;splet;
-Keywords[son]=Internet;WWW;Browser;Web;Explorer;
-Keywords[sq]=Internet;WWW;Shfletues;Web;Eksplorues;
-Keywords[sr]=Internet;WWW;Browser;Web;Explorer;интернет;прегледач;веб;мрежа;прегледач;
-Keywords[sv_SE]=Internet;WWW;Webbläsare;Webb;Utforskare;
-Keywords[szl]=Internet;WWW;Browser;Web;Explorer;
-Keywords[ta]=Internet;WWW;Browser;Web;Explorer;
-Keywords[te]=Internet;WWW;Browser;Web;Explorer;
-Keywords[tg]=Интернет;WWW;Браузер;Сомона;Ҷустуҷӯгар;
-Keywords[th]=อินเทอร์เน็ต;เบราว์เซอร์;เว็บ;Internet;WWW;Browser;Web;Explorer;
-Keywords[tl]=Internet;WWW;Browser;Web;Explorer;
-Keywords[tr]=Internet;WWW;Browser;Web;Explorer;İnternet;Tarayıcı;
-Keywords[trs]=Internet;WWW;Browser;Web;Explorer;
-Keywords[uk]=Інтернет;WWW;Браузер;Веб;Переглядач;
-Keywords[ur]=Internet;WWW;Browser;Web;Explorer;
-Keywords[uz]=Internet;WWW;Browser;Web;Explorer;
-Keywords[vi]=Internet;WWW;Trình duyệt;Web;Duyệt web;
-Keywords[xh]=Internet;WWW;Browser;Web;Explorer;
-Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;
-Keywords[zh_TW]=網際網路;網路;瀏覽器;網頁;上網;Internet;WWW;Browser;Web;Explorer;
-X-GNOME-FullName=Firefox Web Browser
-X-GNOME-FullName[ach]=Firefox Web Browser
-X-GNOME-FullName[af]=Firefox Web Browser
-X-GNOME-FullName[an]=Firefox Web Browser
-X-GNOME-FullName[ar]=متصفح Firefox
-X-GNOME-FullName[ast]=Firefox Web Browser
-X-GNOME-FullName[az]=Firefox Web Browser
-X-GNOME-FullName[be]=Вэб-браўзер Firefox
-X-GNOME-FullName[bg]=Firefox Уеб браузър
-X-GNOME-FullName[bn]=Firefox Web Browser
-X-GNOME-FullName[br]=Merdeer Web Firefox
-X-GNOME-FullName[bs]=Firefox web pretraživač
-X-GNOME-FullName[ca]=Navegador web Firefox
-X-GNOME-FullName[ca_valencia]=Firefox Web Browser
-X-GNOME-FullName[cak]=Firefox Web Browser
-X-GNOME-FullName[cs]=Webový prohlížeč Firefox
-X-GNOME-FullName[cy]=Porwr Gwe Firefox
-X-GNOME-FullName[da]=Firefox-browser
-X-GNOME-FullName[de]=Firefox-Web-Browser
-X-GNOME-FullName[dsb]=Webwobglědowak Firefox
-X-GNOME-FullName[el]=Πρόγραμμα περιήγησης Firefox
-X-GNOME-FullName[en_CA]=Firefox Web Browser
-X-GNOME-FullName[en_GB]=Firefox Web Browser
-X-GNOME-FullName[eo]=Retumilo Firefox
-X-GNOME-FullName[es_AR]=Navegador web Firefox
-X-GNOME-FullName[es_CL]=Navegador web Firefox
-X-GNOME-FullName[es_ES]=Navegador web Firefox
-X-GNOME-FullName[es_MX]=Navegador web Firefox
-X-GNOME-FullName[et]=Firefox Web Browser
-X-GNOME-FullName[eu]=Firefox web nabigatzailea
-X-GNOME-FullName[fa]=Firefox Web Browser
-X-GNOME-FullName[ff]=Firefox Web Browser
-X-GNOME-FullName[fi]=Firefox-verkkoselain
-X-GNOME-FullName[fr]=Navigateur web Firefox
-X-GNOME-FullName[fur]=Navigadôr web Firefox
-X-GNOME-FullName[fy_NL]=Firefox-webbrowser
-X-GNOME-FullName[ga_IE]=Firefox Web Browser
-X-GNOME-FullName[gd]=Brabhsair-lìn Firefox
-X-GNOME-FullName[gl]=Navegador web Firefox
-X-GNOME-FullName[gn]=Firefox Ñanduti Kundahára
-X-GNOME-FullName[gu_IN]=Firefox Web Browser
-X-GNOME-FullName[he]=דפדפן אינטרנט Firefox
-X-GNOME-FullName[hi_IN]=Firefox वेब ब्राउज़र
-X-GNOME-FullName[hr]=Firefox web preglednik
-X-GNOME-FullName[hsb]=Webwobhladowak Firefox
-X-GNOME-FullName[hu]=Firefox webböngésző
-X-GNOME-FullName[hy_AM]=Firefox վեբ դիտարկիչ
-X-GNOME-FullName[ia]=Navigator web Firefox
-X-GNOME-FullName[id]=Firefox Peramban Web
-X-GNOME-FullName[is]=Firefox-vafri
-X-GNOME-FullName[it]=Browser web Firefox
-X-GNOME-FullName[ja]=Firefox ウェブブラウザー
-X-GNOME-FullName[ka]=Firefox-ბრაუზერი
-X-GNOME-FullName[kab]=Iminig web Firefox
-X-GNOME-FullName[kk]=Firefox веб-браузері
-X-GNOME-FullName[km]=Firefox Web Browser
-X-GNOME-FullName[kn]=Firefox Web Browser
-X-GNOME-FullName[ko]=Firefox 웹 브라우저
-X-GNOME-FullName[lij]=Firefox Navegatô Web
-X-GNOME-FullName[lt]=Firefox Web Browser
-X-GNOME-FullName[lv]=Firefox tīmekļa pārlūks
-X-GNOME-FullName[mk]=Firefox Web Browser
-X-GNOME-FullName[mr]=Firefox Web Browser
-X-GNOME-FullName[ms]=Firefox Web Browser
-X-GNOME-FullName[my]=Firefox Web Browser
-X-GNOME-FullName[nb_NO]=Firefox-nettleser
-X-GNOME-FullName[ne_NP]=Firefox वेब ब्राउजर
-X-GNOME-FullName[nl]=Firefox-webbrowser
-X-GNOME-FullName[nn_NO]=Firefox-nettlesar
-X-GNOME-FullName[oc]=Navegador web Firefox
-X-GNOME-FullName[pa_IN]=Firefox ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-X-GNOME-FullName[pl]=Przeglądarka Firefox
-X-GNOME-FullName[pt_BR]=Navegador web Firefox
-X-GNOME-FullName[pt_PT]=Navegador Web Firefox
-X-GNOME-FullName[rm]=Navigatur-web Firefox
-X-GNOME-FullName[ro]=Firefox Web Browser
-X-GNOME-FullName[ru]=Веб-браузер Firefox
-X-GNOME-FullName[sat]=Firefox ᱣᱮᱵᱽ ᱵᱽᱨᱟᱣᱡᱚᱨ
-X-GNOME-FullName[sc]=Navigadore web Firefox
-X-GNOME-FullName[sco]=Firefox Web Browser
-X-GNOME-FullName[si]=Firefox අතිරික්සුව
-X-GNOME-FullName[sk]=Webový prehliadač Firefox
-X-GNOME-FullName[skr]=Firefox ویب براؤزر
-X-GNOME-FullName[sl]=Spletni brskalnik Firefox
-X-GNOME-FullName[son]=Firefox Web Browser
-X-GNOME-FullName[sq]=Shfletuesi Firefox
-X-GNOME-FullName[sr]=Firefox веб прегледач
-X-GNOME-FullName[sv_SE]=Firefox webbläsare
-X-GNOME-FullName[szl]=Firefox Web Browser
-X-GNOME-FullName[ta]=Firefox Web Browser
-X-GNOME-FullName[te]=Firefox Web Browser
-X-GNOME-FullName[tg]=Браузери интернетии «Firefox»
-X-GNOME-FullName[th]=เว็บเบราว์เซอร์ Firefox
-X-GNOME-FullName[tl]=Firefox Web Browser
-X-GNOME-FullName[tr]=Firefox Web Tarayıcısı
-X-GNOME-FullName[trs]=Firefox Web riña gāchē nu’
-X-GNOME-FullName[uk]=Браузер Firefox
-X-GNOME-FullName[ur]=Firefox Web Browser
-X-GNOME-FullName[uz]=Firefox Web Browser
-X-GNOME-FullName[vi]=Trình duyệt Web Firefox
-X-GNOME-FullName[xh]=Firefox Web Browser
-X-GNOME-FullName[zh_CN]=Firefox 浏览器
-X-GNOME-FullName[zh_TW]=Firefox 網頁瀏覽器
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[sk]=Internetový prehliadač
+GenericName[sv]=Webbläsare
+Comment=Browse the Web
+Comment[ca]=Navegueu per el web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[de]=Im Internet surfen
+Comment[es]=Navegue por la web
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Navigue sur Internet
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[sk]=Prehliadanie internetu
+Comment[sv]=Surfa på webben
 Exec=firefox %u
 Icon=firefox
 Terminal=false
@ -522,324 +49,226 @@ Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 StartupNotify=true
 Categories=Network;WebBrowser;
+Keywords=web;browser;internet;
 Actions=new-window;new-private-window;profile-manager-window;
-# Activable desktop file crashes KDE so remove it for now
-# DBusActivatable=true

 [Desktop Action new-window]
-Name=New Window
-Name[ach]=New Window
-Name[af]=New Window
-Name[an]=New Window
+Name=Open a New Window
+Name[ach]=Dirica manyen
+Name[af]=Nuwe venster
+Name[an]=Nueva finestra
 Name[ar]=نافذة جديدة
-Name[ast]=New Window
-Name[az]=New Window
+Name[as]=নতুন উইন্ডো
+Name[ast]=Ventana nueva
+Name[az]=Yeni Pəncərə
 Name[be]=Новае акно
 Name[bg]=Нов прозорец
-Name[bn]=নতুন উইন্ডো
+Name[bn_BD]=নতুন উইন্ডো (N)
+Name[bn_IN]=নতুন উইন্ডো
 Name[br]=Prenestr nevez
+Name[brx]=गोदान उइन्ड'(N)
 Name[bs]=Novi prozor
 Name[ca]=Finestra nova
-Name[ca_valencia]=New Window
-Name[cak]=K'ak'a' Tzuwäch
+Name[cak]=K'ak'a' tzuwäch
 Name[cs]=Nové okno
 Name[cy]=Ffenestr Newydd
 Name[da]=Nyt vindue
 Name[de]=Neues Fenster
 Name[dsb]=Nowe wokno
 Name[el]=Νέο παράθυρο
-Name[en_CA]=New Window
 Name[en_GB]=New Window
+Name[en_US]=New Window
+Name[en_ZA]=New Window
 Name[eo]=Nova fenestro
 Name[es_AR]=Nueva ventana
 Name[es_CL]=Nueva ventana
 Name[es_ES]=Nueva ventana
 Name[es_MX]=Nueva ventana
-Name[et]=New Window
+Name[et]=Uus aken
 Name[eu]=Leiho berria
 Name[fa]=پنجره جدید‌
-Name[ff]=New Window
+Name[ff]=Henorde Hesere
 Name[fi]=Uusi ikkuna
 Name[fr]=Nouvelle fenêtre
-Name[fur]=Gnûf barcon
 Name[fy_NL]=Nij finster
-Name[ga_IE]=New Window
+Name[ga_IE]=Fuinneog Nua
 Name[gd]=Uinneag ùr
 Name[gl]=Nova xanela
 Name[gn]=Ovetã pyahu
-Name[gu_IN]=New Window
+Name[gu_IN]=નવી વિન્ડો
 Name[he]=חלון חדש
-Name[hi_IN]=New Window
+Name[hi_IN]=नया विंडो
 Name[hr]=Novi prozor
 Name[hsb]=Nowe wokno
 Name[hu]=Új ablak
-Name[hy_AM]=Նոր պատուհան
-Name[ia]=Nove fenestra
+Name[hy_AM]=Նոր Պատուհան
 Name[id]=Jendela Baru
 Name[is]=Nýr gluggi
 Name[it]=Nuova finestra
 Name[ja]=新しいウィンドウ
+Name[ja_JP-mac]=新規ウインドウ
 Name[ka]=ახალი ფანჯარა
-Name[kab]=Asfaylu amaynut
 Name[kk]=Жаңа терезе
-Name[km]=New Window
-Name[kn]=New Window
+Name[km]=បង្អួចថ្មី
+Name[kn]=ಹೊಸ ಕಿಟಕಿ
 Name[ko]=새 창
-Name[lij]=Neuvo Barcon
-Name[lt]=New Window
+Name[kok]=नवें जनेल
+Name[ks]=نئئ وِنڈو
+Name[lij]=Neuvo barcon
+Name[lo]=ຫນ້າຕ່າງໃຫມ່
+Name[lt]=Naujas langas
+Name[ltg]=Jauns lūgs
 Name[lv]=Jauns logs
-Name[mk]=New Window
-Name[mr]=New Window
-Name[ms]=New Window
-Name[my]=New Window
+Name[mai]=नव विंडो
+Name[mk]=Нов прозорец
+Name[ml]=പുതിയ ജാലകം
+Name[mr]=नवीन पटल
+Name[ms]=Tetingkap Baru
+Name[my]=ဝင်းဒိုးအသစ်
 Name[nb_NO]=Nytt vindu
 Name[ne_NP]=नयाँ सञ्झ्याल
 Name[nl]=Nieuw venster
 Name[nn_NO]=Nytt vindauge
-Name[oc]=Fenèstra novèla
+Name[or]=ନୂତନ ୱିଣ୍ଡୋ
 Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ
 Name[pl]=Nowe okno
 Name[pt_BR]=Nova janela
 Name[pt_PT]=Nova janela
 Name[rm]=Nova fanestra
-Name[ro]=New Window
+Name[ro]=Fereastră nouă
 Name[ru]=Новое окно
-Name[sat]=ᱱᱟᱶᱟ ᱣᱤᱱᱰᱳ
-Name[sc]=Ventana noa
-Name[sco]=New Window
-Name[si]=නව කවුළුව
+Name[sat]=नावा विंडो (N)
+Name[si]=නව කවුළුවක්
 Name[sk]=Nové okno
-Name[skr]=نویں ونڈو
 Name[sl]=Novo okno
-Name[son]=New Window
+Name[son]=Zanfun taaga
 Name[sq]=Dritare e Re
 Name[sr]=Нови прозор
 Name[sv_SE]=Nytt fönster
-Name[szl]=New Window
-Name[ta]=New Window
-Name[te]=కొత్త కిటికీ
-Name[tg]=Равзанаи нав
+Name[ta]=புதிய சாளரம்
+Name[te]=కొత్త విండో
 Name[th]=หน้าต่างใหม่
-Name[tl]=New Window
 Name[tr]=Yeni pencere
-Name[trs]=Bēntanâ nākàa
+Name[tsz]=Eraatarakua jimpani
 Name[uk]=Нове вікно
-Name[ur]=New Window
-Name[uz]=New Window
+Name[ur]=نیا دریچہ
+Name[uz]=Yangi oyna
 Name[vi]=Cửa sổ mới
-Name[xh]=New Window
+Name[wo]=Palanteer bu bees
+Name[xh]=Ifestile entsha
 Name[zh_CN]=新建窗口
 Name[zh_TW]=開新視窗
 Exec=firefox --new-window %u

 [Desktop Action new-private-window]
-Name=New Private Window
-Name[ach]=New Private Window
-Name[af]=New Private Window
-Name[an]=New Private Window
+Name=Open a New Private Window
+Name[ach]=Dirica manyen me mung
+Name[af]=Nuwe privaatvenster
+Name[an]=Nueva finestra privada
 Name[ar]=نافذة خاصة جديدة
-Name[ast]=New Private Window
-Name[az]=New Private Window
-Name[be]=Новае прыватнае акно
-Name[bg]=Нов личен прозорец
-Name[bn]=নতুন ব্যক্তিগত উইন্ডো
-Name[br]=Prenestr prevez nevez
+Name[as]=নতুন ব্যক্তিগত উইন্ডো
+Name[ast]=Ventana privada nueva
+Name[az]=Yeni Məxfi Pəncərə
+Name[be]=Новае акно адасаблення
+Name[bg]=Нов прозорец за поверително сърфиране
+Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
+Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো
+Name[br]=Prenestr merdeiñ prevez nevez
+Name[brx]=गोदान प्राइभेट उइन्ड'
 Name[bs]=Novi privatni prozor
 Name[ca]=Finestra privada nova
-Name[ca_valencia]=New Private Window
-Name[cak]=K'ak'a' Ichinan Tzuwäch
+Name[cak]=K'ak'a' ichinan tzuwäch
 Name[cs]=Nové anonymní okno
 Name[cy]=Ffenestr Breifat Newydd
 Name[da]=Nyt privat vindue
 Name[de]=Neues privates Fenster
 Name[dsb]=Nowe priwatne wokno
-Name[el]=Νέο ιδιωτικό παράθυρο
-Name[en_CA]=New Private Window
+Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
 Name[en_GB]=New Private Window
+Name[en_US]=New Private Window
+Name[en_ZA]=New Private Window
 Name[eo]=Nova privata fenestro
 Name[es_AR]=Nueva ventana privada
 Name[es_CL]=Nueva ventana privada
 Name[es_ES]=Nueva ventana privada
 Name[es_MX]=Nueva ventana privada
-Name[et]=New Private Window
+Name[et]=Uus privaatne aken
 Name[eu]=Leiho pribatu berria
 Name[fa]=پنجره ناشناس جدید
-Name[ff]=New Private Window
+Name[ff]=Henorde Suturo Hesere
 Name[fi]=Uusi yksityinen ikkuna
-Name[fr]=Nouvelle fenêtre privée
-Name[fur]=Gnûf barcon privât
+Name[fr]=Nouvelle fenêtre de navigation privée
 Name[fy_NL]=Nij priveefinster
-Name[ga_IE]=New Private Window
+Name[ga_IE]=Fuinneog Nua Phríobháideach
 Name[gd]=Uinneag phrìobhaideach ùr
 Name[gl]=Nova xanela privada
 Name[gn]=Ovetã ñemi pyahu
-Name[gu_IN]=New Private Window
+Name[gu_IN]=નવી ખાનગી વિન્ડો
 Name[he]=חלון פרטי חדש
-Name[hi_IN]=New Private Window
+Name[hi_IN]=नयी निजी विंडो
 Name[hr]=Novi privatni prozor
 Name[hsb]=Nowe priwatne wokno
 Name[hu]=Új privát ablak
-Name[hy_AM]=Նոր գաղտնի պատուհան
-Name[ia]=Nove fenestra private
+Name[hy_AM]=Սկսել Գաղտնի դիտարկում
 Name[id]=Jendela Mode Pribadi Baru
 Name[is]=Nýr huliðsgluggi
 Name[it]=Nuova finestra anonima
 Name[ja]=新しいプライベートウィンドウ
+Name[ja_JP-mac]=新規プライベートウインドウ
 Name[ka]=ახალი პირადი ფანჯარა
-Name[kab]=Asfaylu amaynut n tunigin tusligt
 Name[kk]=Жаңа жекелік терезе
-Name[km]=New Private Window
-Name[kn]=New Private Window
-Name[ko]=새 사생활 보호 창
-Name[lij]=Neuvo Barcon Privòu
-Name[lt]=New Private Window
+Name[km]=បង្អួចឯកជនថ្មី
+Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
+Name[ko]=새 사생활 보호 모드
+Name[kok]=नवो खाजगी विंडो
+Name[ks]=نْو پرایوٹ وینڈو&amp;
+Name[lij]=Neuvo barcon privou
+Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່
+Name[lt]=Naujas privataus naršymo langas
+Name[ltg]=Jauns privatais lūgs
 Name[lv]=Jauns privātais logs
-Name[mk]=New Private Window
-Name[mr]=New Private Window
-Name[ms]=New Private Window
+Name[mai]=नया निज विंडो (W)
+Name[mk]=Нов приватен прозорец
+Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
+Name[mr]=नवीन वैयक्तिक पटल
+Name[ms]=Tetingkap Persendirian Baharu
 Name[my]=New Private Window
 Name[nb_NO]=Nytt privat vindu
 Name[ne_NP]=नयाँ निजी सञ्झ्याल
 Name[nl]=Nieuw privévenster
 Name[nn_NO]=Nytt privat vindauge
-Name[oc]=Fenèstra privada novèla
+Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
 Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
 Name[pl]=Nowe okno prywatne
 Name[pt_BR]=Nova janela privativa
 Name[pt_PT]=Nova janela privada
 Name[rm]=Nova fanestra privata
-Name[ro]=New Private Window
+Name[ro]=Fereastră privată nouă
 Name[ru]=Новое приватное окно
-Name[sat]=ᱱᱟᱶᱟ ᱱᱤᱡᱮᱨᱟᱜ ᱣᱤᱱᱰᱳ
-Name[sc]=Ventana privada noa
-Name[sco]=New Private Window
-Name[si]=නව පෞද්. කවුළුව
-Name[sk]=Nové súkromné okno
-Name[skr]=نویں نجی ونڈو
+Name[sat]=नावा निजेराक् विंडो (W )
+Name[si]=නව පුද්ගලික කවුළුව (W)
+Name[sk]=Nové okno v režime Súkromné prehliadanie
 Name[sl]=Novo zasebno okno
-Name[son]=New Private Window
+Name[son]=Sutura zanfun taaga
 Name[sq]=Dritare e Re Private
-Name[sr]=Нови приватни прозор
+Name[sr]=Нови приватан прозор
 Name[sv_SE]=Nytt privat fönster
-Name[szl]=New Private Window
-Name[ta]=New Private Window
-Name[te]=కొత్త ఆంతరంగిక కిటికీ
-Name[tg]=Равзанаи хусусии нав
+Name[ta]=புதிய தனிப்பட்ட சாளரம்
+Name[te]=కొత్త ఆంతరంగిక విండో
 Name[th]=หน้าต่างส่วนตัวใหม่
-Name[tl]=New Private Window
 Name[tr]=Yeni gizli pencere
-Name[trs]=Bēntanâ huì nākàa
+Name[tsz]=Juchiiti eraatarakua jimpani
 Name[uk]=Приватне вікно
-Name[ur]=New Private Window
-Name[uz]=New Private Window
+Name[ur]=نیا نجی دریچہ
+Name[uz]=Yangi maxfiy oyna
 Name[vi]=Cửa sổ riêng tư mới
-Name[xh]=New Private Window
-Name[zh_CN]=新建隐私窗口
-Name[zh_TW]=開新隱私視窗
+Name[wo]=Panlanteeru biir bu bees
+Name[xh]=Ifestile yangasese entsha
+Name[zh_CN]=新建隐私浏览窗口
+Name[zh_TW]=新增隱私視窗
 Exec=firefox --private-window %u

-[Desktop Action open-profile-manager]
-Name=Open Profile Manager
-Name[ach]=Open Profile Manager
-Name[af]=Open Profile Manager
-Name[an]=Open Profile Manager
-Name[ar]=افتح مدير الملف الشخصي
-Name[ast]=Open Profile Manager
-Name[az]=Open Profile Manager
-Name[be]=Адкрыць менеджар профіляў
-Name[bg]=Отваряне на мениджъра на профили
-Name[bn]=Open Profile Manager
-Name[br]=Digeriñ an ardoer aeladoù
-Name[bs]=Otvori Menadžera profila
-Name[ca]=Obre el gestor de perfils
-Name[ca_valencia]=Open Profile Manager
-Name[cak]=Open Profile Manager
-Name[cs]=Otevřete Správce profilů
-Name[cy]=Agorwch y Rheolwr Proffil
-Name[da]=Åbn profilhåndtering
-Name[de]=Profilverwaltung öffnen
-Name[dsb]=Profilowy zastojnik wócyniś
-Name[el]=Άνοιγμα Διαχείρισης προφίλ
-Name[en_CA]=Open Profile Manager
-Name[en_GB]=Open Profile Manager
-Name[eo]=Malfermi administranton de profiloj
-Name[es_AR]=Abrir administrador de perfiles
-Name[es_CL]=Abrir administrador de perfiles
-Name[es_ES]=Abrir administrador de perfiles
-Name[es_MX]=Abrir administrador de perfiles
-Name[et]=Open Profile Manager
-Name[eu]=Ireki profilen kudeatzailea
-Name[fa]=Open Profile Manager
-Name[ff]=Open Profile Manager
-Name[fi]=Avaa profiilien hallinta
-Name[fr]=Ouvrir le gestionnaire de profils
-Name[fur]=Vierç gjestôr profîi
-Name[fy_NL]=Profylbehearder iepenje
-Name[ga_IE]=Open Profile Manager
-Name[gd]=Fosgail manaidsear nam pròifilean
-Name[gl]=Abrir o xestor de perfís
-Name[gn]=Embojuruja mba’ete ñangarekoha
-Name[gu_IN]=Open Profile Manager
-Name[he]=פתיחת מנהל הפרופילים
-Name[hi_IN]=Open Profile Manager
-Name[hr]=Otvori upravljač profila
-Name[hsb]=Zrjadowak profilow wočinić
-Name[hu]=Profilkezelő megnyitása
-Name[hy_AM]=Բացեք պրոֆիլի կառավարիչը
-Name[ia]=Aperir le gestor de profilo
-Name[id]=Buka Pengelola Profil
-Name[is]=Opna umsýslu notandasniða
-Name[it]=Apri gestore profili
-Name[ja]=プロファイルマネージャーを開く
-Name[ka]=პროფილის მმართველის გახსნა
-Name[kab]=Ldi amsefrak n umaɣnu
-Name[kk]=Профильдер бақарушысын ашу
-Name[km]=Open Profile Manager
-Name[kn]=Open Profile Manager
-Name[ko]=프로필 관리자 열기
-Name[lij]=Open Profile Manager
-Name[lt]=Open Profile Manager
-Name[lv]=Atvērt profilu pārvaldnieku
-Name[mk]=Open Profile Manager
-Name[mr]=Open Profile Manager
-Name[ms]=Open Profile Manager
-Name[my]=Open Profile Manager
-Name[nb_NO]=Åpne profilbehandler
-Name[ne_NP]=Open Profile Manager
-Name[nl]=Profielbeheerder openen
-Name[nn_NO]=Opne profilhandsaming
-Name[oc]=Dobrir lo gestionari de perfils
-Name[pa_IN]=ਪਰੋਫ਼ਾਈਲ ਮੈਨੇਜਰ ਖੋਲ੍ਹੋ
-Name[pl]=Menedżer profili
-Name[pt_BR]=Abrir gerenciador de perfis
-Name[pt_PT]=Abrir o Gestor de Perfis
-Name[rm]=Avrir l'administraziun da profils
-Name[ro]=Open Profile Manager
-Name[ru]=Открыть менеджер профилей
-Name[sat]=ᱢᱮᱫᱦᱟᱸ ᱢᱮᱱᱮᱡᱚᱨ ᱠᱷᱩᱞᱟᱹᱭ ᱢᱮ
-Name[sc]=Aberi su gestore de profilos
-Name[sco]=Open Profile Manager
-Name[si]=පැතිකඩ කළමනාකරු අරින්න
-Name[sk]=Otvoriť Správcu profilov
-Name[skr]=پروفائل منیجر کھولو
-Name[sl]=Odpri upravitelja profilov
-Name[son]=Open Profile Manager
-Name[sq]=Hapni Përgjegjës Profilesh
-Name[sr]=Отворите управљач профила
-Name[sv_SE]=Öppna Profilhanteraren
-Name[szl]=Open Profile Manager
-Name[ta]=Open Profile Manager
-Name[te]=Open Profile Manager
-Name[tg]=Кушодани мудири профилҳо
-Name[th]=เปิดตัวจัดการโปรไฟล์
-Name[tl]=Open Profile Manager
-Name[tr]=Profil yöneticisini aç
-Name[trs]=Sa nīkāj ñu’ūnj nej perfî huā nì’nï̀nj ïn
-Name[uk]=Відкрити менеджер профілів
-Name[ur]=Open Profile Manager
-Name[uz]=Open Profile Manager
-Name[vi]=Mở trình quản lý hồ sơ
-Name[xh]=Open Profile Manager
-Name[zh_CN]=打开配置文件管理器
-Name[zh_TW]=開啟設定檔管理員
+[Desktop Action profile-manager-window]
+Name=Open the Profile Manager
+Name[cs]=Správa profilů
 Exec=firefox --ProfileManager
--- a/firefox.sh.in
+++ b/firefox.sh.in
@ -64,8 +64,23 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox"
 MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
 MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
 MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
+MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"
 GETENFORCE_FILE="/usr/sbin/getenforce"

+##
+## Enable Wayland backend?
+##
+if ! [ $MOZ_DISABLE_WAYLAND ] && [ "$WAYLAND_DISPLAY" ]; then
+  if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
+    export MOZ_ENABLE_WAYLAND=1
+  fi
+##  Enable Wayland on KDE/Sway
+##
+  if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
+    export MOZ_ENABLE_WAYLAND=1
+  fi
+fi
+
 ##
 ## Use D-Bus remote exclusively when there's Wayland display.
 ##
@ -108,14 +123,15 @@ export MOZ_PLUGIN_PATH
 export MOZ_APP_LAUNCHER="/__PREFIX__/bin/firefox"

 ##
-## We want Firefox to use Openh264 provided by Fedora.
+## Set FONTCONFIG_PATH for Xft/fontconfig
 ##
-## We used to configure it here but It's set by /etc/profile.d/gmpopenh264.sh
-## script from mozilla-openh264 package now. Let's keep it here just
-## for the record.
+FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+export FONTCONFIG_PATH
+
 ##
-## export MOZ_GMP_PATH=$MOZ_LIB_DIR/mozilla/plugins/gmp-gmpopenh264/system-installed
+## We want Firefox to use Openh264 provided by Fedora
 ##
+export MOZ_GMP_PATH=$MOZ_LIB_DIR/mozilla/plugins/gmp-gmpopenh264/system-installed

 ##
 ## In order to better support certain scripts (such as Indic and some CJK
@ -130,10 +146,21 @@ export MOZ_APP_LAUNCHER="/__PREFIX__/bin/firefox"
 # export MOZ_DISABLE_PANGO
 #

+##
+## Disable the GNOME crash dialog, Moz has it's own
+##
+GNOME_DISABLE_CRASH_DIALOG=1
+export GNOME_DISABLE_CRASH_DIALOG
+
+##
+## Disable the SLICE allocator (rhbz#1014858)
+##
+export G_SLICE=always-malloc
+
 ##
 ## Enable Xinput2 (mozbz#1207973)
 ##
-export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2-1}
+export MOZ_USE_XINPUT2=1

 # OK, here's where all the real work gets done

@ -166,8 +193,8 @@ fi
 # When Firefox is not running, restore SELinux labels for profile files
 # (rhbz#1731371)
 if [ $MOZILLA_DOWN -ne 0 ]; then
-  if [ -x $GETENFORCE_FILE ] && [ `$GETENFORCE_FILE` != "Disabled" ]; then
-    (restorecon -vr ~/.mozilla/firefox/*/gmp-widevinecdm/* &)
+  if [ -x $GETENFORCE_FILE ] && [ `getenforce` != "Disabled" ]; then
+    (restorecon -vr ~/.mozilla/firefox/* &)
  fi
 fi

@ -203,17 +230,8 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
            if [ -h $MOZ_LANGPACKS_DIR/$langpack ]; then
                langpack=`readlink $MOZ_LANGPACKS_DIR/$langpack`
            fi
-            if [ -e "/run/ostree-booted" ]; then
-               # Files on Silverblue has file create time set to 0,
-               # so in case the langpack is updated Firefox does not
-               # check for changes because it compares the file
-               # creation date to do so.
-                cp -f $MOZ_LANGPACKS_DIR/$langpack \
-                      $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
-            else
-                ln -s $MOZ_LANGPACKS_DIR/$langpack \
-                      $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
-            fi
+            ln -s $MOZ_LANGPACKS_DIR/$langpack \
+                  $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
            echo $MOZ_EXTENSIONS_PROFILE_DIR/$langpack > $FEDORA_LANGPACK_CONFIG
            return 0
        fi
@ -227,11 +245,34 @@ fi
 NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
 export NSS_SSL_CBC_RANDOM_IV

-# MOZ_APP_REMOTINGNAME links Firefox with desktop file name
-if [ -z "$MOZ_APP_REMOTINGNAME" ]
-then
-  export MOZ_APP_REMOTINGNAME=__APP_NAME__
-fi
+# Prepare command line arguments
+script_args=""
+pass_arg_count=0
+while [ $# -gt $pass_arg_count ]
+do
+  case "$1" in
+    -g | --debug)
+      script_args="$script_args -g"
+      debugging=1
+      shift
+      ;;
+    -d | --debugger)
+      if [ $# -gt 1 ]; then
+        script_args="$script_args -d $2"
+        shift 2
+      else
+        shift
+      fi
+      ;;
+    *)
+      # Move the unrecognized argument to the end of the list.
+      arg="$1"
+      shift
+      set -- "$@" "$arg"
+      pass_arg_count=`expr $pass_arg_count + 1`
+      ;;
+  esac
+done

 # Flatpak specific environment variables
 %FLATPAK_ENV_VARS%
@ -243,7 +284,7 @@ export MOZ_ALLOW_DOWNGRADE=1
 debugging=0
 if [ $debugging = 1 ]
 then
-  echo $MOZ_PROGRAM "$@"
+  echo $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@"
 fi

-exec $MOZ_PROGRAM "$@"
+exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@"
--- a/firefox.spec
+++ b/firefox.spec
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-#!/bin/bash
-if [ -z $1 ]; then
-  echo "Fixes .cargo-checksum.json by removing deleted files and recompute sha256sum"
-  echo "Usage: $0 .cargo-checksum.json"
-  exit
-fi
-
-FILE=$1
-#set -x
-cp $FILE $1.backup
-for i in $(cat .cargo-checksum.json|jq -r '.files| keys[]'); do
-if [ ! -f $i ]; then
-  #echo $i non exist
-  sed -ie "s|\"$i\":\"[^\"]*\",||" $FILE
-else
-  SHA=`sha256sum $i | cut -d " " -f1`
-  sed -ie "s|\"$i\":\"[^\"]*\"|\"$i\":\"$SHA\"|" $FILE
-fi
-
-#echo $i
-done
--- a/gen_cbindgen-vendor.sh
+++ b/gen_cbindgen-vendor.sh
@ -12,7 +12,7 @@ to be used with 'cargo vendor' commmand.
 """

 [dependencies]
-cbindgen = "0.29.1"
+cbindgen = "0.16.0"

 [[bin]]
 name = "dummy"
--- a/gen_dump_syms-vendor.sh
+++ b/gen_dump_syms-vendor.sh
@ -1,33 +0,0 @@
-#!/bin/bash
-set -x
-
-# Dummy Cargo.toml file with cbindgen dependency
-cat > Cargo.toml <<EOL
-[package]
-name = "dummy"
-version = "0.0.1"
-description = """
-This is a dummy package which contains dependency on cbindgen
-to be used with 'cargo vendor' commmand.
-"""
-
-[dependencies]
-dump_syms = "=2.3.2"
-time = "0.3.36"
-
-[[bin]]
-name = "dummy"
-path = "dummy.rs"
-doc = false
-EOL
-
-cargo install cargo-vendor
-cargo vendor
-
-cd vendor
-tar -cJf ../dump_syms-vendor.tar.xz *
-cd ..
-
-rm -f Cargo.toml
-rm -rf vendor
-
--- a/mochitest-wayland-workaround.patch
+++ b/mochitest-wayland-workaround.patch
@ -0,0 +1,86 @@
+diff -up firefox-88.0/dom/base/test/browser_multiple_popups.js.mochitest-wayland-workaround firefox-88.0/dom/base/test/browser_multiple_popups.js
+--- firefox-88.0/dom/base/test/browser_multiple_popups.js.mochitest-wayland-workaround	2021-04-15 21:44:27.000000000 +0200
+++ firefox-88.0/dom/base/test/browser_multiple_popups.js	2021-04-22 15:17:36.905908990 +0200
+@@ -265,6 +265,7 @@ add_task(async _ => {
+   info("All opened from chrome.");
+   await withTestPage(2, { chrome: true }, async function(browser) {
+     await BrowserTestUtils.synthesizeMouseAtCenter("#openPopups", {}, browser);
+    await BrowserTestUtils.synthesizeMouseAtCenter("#openPopups", {}, browser);
+   });
+ });
+ 
+diff -up firefox-88.0/dom/ipc/BrowserChild.cpp.mochitest-wayland-workaround firefox-88.0/dom/ipc/BrowserChild.cpp
+--- firefox-88.0/dom/ipc/BrowserChild.cpp.mochitest-wayland-workaround	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/ipc/BrowserChild.cpp	2021-04-22 15:17:36.905908990 +0200
+@@ -459,7 +459,7 @@ nsresult BrowserChild::Init(mozIDOMWindo
+   }
+   mPuppetWidget->InfallibleCreate(nullptr,
+                                   nullptr,  // no parents
+-                                  LayoutDeviceIntRect(0, 0, 0, 0),
+                                  LayoutDeviceIntRect(0, 0, 1000, 1000),
+                                   nullptr);  // HandleWidgetEvent
+ 
+   mWebBrowser = nsWebBrowser::Create(this, mPuppetWidget, mBrowsingContext,
+diff -up firefox-88.0/toolkit/components/browser/nsWebBrowser.cpp.mochitest-wayland-workaround firefox-88.0/toolkit/components/browser/nsWebBrowser.cpp
+--- firefox-88.0/toolkit/components/browser/nsWebBrowser.cpp.mochitest-wayland-workaround	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/toolkit/components/browser/nsWebBrowser.cpp	2021-04-22 15:17:36.905908990 +0200
+@@ -147,7 +147,8 @@ already_AddRefed<nsWebBrowser> nsWebBrow
+   // handler that always gets called (even for subframes) for any bubbling
+   // event.
+ 
+-  nsresult rv = docShell->InitWindow(nullptr, docShellParentWidget, 0, 0, 0, 0);
+  nsresult rv =
+      docShell->InitWindow(nullptr, docShellParentWidget, 0, 0, 1000, 1000);
+   if (NS_WARN_IF(NS_FAILED(rv))) {
+     return nullptr;
+   }
+diff -up firefox-88.0/widget/gtk/nsWindow.cpp.mochitest-wayland-workaround firefox-88.0/widget/gtk/nsWindow.cpp
+--- firefox-88.0/widget/gtk/nsWindow.cpp.mochitest-wayland-workaround	2021-04-22 15:17:36.903908930 +0200
+++ firefox-88.0/widget/gtk/nsWindow.cpp	2021-04-22 15:23:27.031343692 +0200
+@@ -2224,8 +2224,22 @@ void nsWindow::SetFocus(Raise aRaise, mo
+           Preferences::GetBool("widget.wayland-focus-workaroud", false)) {
+         // Wayland does not support focus changes so we need to workaround it
+         // by window hide/show sequence.
+-        owningWindow->NativeShow(false);
+-        owningWindow->NativeShow(true);
+        LOG(("Applying Wayland focus workaround for nsWindow %p\n",
+             owningWindow.get()));
+        GtkAllocation allocation;
+        gtk_widget_get_allocation(GTK_WIDGET(mContainer), &allocation);
+        LOG(("    mShell allocation %d %d -> %d %d\n", allocation.x,
+             allocation.y, allocation.width, allocation.height));
+        owningWindow->Show(false);
+        RefPtr<nsWindow> self(owningWindow);
+        const GtkAllocation alloc = allocation;
+        NS_DispatchToMainThread(
+            NS_NewRunnableFunction("nsWindow::Show()", [self, alloc]() -> void {
+              self->Show(true);
+              GtkAllocation al = alloc;
+              self->mBounds.width = self->mBounds.height = 1;
+              self->OnSizeAllocate(&al);
+            }));
+         return;
+       }
+ 
+@@ -7935,6 +7949,8 @@ nsresult nsWindow::SynthesizeNativeMouse
+     nsIObserver* aObserver) {
+   AutoObserverNotifier notifier(aObserver, "mouseevent");
+ 
+  LOG(("nsWindow::SynthesizeNativeMouseEvent [%p]\n", (void*)this));
+
+   if (!mGdkWindow) {
+     return NS_OK;
+   }
+@@ -7949,6 +7965,12 @@ nsresult nsWindow::SynthesizeNativeMouse
+   switch (aNativeMessage) {
+     case NativeMouseMessage::ButtonDown:
+     case NativeMouseMessage::ButtonUp: {
+      if (aNativeMessage == NativeMouseMessage::ButtonDown) {
+        LOG(("    NativeMouseMessage::ButtonDown()\n"));
+      } else {
+        LOG(("    NativeMouseMessage::ButtonUp()\n"));
+      }
+
+       GdkEvent event;
+       memset(&event, 0, sizeof(GdkEvent));
+       event.type = aNativeMessage == NativeMouseMessage::ButtonDown
--- a/mozilla-1170092.patch
+++ b/mozilla-1170092.patch
@ -0,0 +1,99 @@
+diff -up firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
+--- firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2021-03-18 14:48:36.000000000 +0100
+++ firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2021-03-22 19:20:02.429310184 +0100
+@@ -249,8 +249,20 @@ nsresult nsReadConfig::openAndEvaluateJS
+     if (NS_FAILED(rv)) return rv;
+ 
+     rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
+-    if (NS_FAILED(rv)) return rv;
+    if (NS_FAILED(rv)) {
+      // Look for cfg file in /etc/<application>/pref
+      rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
+                                  getter_AddRefs(jsFile));
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      rv = jsFile->AppendNative(nsLiteralCString("pref"));
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = jsFile->AppendNative(nsDependentCString(aFileName));
+      NS_ENSURE_SUCCESS(rv, rv);
+ 
+      rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+   } else {
+     nsAutoCString location("resource://gre/defaults/autoconfig/");
+     location += aFileName;
+diff -up firefox-87.0/modules/libpref/Preferences.cpp.1170092 firefox-87.0/modules/libpref/Preferences.cpp
+--- firefox-87.0/modules/libpref/Preferences.cpp.1170092	2021-03-18 14:48:54.000000000 +0100
+++ firefox-87.0/modules/libpref/Preferences.cpp	2021-03-22 19:20:02.429310184 +0100
+@@ -4499,6 +4499,9 @@ nsresult Preferences::InitInitialObjects
+   //
+   // Thus, in the omni.jar case, we always load app-specific default
+   // preferences from omni.jar, whether or not `$app == $gre`.
+  //
+  // At very end load configuration from system config location:
+  // - /etc/firefox/pref/*.js
+ 
+   nsresult rv = NS_ERROR_FAILURE;
+   UniquePtr<nsZipFind> find;
+diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/toolkit/xre/nsXREDirProvider.cpp
+--- firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2021-03-18 14:52:00.000000000 +0100
+++ firefox-87.0/toolkit/xre/nsXREDirProvider.cpp	2021-03-22 19:37:56.574480347 +0100
+@@ -65,6 +65,7 @@
+ #endif
+ #ifdef XP_UNIX
+ #  include <ctype.h>
+#  include "nsIXULAppInfo.h"
+ #endif
+ #ifdef XP_IOS
+ #  include "UIKitDirProvider.h"
+@@ -552,6 +553,21 @@ nsXREDirProvider::GetFile(const char* aP
+       }
+     }
+   }
+
+#if defined(XP_UNIX)
+  if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
+    nsCString sysConfigDir = nsLiteralCString("/etc/");
+    nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
+    if (!appInfo)
+      return NS_ERROR_NOT_AVAILABLE;
+    nsCString appName;
+    appInfo->GetName(appName);
+    ToLowerCase(appName);
+    sysConfigDir.Append(appName);
+    return NS_NewNativeLocalFile(sysConfigDir, false, aFile);
+  }
+#endif
+
+   if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
+ 
+   if (ensureFilePermissions) {
+@@ -874,6 +890,16 @@ nsresult nsXREDirProvider::GetFilesInter
+     }
+ #endif
+ 
+  // Add /etc/<application>/pref/ directory if it exists
+   nsCOMPtr<nsIFile> systemPrefDir;
+    rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
+                                getter_AddRefs(systemPrefDir));
+    if (NS_SUCCEEDED(rv)) {
+      rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
+      if (NS_SUCCEEDED(rv))
+        directories.AppendObject(systemPrefDir);
+    }
+
+     rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
+   } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
+     // NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
+diff -up firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h
+--- firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2021-03-18 14:51:58.000000000 +0100
+++ firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h	2021-03-22 19:20:02.430310213 +0100
+@@ -59,6 +59,7 @@
+ #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
+ #define NS_APP_PREFS_OVERRIDE_DIR \
+   "PrefDOverride"  // Directory for per-profile defaults
+#define NS_APP_PREFS_SYSTEM_CONFIG_DIR          "PrefSysConf"   // Directory with system-wide configuration
+ 
+ #define NS_APP_USER_PROFILE_50_DIR "ProfD"
+ #define NS_APP_USER_PROFILE_LOCAL_50_DIR "ProfLD"
--- a/mozilla-1196777.patch
+++ b/mozilla-1196777.patch
@ -1,12 +1,13 @@
-diff -up firefox-133.0/widget/gtk/nsWindow.cpp.1196777 firefox-133.0/widget/gtk/nsWindow.cpp
--- firefox-133.0/widget/gtk/nsWindow.cpp.1196777	2024-11-22 09:32:52.293470407 +0100
-+++ firefox-133.0/widget/gtk/nsWindow.cpp	2024-11-22 10:21:54.996441520 +0100
-@@ -191,7 +191,7 @@ constexpr gint kEvents =
-     GDK_VISIBILITY_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
-     GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SMOOTH_SCROLL_MASK |
-     GDK_TOUCH_MASK | GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK |
-    GDK_PROPERTY_CHANGE_MASK;
-+    GDK_PROPERTY_CHANGE_MASK | GDK_FOCUS_CHANGE_MASK;
+diff -up firefox-86.0/widget/gtk/nsWindow.cpp.1196777 firefox-86.0/widget/gtk/nsWindow.cpp
+--- firefox-86.0/widget/gtk/nsWindow.cpp.1196777	2021-02-23 17:52:42.291702566 +0100
+++ firefox-86.0/widget/gtk/nsWindow.cpp	2021-02-23 17:57:52.434895984 +0100
+@@ -195,7 +195,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
+                      GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
+                      GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                      GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
+-                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
+                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
+                     GDK_FOCUS_CHANGE_MASK;
 
- /* utility functions */
- static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX,
+ #if !GTK_CHECK_VERSION(3, 22, 0)
+ typedef enum {
--- a/mozilla-1516803.patch
+++ b/mozilla-1516803.patch
@ -1,6 +1,6 @@
 diff -up firefox-84.0/security/sandbox/linux/moz.build.1516803 firefox-84.0/security/sandbox/linux/moz.build
--- firefox-84.0/security/sandbox/linux/moz.build.1516803      2020-12-10 16:17:55.425139545 +0100
-+++ firefox-84.0/security/sandbox/linux/moz.build      2020-12-10 16:29:21.945860841 +0100
+--- firefox-84.0/security/sandbox/linux/moz.build.1516803	2020-12-10 16:17:55.425139545 +0100
+++ firefox-84.0/security/sandbox/linux/moz.build	2020-12-10 16:29:21.945860841 +0100
@@ -114,9 +114,8 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc")
 # gcc lto likes to put the top level asm in syscall.cc in a different partition
 # from the function using it which breaks the build.  Work around that by
--- a/mozilla-1580595.patch
+++ b/mozilla-1580595.patch
--- a/mozilla-1640982.patch
+++ b/mozilla-1640982.patch
@ -0,0 +1,16 @@
+diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
+@@ -61,7 +61,11 @@
+ # Enable link-time optimization for release builds, but not when linking
+ # gkrust_gtest.
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+# Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true
+# for newer ones that support it. Combining the latter with -Clto works, so
+# set both everywhere.
+ cargo_rustc_flags += -Clto
+export CARGO_PROFILE_RELEASE_LTO=true
+ endif
+ endif
+ endif
+
--- a/mozilla-1663844.patch
+++ b/mozilla-1663844.patch
@ -0,0 +1,36 @@
+diff -up firefox-84.0/dom/media/gmp/GMPSharedMemManager.h.1663844 firefox-84.0/dom/media/gmp/GMPSharedMemManager.h
+--- firefox-84.0/dom/media/gmp/GMPSharedMemManager.h.1663844	2020-12-07 23:32:59.000000000 +0100
+++ firefox-84.0/dom/media/gmp/GMPSharedMemManager.h	2020-12-10 12:59:39.287832851 +0100
+@@ -27,7 +27,7 @@ class GMPSharedMem {
+   // returned to the parent pool (which is not included).  If more than
+   // this are needed, we presume the client has either crashed or hung
+   // (perhaps temporarily).
+-  static const uint32_t kGMPBufLimit = 20;
+  static const uint32_t kGMPBufLimit = 40;
+ 
+   GMPSharedMem() {
+     for (size_t i = 0; i < sizeof(mGmpAllocated) / sizeof(mGmpAllocated[0]);
+diff -up firefox-84.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp.1663844 firefox-84.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
+--- firefox-84.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp.1663844	2020-12-10 12:59:39.287832851 +0100
+++ firefox-84.0/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp	2020-12-10 14:05:00.833685947 +0100
+@@ -82,7 +82,7 @@ bool GMPDecoderModule::SupportsMimeType(
+ 
+ bool GMPDecoderModule::SupportsMimeType(
+     const nsACString& aMimeType, DecoderDoctorDiagnostics* aDiagnostics) const {
+-  return false;
+  return MP4Decoder::IsH264(aMimeType);
+ }
+ 
+ /* static */
+diff -up firefox-84.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp.1663844 firefox-84.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
+--- firefox-84.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp.1663844	2020-12-08 00:35:04.000000000 +0100
+++ firefox-84.0/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp	2020-12-10 12:59:39.287832851 +0100
+@@ -67,6 +67,8 @@ void GMPVideoDecoder::Decoded(GMPVideoi4
+   RefPtr<GMPVideoDecoder> self = this;
+   if (v) {
+     mDecodedData.AppendElement(std::move(v));
+    mDecodePromise.ResolveIfExists(std::move(mDecodedData), __func__);
+    mDecodedData = DecodedData();
+   } else {
+     mDecodedData.Clear();
+     mDecodePromise.RejectIfExists(
--- a/mozilla-1667096.patch
+++ b/mozilla-1667096.patch
@ -1,20 +1,19 @@
-diff -up firefox-127.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-127.0/media/ffvpx/libavcodec/codec_list.c
--- firefox-127.0/media/ffvpx/libavcodec/codec_list.c.1667096	2024-06-06 23:33:57.000000000 +0200
-+++ firefox-127.0/media/ffvpx/libavcodec/codec_list.c	2024-06-10 12:42:39.353913204 +0200
-@@ -11,6 +11,9 @@ static const FFCodec * const codec_list[
+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
+@@ -11,4 +11,8 @@ static const AVCodec * const codec_list[
 #if CONFIG_MP3_DECODER
     &ff_mp3_decoder,
 #endif
 +#ifdef CONFIG_LIBFDK_AAC
 +    &ff_libfdk_aac_decoder,
 +#endif
- #if CONFIG_LIBDAV1D
-     &ff_libdav1d_decoder,
- #endif
-diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c
--- firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096	2024-06-10 12:42:39.354913201 +0200
-+++ firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c	2024-06-10 16:28:30.332367814 +0200
-@@ -0,0 +1,498 @@
+
+     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
+@@ -0,0 +1,409 @@
 +/*
 + * AAC decoder wrapper
 + * Copyright (c) 2012 Martin Storsjo
@ -39,10 +38,8 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +#include "libavutil/channel_layout.h"
 +#include "libavutil/common.h"
 +#include "libavutil/opt.h"
-+#include "libavutil/mem.h"
 +#include "avcodec.h"
-+#include "codec_internal.h"
-+#include "decode.h"
+#include "internal.h"
 +
 +#ifdef AACDECODER_LIB_VL0
 +#define FDKDEC_VER_AT_LEAST(vl0, vl1) \
@ -75,14 +72,7 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +    int drc_heavy;
 +    int drc_effect;
 +    int drc_cut;
-+    int album_mode;
 +    int level_limit;
-+#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
-+    int output_delay_set;
-+    int flush_samples;
-+    int delay_samples;
-+#endif
-+    AVChannelLayout downmix_layout;
 +} FDKAACDecContext;
 +
 +
@ -101,23 +91,17 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +                     OFFSET(drc_boost),      AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, 127, AD, NULL    },
 +    { "drc_cut",   "Dynamic Range Control: attenuation factor, where [0] is none and [127] is max compression",
 +                     OFFSET(drc_cut),        AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, 127, AD, NULL    },
-+    { "drc_level", "Dynamic Range Control: reference level, quantized to 0.25dB steps where [0] is 0dB and [127] is -31.75dB, -1 for auto, and -2 for disabled",
-+                     OFFSET(drc_level),      AV_OPT_TYPE_INT,   { .i64 = -1},  -2, 127, AD, NULL    },
+    { "drc_level", "Dynamic Range Control: reference level, quantized to 0.25dB steps where [0] is 0dB and [127] is -31.75dB",
+                     OFFSET(drc_level),      AV_OPT_TYPE_INT,   { .i64 = -1},  -1, 127, AD, NULL    },
 +    { "drc_heavy", "Dynamic Range Control: heavy compression, where [1] is on (RF mode) and [0] is off",
 +                     OFFSET(drc_heavy),      AV_OPT_TYPE_INT,   { .i64 = -1},  -1, 1,   AD, NULL    },
 +#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
-+    { "level_limit", "Signal level limiting",
-+                     OFFSET(level_limit),    AV_OPT_TYPE_BOOL,  { .i64 = -1 }, -1, 1, AD },
+    { "level_limit", "Signal level limiting", OFFSET(level_limit), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, 1, AD },
 +#endif
 +#if FDKDEC_VER_AT_LEAST(3, 0) // 3.0.0
 +    { "drc_effect","Dynamic Range Control: effect type, where e.g. [0] is none and [6] is general",
 +                     OFFSET(drc_effect),     AV_OPT_TYPE_INT,   { .i64 = -1},  -1, 8,   AD, NULL    },
 +#endif
-+#if FDKDEC_VER_AT_LEAST(3, 1) // 3.1.0
-+    { "album_mode","Dynamic Range Control: album mode, where [0] is off and [1] is on",
-+                     OFFSET(album_mode),     AV_OPT_TYPE_INT,   { .i64 = -1},  -1, 1,   AD, NULL    },
-+#endif
-+    { "downmix", "Request a specific channel layout from the decoder", OFFSET(downmix_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL}, .flags = AD },
 +    { NULL }
 +};
 +
@ -147,14 +131,6 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +    }
 +    avctx->sample_rate = info->sampleRate;
 +    avctx->frame_size  = info->frameSize;
-+#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
-+    if (!s->output_delay_set && info->outputDelay) {
-+        // Set this only once.
-+        s->flush_samples    = info->outputDelay;
-+        s->delay_samples    = info->outputDelay;
-+        s->output_delay_set = 1;
-+    }
-+#endif
 +
 +    for (i = 0; i < info->numChannels; i++) {
 +        AUDIO_CHANNEL_TYPE ctype = info->pChannelType[i];
@ -232,15 +208,17 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +            ch_error = 1;
 +        }
 +    }
-+
-+    av_channel_layout_uninit(&avctx->ch_layout);
-+    av_channel_layout_from_mask(&avctx->ch_layout, ch_layout);
-+    if (!ch_error && avctx->ch_layout.nb_channels != info->numChannels) {
+    if (!ch_error &&
+        av_get_channel_layout_nb_channels(ch_layout) != info->numChannels) {
 +        av_log(avctx, AV_LOG_WARNING, "unsupported channel configuration\n");
 +        ch_error = 1;
 +    }
 +    if (ch_error)
-+        avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
+        avctx->channel_layout = 0;
+    else
+        avctx->channel_layout = ch_layout;
+
+    avctx->channels = info->numChannels;
 +
 +    return 0;
 +}
@ -282,19 +260,11 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +        return AVERROR_UNKNOWN;
 +    }
 +
-+#if FF_API_OLD_CHANNEL_LAYOUT
-+FF_DISABLE_DEPRECATION_WARNINGS
-+    if (avctx->request_channel_layout) {
-+        av_channel_layout_uninit(&s->downmix_layout);
-+        av_channel_layout_from_mask(&s->downmix_layout, avctx->request_channel_layout);
-+    }
-+FF_ENABLE_DEPRECATION_WARNINGS
-+#endif
-+    if (s->downmix_layout.nb_channels > 0 &&
-+        s->downmix_layout.order != AV_CHANNEL_ORDER_NATIVE) {
+    if (avctx->request_channel_layout > 0 &&
+        avctx->request_channel_layout != AV_CH_LAYOUT_NATIVE) {
 +        int downmix_channels = -1;
 +
-+        switch (s->downmix_layout.u.mask) {
+        switch (avctx->request_channel_layout) {
 +        case AV_CH_LAYOUT_STEREO:
 +        case AV_CH_LAYOUT_STEREO_DOWNMIX:
 +            downmix_channels = 2;
@ -303,7 +273,7 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +            downmix_channels = 1;
 +            break;
 +        default:
-+            av_log(avctx, AV_LOG_WARNING, "Invalid downmix option\n");
+            av_log(avctx, AV_LOG_WARNING, "Invalid request_channel_layout\n");
 +            break;
 +        }
 +
@ -340,12 +310,6 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +    }
 +
 +    if (s->drc_level != -1) {
-+        // This option defaults to -1, i.e. not calling
-+        // aacDecoder_SetParam(AAC_DRC_REFERENCE_LEVEL) at all, which defaults
-+        // to the level from DRC metadata, if available. The user can set
-+        // -drc_level -2, which calls aacDecoder_SetParam(
-+        // AAC_DRC_REFERENCE_LEVEL) with a negative value, which then
-+        // explicitly disables the feature.
 +        if (aacDecoder_SetParam(s->handle, AAC_DRC_REFERENCE_LEVEL, s->drc_level) != AAC_DEC_OK) {
 +            av_log(avctx, AV_LOG_ERROR, "Unable to set DRC reference level in the decoder\n");
 +            return AVERROR_UNKNOWN;
@ -360,7 +324,6 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +    }
 +
 +#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
-+    // Setting this parameter to -1 enables the auto behaviour in the library.
 +    if (aacDecoder_SetParam(s->handle, AAC_PCM_LIMITER_ENABLE, s->level_limit) != AAC_DEC_OK) {
 +        av_log(avctx, AV_LOG_ERROR, "Unable to set in signal level limiting in the decoder\n");
 +        return AVERROR_UNKNOWN;
@ -376,15 +339,6 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +    }
 +#endif
 +
-+#if FDKDEC_VER_AT_LEAST(3, 1) // 3.1.0
-+    if (s->album_mode != -1) {
-+        if (aacDecoder_SetParam(s->handle, AAC_UNIDRC_ALBUM_MODE, s->album_mode) != AAC_DEC_OK) {
-+            av_log(avctx, AV_LOG_ERROR, "Unable to set album mode in the decoder\n");
-+            return AVERROR_UNKNOWN;
-+        }
-+    }
-+#endif
-+
 +    avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 +
 +    s->decoder_buffer_size = DECODER_BUFFSIZE * DECODER_MAX_CHANNELS;
@ -395,38 +349,22 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +    return 0;
 +}
 +
-+static int fdk_aac_decode_frame(AVCodecContext *avctx, AVFrame *frame,
+static int fdk_aac_decode_frame(AVCodecContext *avctx, void *data,
 +                                int *got_frame_ptr, AVPacket *avpkt)
 +{
 +    FDKAACDecContext *s = avctx->priv_data;
+    AVFrame *frame = data;
 +    int ret;
 +    AAC_DECODER_ERROR err;
 +    UINT valid = avpkt->size;
-+    UINT flags = 0;
-+    int input_offset = 0;
 +
-+    if (avpkt->size) {
-+        err = aacDecoder_Fill(s->handle, &avpkt->data, &avpkt->size, &valid);
-+        if (err != AAC_DEC_OK) {
-+            av_log(avctx, AV_LOG_ERROR, "aacDecoder_Fill() failed: %x\n", err);
-+            return AVERROR_INVALIDDATA;
-+        }
-+    } else {
-+#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
-+        /* Handle decoder draining */
-+        if (s->flush_samples > 0) {
-+            flags |= AACDEC_FLUSH;
-+        } else {
-+            return AVERROR_EOF;
-+        }
-+#else
-+        return AVERROR_EOF;
-+#endif
+    err = aacDecoder_Fill(s->handle, &avpkt->data, &avpkt->size, &valid);
+    if (err != AAC_DEC_OK) {
+        av_log(avctx, AV_LOG_ERROR, "aacDecoder_Fill() failed: %x\n", err);
+        return AVERROR_INVALIDDATA;
 +    }
 +
-+    err = aacDecoder_DecodeFrame(s->handle, (INT_PCM *) s->decoder_buffer,
-+                                 s->decoder_buffer_size / sizeof(INT_PCM),
-+                                 flags);
+    err = aacDecoder_DecodeFrame(s->handle, (INT_PCM *) s->decoder_buffer, s->decoder_buffer_size / sizeof(INT_PCM), 0);
 +    if (err == AAC_DEC_NOT_ENOUGH_BITS) {
 +        ret = avpkt->size - valid;
 +        goto end;
@ -442,36 +380,11 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +        goto end;
 +    frame->nb_samples = avctx->frame_size;
 +
-+#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
-+    if (flags & AACDEC_FLUSH) {
-+        // Only return the right amount of samples at the end; if calling the
-+        // decoder with AACDEC_FLUSH, it will keep returning frames indefinitely.
-+        frame->nb_samples = FFMIN(s->flush_samples, frame->nb_samples);
-+        av_log(s, AV_LOG_DEBUG, "Returning %d/%d delayed samples.\n",
-+                                frame->nb_samples, s->flush_samples);
-+        s->flush_samples -= frame->nb_samples;
-+    } else {
-+        // Trim off samples from the start to compensate for extra decoder
-+        // delay. We could also just adjust the pts, but this avoids
-+        // including the extra samples in the output altogether.
-+        if (s->delay_samples) {
-+            int drop_samples = FFMIN(s->delay_samples, frame->nb_samples);
-+            av_log(s, AV_LOG_DEBUG, "Dropping %d/%d delayed samples.\n",
-+                                    drop_samples, s->delay_samples);
-+            s->delay_samples  -= drop_samples;
-+            frame->nb_samples -= drop_samples;
-+            input_offset = drop_samples * avctx->ch_layout.nb_channels;
-+            if (frame->nb_samples <= 0)
-+                return 0;
-+        }
-+    }
-+#endif
-+
 +    if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
 +        goto end;
 +
-+    memcpy(frame->extended_data[0], s->decoder_buffer + input_offset,
-+           avctx->ch_layout.nb_channels * frame->nb_samples *
+    memcpy(frame->extended_data[0], s->decoder_buffer,
+           avctx->channels * avctx->frame_size *
 +           av_get_bytes_per_sample(avctx->sample_fmt));
 +
 +    *got_frame_ptr = 1;
@ -494,31 +407,28 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +        av_log(avctx, AV_LOG_WARNING, "failed to clear buffer when flushing\n");
 +}
 +
-+const FFCodec ff_libfdk_aac_decoder = {
-+    .p.name         = "libfdk_aac",
-+    CODEC_LONG_NAME("Fraunhofer FDK AAC"),
-+    .p.type         = AVMEDIA_TYPE_AUDIO,
-+    .p.id           = AV_CODEC_ID_AAC,
+AVCodec ff_libfdk_aac_decoder = {
+    .name           = "libfdk_aac",
+    .long_name      = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"),
+    .type           = AVMEDIA_TYPE_AUDIO,
+    .id             = AV_CODEC_ID_AAC,
 +    .priv_data_size = sizeof(FDKAACDecContext),
 +    .init           = fdk_aac_decode_init,
-+    FF_CODEC_DECODE_CB(fdk_aac_decode_frame),
+    .decode         = fdk_aac_decode_frame,
 +    .close          = fdk_aac_decode_close,
 +    .flush          = fdk_aac_decode_flush,
-+    .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF
-+#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10
-+                      | AV_CODEC_CAP_DELAY
-+#endif
-+    ,
-+    .p.priv_class   = &fdk_aac_dec_class,
-+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
-+    .p.wrapper_name = "libfdk",
+    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF,
+    .priv_class     = &fdk_aac_dec_class,
+    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE |
+                      FF_CODEC_CAP_INIT_CLEANUP,
+    .wrapper_name   = "libfdk",
 +};
-diff -up firefox-127.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-127.0/media/ffvpx/libavcodec/moz.build
--- firefox-127.0/media/ffvpx/libavcodec/moz.build.1667096	2024-06-06 23:33:58.000000000 +0200
-+++ firefox-127.0/media/ffvpx/libavcodec/moz.build	2024-06-10 12:42:39.354913201 +0200
-@@ -151,6 +151,12 @@ else:
-   CXXFLAGS += CONFIG["MOZ_LIBVPX_CFLAGS"]
-   OS_LIBS += CONFIG["MOZ_LIBVPX_LIBS"]
+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
+@@ -104,6 +104,12 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
+         ]
+         USE_LIBS += ['mozva']
 
 +if CONFIG['MOZ_FDK_AAC']:
 +    SOURCES += [
@ -526,18 +436,17 @@ diff -up firefox-127.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-127.0/me
 +    ]
 +    OS_LIBS += CONFIG['MOZ_FDK_AAC_LIBS']
 +
- SYMBOLS_FILE = 'avcodec.symbols'
- NoVisibilityFlags()
+ 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-127.0/toolkit/moz.configure.1667096 firefox-127.0/toolkit/moz.configure
--- firefox-127.0/toolkit/moz.configure.1667096	2024-06-10 12:42:39.312913316 +0200
-+++ firefox-127.0/toolkit/moz.configure	2024-06-10 12:42:39.355913199 +0200
-@@ -2412,6 +2412,15 @@ with only_when(compile_environment):
- 
-     set_config("MOZ_SYSTEM_PNG", True, when="--with-system-png")
- 
-+# FDK AAC support
-+# ==============================================================
+# fdk aac support
 +option('--with-system-fdk-aac',
 +       help='Use system libfdk-aac (located with pkgconfig)')
 +
--- a/mozilla-1669639.patch
+++ b/mozilla-1669639.patch
@ -0,0 +1,15 @@
+diff -up firefox-81.0.1/build/mach_bootstrap.py.old firefox-81.0.1/build/mach_bootstrap.py
+--- firefox-81.0.1/build/mach_bootstrap.py.old	2020-10-06 14:16:06.212974910 +0200
+++ firefox-81.0.1/build/mach_bootstrap.py	2020-10-06 14:19:03.313179557 +0200
+@@ -507,7 +507,10 @@ class ImportHook(object):
+         # doesn't happen or because it doesn't matter).
+         if not os.path.exists(module.__file__[:-1]):
+             if os.path.exists(module.__file__):
+-                os.remove(module.__file__)
+                try:
+                    os.remove(module.__file__)
+                except:
+                    pass
+             del sys.modules[module.__name__]
+             module = self(name, globals, locals, fromlist, level)
+ 
--- a/mozilla-1670333.patch
+++ b/mozilla-1670333.patch
@ -0,0 +1,74 @@
+diff -up firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-88.0/dom/media/mp4/MP4Demuxer.cpp
+--- firefox-88.0/dom/media/mp4/MP4Demuxer.cpp.1670333	2021-04-15 21:44:28.000000000 +0200
+++ firefox-88.0/dom/media/mp4/MP4Demuxer.cpp	2021-04-19 13:36:44.101762211 +0200
+@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
+   DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
+             __func__, ##__VA_ARGS__)
+ 
+extern bool gUseKeyframeFromContainer;
+
+ namespace mozilla {
+ 
+ DDLoggedTypeDeclNameAndBase(MP4TrackDemuxer, MediaTrackDemuxer);
+@@ -394,6 +396,12 @@ already_AddRefed<MediaRawData> MP4TrackD
+           [[fallthrough]];
+         case H264::FrameType::OTHER: {
+           bool keyframe = type == H264::FrameType::I_FRAME;
+          if (gUseKeyframeFromContainer) {
+            if (sample->mKeyframe && sample->mKeyframe != keyframe) {
+              sample->mKeyframe = keyframe;
+            }
+            break;
+          }
+           if (sample->mKeyframe != keyframe) {
+             NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
+                                        "@ pts:%" PRId64 " dur:%" PRId64
+diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-88.0/dom/media/platforms/PDMFactory.cpp
+--- firefox-88.0/dom/media/platforms/PDMFactory.cpp.1670333	2021-04-19 13:36:44.087761790 +0200
+++ firefox-88.0/dom/media/platforms/PDMFactory.cpp	2021-04-19 13:39:52.676433734 +0200
+@@ -58,6 +58,8 @@
+ 
+ #include <functional>
+ 
+bool gUseKeyframeFromContainer = false;
+
+ namespace mozilla {
+ 
+ #define PDM_INIT_LOG(msg, ...) \
+@@ -572,10 +574,10 @@ void PDMFactory::CreateDefaultPDMs() {
+   }
+ #endif
+ #ifdef MOZ_FFMPEG
+-  if (StaticPrefs::media_ffmpeg_enabled() &&
+-      !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
+-    mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
+-        FFmpegRuntimeLinker::LinkStatusCode());
+  if (StaticPrefs::media_ffmpeg_enabled()) {
+    mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>();
+    if (!mFFmpegUsed) {
+      mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(FFmpegRuntimeLinker::LinkStatusCode()); }
+   }
+ #endif
+ #ifdef MOZ_FFVPX
+@@ -592,8 +594,9 @@ void PDMFactory::CreateDefaultPDMs() {
+ 
+   CreateAndStartupPDM<AgnosticDecoderModule>();
+ 
+-  if (StaticPrefs::media_gmp_decoder_enabled() &&
+  if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
+       !CreateAndStartupPDM<GMPDecoderModule>()) {
+    gUseKeyframeFromContainer = true;
+     mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
+   }
+ }
+diff -up firefox-88.0/dom/media/platforms/PDMFactory.h.1670333 firefox-88.0/dom/media/platforms/PDMFactory.h
+--- firefox-88.0/dom/media/platforms/PDMFactory.h.1670333	2021-04-15 21:44:28.000000000 +0200
+++ firefox-88.0/dom/media/platforms/PDMFactory.h	2021-04-19 13:36:44.101762211 +0200
+@@ -121,6 +121,7 @@ class PDMFactory final {
+   RefPtr<PlatformDecoderModule> mNullPDM;
+ 
+   DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
+  bool mFFmpegUsed = false;
+ 
+   friend class RemoteVideoDecoderParent;
+   static void EnsureInit();
--- a/mozilla-1672139.patch
+++ b/mozilla-1672139.patch
@ -0,0 +1,91 @@
+diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp
+--- a/gfx/layers/ipc/CompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CompositorBridgeParent.cpp
+@@ -2376,30 +2376,28 @@
+   if (mWrBridge->PipelineId() == aPipelineId) {
+     mWrBridge->RemoveEpochDataPriorTo(aEpoch);
+ 
+-    if (!mPaused) {
+-      if (mIsForcedFirstPaint) {
+-        uiController->NotifyFirstPaint();
+-        mIsForcedFirstPaint = false;
+-      }
+-
+-      std::pair<wr::PipelineId, wr::Epoch> key(aPipelineId, aEpoch);
+-      nsTArray<CompositionPayload> payload =
+-          mWrBridge->TakePendingScrollPayload(key);
+-      if (!payload.IsEmpty()) {
+-        RecordCompositionPayloadsPresented(payload);
+-      }
+-
+-      TransactionId transactionId = mWrBridge->FlushTransactionIdsForEpoch(
+-          aEpoch, aCompositeStartId, aCompositeStart, aRenderStart,
+-          aCompositeEnd, uiController);
+-      Unused << SendDidComposite(LayersId{0}, transactionId, aCompositeStart,
+-                                 aCompositeEnd);
+-
+-      nsTArray<ImageCompositeNotificationInfo> notifications;
+-      mWrBridge->ExtractImageCompositeNotifications(&notifications);
+-      if (!notifications.IsEmpty()) {
+-        Unused << ImageBridgeParent::NotifyImageComposites(notifications);
+-      }
+    if (mIsForcedFirstPaint) {
+      uiController->NotifyFirstPaint();
+      mIsForcedFirstPaint = false;
+    }
+
+    std::pair<wr::PipelineId, wr::Epoch> key(aPipelineId, aEpoch);
+    nsTArray<CompositionPayload> payload =
+        mWrBridge->TakePendingScrollPayload(key);
+    if (!payload.IsEmpty()) {
+      RecordCompositionPayloadsPresented(payload);
+    }
+
+    TransactionId transactionId = mWrBridge->FlushTransactionIdsForEpoch(
+        aEpoch, aCompositeStartId, aCompositeStart, aRenderStart, aCompositeEnd,
+        uiController);
+    Unused << SendDidComposite(LayersId{0}, transactionId, aCompositeStart,
+                               aCompositeEnd);
+
+    nsTArray<ImageCompositeNotificationInfo> notifications;
+    mWrBridge->ExtractImageCompositeNotifications(&notifications);
+    if (!notifications.IsEmpty()) {
+      Unused << ImageBridgeParent::NotifyImageComposites(notifications);
+     }
+     return;
+   }
+@@ -2408,21 +2406,19 @@
+   if (wrBridge && wrBridge->GetCompositorBridge()) {
+     MOZ_ASSERT(!wrBridge->IsRootWebRenderBridgeParent());
+     wrBridge->RemoveEpochDataPriorTo(aEpoch);
+-    if (!mPaused) {
+-      std::pair<wr::PipelineId, wr::Epoch> key(aPipelineId, aEpoch);
+-      nsTArray<CompositionPayload> payload =
+-          wrBridge->TakePendingScrollPayload(key);
+-      if (!payload.IsEmpty()) {
+-        RecordCompositionPayloadsPresented(payload);
+-      }
+-
+-      TransactionId transactionId = wrBridge->FlushTransactionIdsForEpoch(
+-          aEpoch, aCompositeStartId, aCompositeStart, aRenderStart,
+-          aCompositeEnd, uiController, aStats, &stats);
+-      Unused << wrBridge->GetCompositorBridge()->SendDidComposite(
+-          wrBridge->GetLayersId(), transactionId, aCompositeStart,
+-          aCompositeEnd);
+
+    std::pair<wr::PipelineId, wr::Epoch> key(aPipelineId, aEpoch);
+    nsTArray<CompositionPayload> payload =
+        wrBridge->TakePendingScrollPayload(key);
+    if (!payload.IsEmpty()) {
+      RecordCompositionPayloadsPresented(payload);
+     }
+
+    TransactionId transactionId = wrBridge->FlushTransactionIdsForEpoch(
+        aEpoch, aCompositeStartId, aCompositeStart, aRenderStart, aCompositeEnd,
+        uiController, aStats, &stats);
+    Unused << wrBridge->GetCompositorBridge()->SendDidComposite(
+        wrBridge->GetLayersId(), transactionId, aCompositeStart, aCompositeEnd);
+   }
+ 
+   if (!stats.IsEmpty()) {
+
--- a/mozilla-1673313.patch
+++ b/mozilla-1673313.patch
@ -0,0 +1,351 @@
+changeset:   556172:143b4ca96ec9
+tag:         tip
+parent:      556169:61c35792ca70
+user:        stransky <stransky@redhat.com>
+date:        Mon Oct 26 12:15:49 2020 +0100
+files:       widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.h
+description:
+Bug 1673313 [Wayland] Don't fail when Shm allocation fails, r?jhorak
+
+- Make WaylandAllocateShmMemory() fallible.
+- Implement WaylandReAllocateShmMemory() to re-allocate Shm pool.
+- Remove WaylandShmPool::Resize() and use WaylandShmPool::Create() only.
+- Implement and use WaylandShmPool::Release().
+- Make WindowSurfaceWayland::CreateWaylandBuffer() as fallible.
+
+Differential Revision: https://phabricator.services.mozilla.com/D94735
+
+
+diff --git a/widget/gtk/WindowSurfaceWayland.cpp b/widget/gtk/WindowSurfaceWayland.cpp
+--- a/widget/gtk/WindowSurfaceWayland.cpp
+++ b/widget/gtk/WindowSurfaceWayland.cpp
+@@ -209,14 +209,23 @@ RefPtr<nsWaylandDisplay> WindowBackBuffe
+ }
+ 
+ static int WaylandAllocateShmMemory(int aSize) {
+-  static int counter = 0;
+-  nsPrintfCString shmName("/wayland.mozilla.ipc.%d", counter++);
+-  int fd = shm_open(shmName.get(), O_CREAT | O_RDWR | O_EXCL, 0600);
+-  if (fd >= 0) {
+-    shm_unlink(shmName.get());
+-  } else {
+-    printf_stderr("Unable to SHM memory segment\n");
+-    MOZ_CRASH();
+  int fd = -1;
+  do {
+    static int counter = 0;
+    nsPrintfCString shmName("/wayland.mozilla.ipc.%d", counter++);
+    fd = shm_open(shmName.get(), O_CREAT | O_RDWR | O_EXCL, 0600);
+    if (fd >= 0) {
+      // We don't want to use leaked file
+      if (shm_unlink(shmName.get()) != 0) {
+        NS_WARNING("shm_unlink failed");
+        return -1;
+      }
+    }
+  } while (fd < 0 && errno == EEXIST);
+
+  if (fd < 0) {
+    NS_WARNING(nsPrintfCString("shm_open failed: %s", strerror(errno)).get());
+    return -1;
+   }
+ 
+   int ret = 0;
+@@ -225,59 +234,103 @@ static int WaylandAllocateShmMemory(int 
+     ret = posix_fallocate(fd, 0, aSize);
+   } while (ret == EINTR);
+   if (ret != 0) {
+    NS_WARNING(
+        nsPrintfCString("posix_fallocate() fails to allocate shm memory: %s",
+                        strerror(ret))
+            .get());
+     close(fd);
+-    MOZ_CRASH("posix_fallocate() fails to allocate shm memory");
+    return -1;
+   }
+ #else
+   do {
+     ret = ftruncate(fd, aSize);
+   } while (ret < 0 && errno == EINTR);
+   if (ret < 0) {
+    NS_WARNING(nsPrintfCString("ftruncate() fails to allocate shm memory: %s",
+                               strerror(ret))
+                   .get());
+     close(fd);
+-    MOZ_CRASH("ftruncate() fails to allocate shm memory");
+    fd = -1;
+   }
+ #endif
+ 
+   return fd;
+ }
+ 
+-WaylandShmPool::WaylandShmPool(RefPtr<nsWaylandDisplay> aWaylandDisplay,
+-                               int aSize)
+-    : mAllocatedSize(aSize) {
+-  mShmPoolFd = WaylandAllocateShmMemory(mAllocatedSize);
+-  mImageData = mmap(nullptr, mAllocatedSize, PROT_READ | PROT_WRITE, MAP_SHARED,
+-                    mShmPoolFd, 0);
+-  MOZ_RELEASE_ASSERT(mImageData != MAP_FAILED,
+-                     "Unable to map drawing surface!");
+static bool WaylandReAllocateShmMemory(int aFd, int aSize) {
+  if (ftruncate(aFd, aSize) < 0) {
+    return false;
+  }
+#ifdef HAVE_POSIX_FALLOCATE
+  do {
+    errno = posix_fallocate(aFd, 0, aSize);
+  } while (errno == EINTR);
+  if (errno != 0) {
+    return false;
+  }
+#endif
+  return true;
+}
+ 
+-  mShmPool =
+-      wl_shm_create_pool(aWaylandDisplay->GetShm(), mShmPoolFd, mAllocatedSize);
+WaylandShmPool::WaylandShmPool()
+    : mShmPool(nullptr),
+      mShmPoolFd(-1),
+      mAllocatedSize(0),
+      mImageData(MAP_FAILED){};
+ 
+-  // We set our queue to get mShmPool events at compositor thread.
+-  wl_proxy_set_queue((struct wl_proxy*)mShmPool,
+-                     aWaylandDisplay->GetEventQueue());
+void WaylandShmPool::Release() {
+  if (mImageData != MAP_FAILED) {
+    munmap(mImageData, mAllocatedSize);
+    mImageData = MAP_FAILED;
+  }
+  if (mShmPool) {
+    wl_shm_pool_destroy(mShmPool);
+    mShmPool = 0;
+  }
+  if (mShmPoolFd >= 0) {
+    close(mShmPoolFd);
+    mShmPoolFd = -1;
+  }
+ }
+ 
+-bool WaylandShmPool::Resize(int aSize) {
+bool WaylandShmPool::Create(RefPtr<nsWaylandDisplay> aWaylandDisplay,
+                            int aSize) {
+   // We do size increase only
+-  if (aSize <= mAllocatedSize) return true;
+-
+-  if (ftruncate(mShmPoolFd, aSize) < 0) return false;
+  if (aSize <= mAllocatedSize) {
+    return true;
+  }
+ 
+-#ifdef HAVE_POSIX_FALLOCATE
+-  do {
+-    errno = posix_fallocate(mShmPoolFd, 0, aSize);
+-  } while (errno == EINTR);
+-  if (errno != 0) return false;
+-#endif
+  if (mShmPoolFd < 0) {
+    mShmPoolFd = WaylandAllocateShmMemory(aSize);
+    if (mShmPoolFd < 0) {
+      return false;
+    }
+  } else {
+    if (!WaylandReAllocateShmMemory(mShmPoolFd, aSize)) {
+      Release();
+      return false;
+    }
+  }
+ 
+-  wl_shm_pool_resize(mShmPool, aSize);
+-
+-  munmap(mImageData, mAllocatedSize);
+-
+  if (mImageData != MAP_FAILED) {
+    munmap(mImageData, mAllocatedSize);
+  }
+   mImageData =
+       mmap(nullptr, aSize, PROT_READ | PROT_WRITE, MAP_SHARED, mShmPoolFd, 0);
+-  if (mImageData == MAP_FAILED) return false;
+  if (mImageData == MAP_FAILED) {
+    NS_WARNING("Unable to map drawing surface!");
+    Release();
+    return false;
+  }
+
+  if (mShmPool) {
+    wl_shm_pool_resize(mShmPool, aSize);
+  } else {
+    mShmPool = wl_shm_create_pool(aWaylandDisplay->GetShm(), mShmPoolFd, aSize);
+    // We set our queue to get mShmPool events at compositor thread.
+    wl_proxy_set_queue((struct wl_proxy*)mShmPool,
+                       aWaylandDisplay->GetEventQueue());
+  }
+ 
+   mAllocatedSize = aSize;
+   return true;
+@@ -289,11 +342,7 @@ void WaylandShmPool::SetImageDataFromPoo
+   memcpy(mImageData, aSourcePool->GetImageData(), aImageDataSize);
+ }
+ 
+-WaylandShmPool::~WaylandShmPool() {
+-  munmap(mImageData, mAllocatedSize);
+-  wl_shm_pool_destroy(mShmPool);
+-  close(mShmPoolFd);
+-}
+WaylandShmPool::~WaylandShmPool() { Release(); }
+ 
+ static void buffer_release(void* data, wl_buffer* buffer) {
+   auto surface = reinterpret_cast<WindowBackBuffer*>(data);
+@@ -302,14 +351,14 @@ static void buffer_release(void* data, w
+ 
+ static const struct wl_buffer_listener buffer_listener = {buffer_release};
+ 
+-void WindowBackBufferShm::Create(int aWidth, int aHeight) {
+bool WindowBackBufferShm::Create(int aWidth, int aHeight) {
+   MOZ_ASSERT(!IsAttached(), "We can't create attached buffers.");
+-  MOZ_ASSERT(!mWLBuffer, "there is wl_buffer already!");
+ 
+-  int newBufferSize = aWidth * aHeight * BUFFER_BPP;
+-  if (!mShmPool.Resize(newBufferSize)) {
+-    mWLBuffer = nullptr;
+-    return;
+  ReleaseShmSurface();
+
+  int size = aWidth * aHeight * BUFFER_BPP;
+  if (!mShmPool.Create(GetWaylandDisplay(), size)) {
+    return false;
+   }
+ 
+   mWLBuffer =
+@@ -325,14 +374,16 @@ void WindowBackBufferShm::Create(int aWi
+   LOGWAYLAND(("WindowBackBufferShm::Create [%p] wl_buffer %p ID %d\n",
+               (void*)this, (void*)mWLBuffer,
+               mWLBuffer ? wl_proxy_get_id((struct wl_proxy*)mWLBuffer) : -1));
+  return true;
+ }
+ 
+ void WindowBackBufferShm::ReleaseShmSurface() {
+   LOGWAYLAND(("WindowBackBufferShm::Release [%p]\n", (void*)this));
+-
+-  wl_buffer_destroy(mWLBuffer);
+  if (mWLBuffer) {
+    wl_buffer_destroy(mWLBuffer);
+    mWLBuffer = nullptr;
+  }
+   mWidth = mHeight = 0;
+-  mWLBuffer = nullptr;
+ }
+ 
+ void WindowBackBufferShm::Clear() {
+@@ -340,16 +391,13 @@ void WindowBackBufferShm::Clear() {
+ }
+ 
+ WindowBackBufferShm::WindowBackBufferShm(
+-    WindowSurfaceWayland* aWindowSurfaceWayland, int aWidth, int aHeight)
+    WindowSurfaceWayland* aWindowSurfaceWayland)
+     : WindowBackBuffer(aWindowSurfaceWayland),
+-      mShmPool(aWindowSurfaceWayland->GetWaylandDisplay(),
+-               aWidth * aHeight * BUFFER_BPP),
+      mShmPool(),
+       mWLBuffer(nullptr),
+-      mWidth(aWidth),
+-      mHeight(aHeight),
+-      mAttached(false) {
+-  Create(aWidth, aHeight);
+-}
+      mWidth(0),
+      mHeight(0),
+      mAttached(false) {}
+ 
+ WindowBackBufferShm::~WindowBackBufferShm() { ReleaseShmSurface(); }
+ 
+@@ -357,13 +405,9 @@ bool WindowBackBufferShm::Resize(int aWi
+   if (aWidth == mWidth && aHeight == mHeight) {
+     return true;
+   }
+-
+   LOGWAYLAND(("WindowBackBufferShm::Resize [%p] %d %d\n", (void*)this, aWidth,
+               aHeight));
+-
+-  ReleaseShmSurface();
+   Create(aWidth, aHeight);
+-
+   return (mWLBuffer != nullptr);
+ }
+ 
+@@ -488,11 +532,13 @@ WindowBackBuffer* WindowSurfaceWayland::
+     return nullptr;
+   }
+ 
+-  WindowBackBuffer* buffer = new WindowBackBufferShm(this, aWidth, aHeight);
+-  if (buffer) {
+-    mShmBackupBuffer[availableBuffer] = buffer;
+  WindowBackBuffer* buffer = new WindowBackBufferShm(this);
+  if (!buffer->Create(aWidth, aHeight)) {
+    delete buffer;
+    return nullptr;
+   }
+ 
+  mShmBackupBuffer[availableBuffer] = buffer;
+   return buffer;
+ }
+ 
+diff --git a/widget/gtk/WindowSurfaceWayland.h b/widget/gtk/WindowSurfaceWayland.h
+--- a/widget/gtk/WindowSurfaceWayland.h
+++ b/widget/gtk/WindowSurfaceWayland.h
+@@ -25,14 +25,14 @@ class WindowSurfaceWayland;
+ // Allocates and owns shared memory for Wayland drawing surface
+ class WaylandShmPool {
+  public:
+-  WaylandShmPool(RefPtr<nsWaylandDisplay> aDisplay, int aSize);
+-  ~WaylandShmPool();
+-
+-  bool Resize(int aSize);
+  bool Create(RefPtr<nsWaylandDisplay> aWaylandDisplay, int aSize);
+  void Release();
+   wl_shm_pool* GetShmPool() { return mShmPool; };
+   void* GetImageData() { return mImageData; };
+   void SetImageDataFromPool(class WaylandShmPool* aSourcePool,
+                             int aImageDataSize);
+  WaylandShmPool();
+  ~WaylandShmPool();
+ 
+  private:
+   wl_shm_pool* mShmPool;
+@@ -53,6 +53,7 @@ class WindowBackBuffer {
+   virtual bool IsAttached() = 0;
+ 
+   virtual void Clear() = 0;
+  virtual bool Create(int aWidth, int aHeight) = 0;
+   virtual bool Resize(int aWidth, int aHeight) = 0;
+ 
+   virtual int GetWidth() = 0;
+@@ -87,8 +88,7 @@ class WindowBackBuffer {
+ 
+ class WindowBackBufferShm : public WindowBackBuffer {
+  public:
+-  WindowBackBufferShm(WindowSurfaceWayland* aWindowSurfaceWayland, int aWidth,
+-                      int aHeight);
+  WindowBackBufferShm(WindowSurfaceWayland* aWindowSurfaceWayland);
+   ~WindowBackBufferShm();
+ 
+   already_AddRefed<gfx::DrawTarget> Lock();
+@@ -100,6 +100,7 @@ class WindowBackBufferShm : public Windo
+   void SetAttached() { mAttached = true; };
+ 
+   void Clear();
+  bool Create(int aWidth, int aHeight);
+   bool Resize(int aWidth, int aHeight);
+   bool SetImageDataFromBuffer(class WindowBackBuffer* aSourceBuffer);
+ 
+@@ -109,7 +110,6 @@ class WindowBackBufferShm : public Windo
+   wl_buffer* GetWlBuffer() { return mWLBuffer; };
+ 
+  private:
+-  void Create(int aWidth, int aHeight);
+   void ReleaseShmSurface();
+ 
+   // WaylandShmPool provides actual shared memory we draw into
+
--- a/mozilla-1693472.patch
+++ b/mozilla-1693472.patch
@ -0,0 +1,111 @@
+changeset:   576074:12385afb25c9
+tag:         tip
+parent:      576071:a3bc2d23debb
+user:        stransky <stransky@redhat.com>
+date:        Wed Mar 31 16:37:22 2021 +0200
+files:       modules/libpref/init/StaticPrefList.yaml widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.h
+description:
+Bug 1693472 [Wayland] Always use direct drawing on KWim, r?jhorak
+
+Differential Revision: https://phabricator.services.mozilla.com/D110427
+
+
+diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
+--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
+@@ -10991,10 +10991,13 @@
+   mirror: always
+ #endif
+ 
+-# Use smooth rendering for Wayland basic compositor.
+# Smooth rendering mode for Wayland basic compositor.
+# 0 - direct draw
+# 1 - basic caching
+# 2 - all caching
+ - name: widget.wayland-smooth-rendering
+-  type: RelaxedAtomicBool
+-  value: false
+  type: RelaxedAtomicUint32
+  value: 1
+   mirror: always
+ 
+ # Use DMABuf backend for WebGL.
+diff --git a/widget/gtk/WindowSurfaceWayland.cpp b/widget/gtk/WindowSurfaceWayland.cpp
+--- a/widget/gtk/WindowSurfaceWayland.cpp
+++ b/widget/gtk/WindowSurfaceWayland.cpp
+@@ -487,6 +487,11 @@ WindowSurfaceWayland::WindowSurfaceWayla
+   for (int i = 0; i < BACK_BUFFER_NUM; i++) {
+     mShmBackupBuffer[i] = nullptr;
+   }
+  // Use slow compositing on KDE only.
+  const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
+  if (currentDesktop && strstr(currentDesktop, "KDE") != nullptr) {
+    mSmoothRendering = CACHE_NONE;
+  }
+ }
+ 
+ WindowSurfaceWayland::~WindowSurfaceWayland() {
+@@ -817,13 +822,12 @@ already_AddRefed<gfx::DrawTarget> Window
+     mMozContainerRect = mozContainerSize;
+   }
+ 
+-  // We can draw directly only when we redraw significant part of the window
+-  // to avoid flickering or do only fullscreen updates in smooth mode.
+-  mDrawToWaylandBufferDirectly =
+-      mSmoothRendering
+-          ? windowRedraw
+-          : (windowRedraw || (lockSize.width * 2 > mozContainerSize.width &&
+-                              lockSize.height * 2 > mozContainerSize.height));
+  mDrawToWaylandBufferDirectly = windowRedraw || mSmoothRendering == CACHE_NONE;
+  if (!mDrawToWaylandBufferDirectly && mSmoothRendering == CACHE_SMALL) {
+    mDrawToWaylandBufferDirectly =
+        (lockSize.width * 2 > mozContainerSize.width &&
+         lockSize.height * 2 > mozContainerSize.height);
+  }
+ 
+   if (!mDrawToWaylandBufferDirectly) {
+     // Don't switch wl_buffers when we cache drawings.
+diff --git a/widget/gtk/WindowSurfaceWayland.h b/widget/gtk/WindowSurfaceWayland.h
+--- a/widget/gtk/WindowSurfaceWayland.h
+++ b/widget/gtk/WindowSurfaceWayland.h
+@@ -149,19 +149,6 @@ class WindowSurfaceWayland : public Wind
+ 
+   RefPtr<nsWaylandDisplay> GetWaylandDisplay() { return mWaylandDisplay; };
+ 
+-  // Image cache mode can be set by widget.wayland_cache_mode
+-  typedef enum {
+-    // Cache and clip all drawings, default. It's slowest
+-    // but also without any rendered artifacts.
+-    CACHE_ALL = 0,
+-    // Cache drawing only when back buffer is missing. May produce
+-    // some rendering artifacts and flickering when partial screen update
+-    // is rendered.
+-    CACHE_MISSING = 1,
+-    // Don't cache anything, draw only when back buffer is available.
+-    CACHE_NONE = 2
+-  } RenderingCacheMode;
+-
+  private:
+   WindowBackBuffer* GetWaylandBuffer();
+   WindowBackBuffer* SetNewWaylandBuffer();
+@@ -251,9 +238,18 @@ class WindowSurfaceWayland : public Wind
+   // This typically apply to popup windows.
+   bool mBufferNeedsClear;
+ 
+  typedef enum {
+    // Don't cache anything, always draw directly to wl_buffer
+    CACHE_NONE = 0,
+    // Cache only small paints (smaller than 1/2 of screen).
+    CACHE_SMALL = 1,
+    // Cache all painting except fullscreen updates.
+    CACHE_ALL = 2,
+  } RenderingCacheMode;
+
+   // Cache all drawings except fullscreen updates.
+   // Avoid any rendering artifacts for significant performance penality.
+-  bool mSmoothRendering;
+  unsigned int mSmoothRendering;
+ 
+   gint mSurfaceReadyTimerID;
+   mozilla::Mutex mSurfaceLock;
+
--- a/mozilla-1700520.patch
+++ b/mozilla-1700520.patch
@ -0,0 +1,51 @@
+diff --git a/gfx/wr/swgl/src/blend.h b/gfx/wr/swgl/src/blend.h
+--- a/gfx/wr/swgl/src/blend.h
+++ b/gfx/wr/swgl/src/blend.h
+@@ -405,7 +405,7 @@
+   blend_key = BlendKey(AA_BLEND_KEY_NONE + blend_key);
+ }
+ 
+-static ALWAYS_INLINE WideRGBA8 blend_pixels(uint32_t* buf, PackedRGBA8 pdst,
+static PREFER_INLINE WideRGBA8 blend_pixels(uint32_t* buf, PackedRGBA8 pdst,
+                                             WideRGBA8 src, int span = 4) {
+   WideRGBA8 dst = unpack(pdst);
+   const WideRGBA8 RGB_MASK = {0xFFFF, 0xFFFF, 0xFFFF, 0,      0xFFFF, 0xFFFF,
+@@ -686,7 +686,7 @@
+   // clang-format on
+ }
+ 
+-static ALWAYS_INLINE WideR8 blend_pixels(uint8_t* buf, WideR8 dst, WideR8 src,
+static PREFER_INLINE WideR8 blend_pixels(uint8_t* buf, WideR8 dst, WideR8 src,
+                                          int span = 4) {
+ // clang-format off
+ #define BLEND_CASE_KEY(key)                          \
+diff --git a/gfx/wr/swgl/src/gl.cc b/gfx/wr/swgl/src/gl.cc
+--- a/gfx/wr/swgl/src/gl.cc
+++ b/gfx/wr/swgl/src/gl.cc
+@@ -58,10 +58,24 @@
+ }
+ 
+ #else
+-#  define ALWAYS_INLINE __attribute__((always_inline)) inline
+// GCC is slower when dealing with always_inline, especially in debug builds.
+// When using Clang, use always_inline more aggressively.
+#  if defined(__clang__) || defined(NDEBUG)
+#    define ALWAYS_INLINE __attribute__((always_inline)) inline
+#  else
+#    define ALWAYS_INLINE inline
+#  endif
+ #  define NO_INLINE __attribute__((noinline))
+ #endif
+ 
+// Some functions may cause excessive binary bloat if inlined in debug or with
+// GCC builds, so use PREFER_INLINE on these instead of ALWAYS_INLINE.
+#if defined(__clang__) && defined(NDEBUG)
+#  define PREFER_INLINE ALWAYS_INLINE
+#else
+#  define PREFER_INLINE inline
+#endif
+
+ #define UNREACHABLE __builtin_unreachable()
+ 
+ #define UNUSED [[maybe_unused]]
+
--- a/mozilla-1701089.patch
+++ b/mozilla-1701089.patch
@ -0,0 +1,23 @@
+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
+@@ -884,7 +884,7 @@
+   //
+   // Google's code to parse manifests can be used as a reference for strings
+   // the manifest may contain
+-  // https://cs.chromium.org/chromium/src/chrome/common/media/cdm_manifest.cc?l=73&rcl=393e60bfc2299449db7ef374c0ef1c324716e562
+  // https://source.chromium.org/chromium/chromium/src/+/master:components/cdm/common/cdm_manifest.cc;l=74;drc=775880ced8a989191281e93854c7f2201f25068f
+   //
+   // Gecko's internal strings can be found at
+   // https://searchfox.org/mozilla-central/rev/ea63a0888d406fae720cf24f4727d87569a8cab5/dom/media/eme/MediaKeySystemAccess.cpp#149-155
+@@ -892,7 +892,8 @@
+     nsCString codec;
+     if (chromiumCodec.EqualsASCII("vp8")) {
+       codec = "vp8"_ns;
+-    } else if (chromiumCodec.EqualsASCII("vp9.0")) {
+    } else if (chromiumCodec.EqualsASCII("vp9.0") ||  // Legacy string.
+               chromiumCodec.EqualsASCII("vp09")) {
+       codec = "vp9"_ns;
+     } else if (chromiumCodec.EqualsASCII("avc1")) {
+       codec = "h264"_ns;
+
--- a/mozilla-1702606.patch
+++ b/mozilla-1702606.patch
@ -0,0 +1,41 @@
+changeset:   576316:5310862f0f2a
+tag:         tip
+parent:      576314:6159d3fc46c6
+user:        stransky <stransky@redhat.com>
+date:        Thu Apr 01 20:02:47 2021 +0200
+files:       widget/gtk/WindowSurfaceWayland.cpp widget/gtk/nsWaylandDisplay.cpp
+description:
+Bug 1702606 [Wayland] Don't call mWaylandDisplay::WaitForSyncEnd() from Compositor/Render thread, r?rmader
+
+Differential Revision: https://phabricator.services.mozilla.com/D110590
+
+
+diff --git a/widget/gtk/WindowSurfaceWayland.cpp b/widget/gtk/WindowSurfaceWayland.cpp
+--- a/widget/gtk/WindowSurfaceWayland.cpp
+++ b/widget/gtk/WindowSurfaceWayland.cpp
+@@ -737,10 +737,6 @@ already_AddRefed<gfx::DrawTarget> Window
+     return nullptr;
+   }
+ 
+-  // Wait until all pending events are processed. There may be queued
+-  // wl_buffer release event which releases our wl_buffer for further rendering.
+-  mWaylandDisplay->WaitForSyncEnd();
+-
+   // Lock the surface *after* WaitForSyncEnd() call as is can fire
+   // FlushPendingCommits().
+   MutexAutoLock lock(mSurfaceLock);
+diff --git a/widget/gtk/nsWaylandDisplay.cpp b/widget/gtk/nsWaylandDisplay.cpp
+--- a/widget/gtk/nsWaylandDisplay.cpp
+++ b/widget/gtk/nsWaylandDisplay.cpp
+@@ -239,6 +239,10 @@ void nsWaylandDisplay::QueueSyncBegin() 
+ }
+ 
+ void nsWaylandDisplay::WaitForSyncEnd() {
+  MOZ_RELEASE_ASSERT(
+      NS_IsMainThread(),
+      "nsWaylandDisplay::WaitForSyncEnd() can be called in main thread only!");
+
+   // We're done here
+   if (!mSyncCallback) {
+     return;
+
--- a/mozilla-1703657.patch
+++ b/mozilla-1703657.patch
@ -0,0 +1,28 @@
+changeset:   576616:8d1ea60136ed
+tag:         tip
+parent:      576614:144a345005ac
+user:        stransky <stransky@redhat.com>
+date:        Wed Apr 07 21:55:43 2021 +0200
+files:       widget/gtk/nsWindow.cpp
+description:
+Bug 1703657 [Wayland] Use wayland focus workaround if widget.wayland-focus-workaroud is set at nsWindow::SetFocus(), r?rmader
+
+Differential Revision: https://phabricator.services.mozilla.com/D111162
+
+
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
+@@ -2220,9 +2220,9 @@ void nsWindow::SetFocus(Raise aRaise, mo
+     if (gRaiseWindows && owningWindow->mIsShown && owningWindow->mShell &&
+         !gtk_window_is_active(GTK_WINDOW(owningWindow->mShell))) {
+       if (!mIsX11Display &&
+-          Preferences::GetBool("testing.browserTestHarness.running", false)) {
+          Preferences::GetBool("widget.wayland-focus-workaroud", false)) {
+         // Wayland does not support focus changes so we need to workaround it
+-        // by window hide/show sequence but only when it's running in testsuite.
+        // by window hide/show sequence.
+         owningWindow->NativeShow(false);
+         owningWindow->NativeShow(true);
+         return;
+
--- a/mozilla-1703763.patch
+++ b/mozilla-1703763.patch
@ -0,0 +1,317 @@
+diff -up firefox-88.0/widget/gtk/nsClipboard.cpp.1703763 firefox-88.0/widget/gtk/nsClipboard.cpp
+--- firefox-88.0/widget/gtk/nsClipboard.cpp.1703763	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/gtk/nsClipboard.cpp	2021-04-21 09:46:55.642676394 +0200
+@@ -153,10 +153,11 @@ nsClipboard::SetData(nsITransferable* aT
+   bool imagesAdded = false;
+   for (uint32_t i = 0; i < flavors.Length(); i++) {
+     nsCString& flavorStr = flavors[i];
+    LOGCLIP(("    processing target %s\n", flavorStr.get()));
+ 
+     // Special case text/unicode since we can handle all of the string types.
+     if (flavorStr.EqualsLiteral(kUnicodeMime)) {
+-      LOGCLIP(("    text targets\n"));
+      LOGCLIP(("    adding TEXT targets\n"));
+       gtk_target_list_add_text_targets(list, 0);
+       continue;
+     }
+@@ -165,7 +166,7 @@ nsClipboard::SetData(nsITransferable* aT
+       // Don't bother adding image targets twice
+       if (!imagesAdded) {
+         // accept any writable image type
+-        LOGCLIP(("    image targets\n"));
+        LOGCLIP(("    adding IMAGE targets\n"));
+         gtk_target_list_add_image_targets(list, 0, TRUE);
+         imagesAdded = true;
+       }
+@@ -173,6 +174,7 @@ nsClipboard::SetData(nsITransferable* aT
+     }
+ 
+     // Add this to our list of valid targets
+    LOGCLIP(("    adding OTHER target %s\n", flavorStr.get()));
+     GdkAtom atom = gdk_atom_intern(flavorStr.get(), FALSE);
+     gtk_target_list_add(list, atom, 0, 0);
+   }
+@@ -184,14 +186,17 @@ nsClipboard::SetData(nsITransferable* aT
+   gint numTargets;
+   GtkTargetEntry* gtkTargets =
+       gtk_target_table_new_from_list(list, &numTargets);
+-
+-  LOGCLIP(("    gtk_target_table_new_from_list() = %p\n", (void*)gtkTargets));
+  if (!gtkTargets) {
+    LOGCLIP(("    gtk_clipboard_set_with_data() failed!\n"));
+    // Clear references to the any old data and let GTK know that it is no
+    // longer available.
+    EmptyClipboard(aWhichClipboard);
+    return NS_ERROR_FAILURE;
+  }
+ 
+   // Set getcallback and request to store data after an application exit
+-  if (gtkTargets &&
+-      gtk_clipboard_set_with_data(gtkClipboard, gtkTargets, numTargets,
+  if (gtk_clipboard_set_with_data(gtkClipboard, gtkTargets, numTargets,
+                                   clipboard_get_cb, clipboard_clear_cb, this)) {
+-    LOGCLIP(("    gtk_clipboard_set_with_data() is ok\n"));
+     // We managed to set-up the clipboard so update internal state
+     // We have to set it now because gtk_clipboard_set_with_data() calls
+     // clipboard_clear_cb() which reset our internal state
+@@ -207,8 +212,6 @@ nsClipboard::SetData(nsITransferable* aT
+     rv = NS_OK;
+   } else {
+     LOGCLIP(("    gtk_clipboard_set_with_data() failed!\n"));
+-    // Clear references to the any old data and let GTK know that it is no
+-    // longer available.
+     EmptyClipboard(aWhichClipboard);
+     rv = NS_ERROR_FAILURE;
+   }
+@@ -419,6 +422,22 @@ nsClipboard::HasDataMatchingFlavors(cons
+     return NS_OK;
+   }
+ 
+#ifdef MOZ_LOGGING
+  LOGCLIP(("    Clipboard content (target nums %d):\n", targetNums));
+  for (int32_t j = 0; j < targetNums; j++) {
+    gchar* atom_name = gdk_atom_name(targets[j]);
+    if (!atom_name) {
+      LOGCLIP(("        failed to get MIME\n"));
+      continue;
+    }
+    LOGCLIP(("        MIME %s\n", atom_name));
+  }
+  LOGCLIP(("    Asking for content:\n"));
+  for (auto& flavor : aFlavorList) {
+    LOGCLIP(("        MIME %s\n", flavor.get()));
+  }
+#endif
+
+   // Walk through the provided types and try to match it to a
+   // provided type.
+   for (auto& flavor : aFlavorList) {
+diff -up firefox-88.0/widget/gtk/nsClipboard.h.1703763 firefox-88.0/widget/gtk/nsClipboard.h
+--- firefox-88.0/widget/gtk/nsClipboard.h.1703763	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/gtk/nsClipboard.h	2021-04-21 09:46:55.642676394 +0200
+@@ -23,6 +23,8 @@ extern mozilla::LazyLogModule gClipboard
+ #  define LOGCLIP(args)
+ #endif /* MOZ_LOGGING */
+ 
+enum ClipboardDataType { CLIPBOARD_DATA, CLIPBOARD_TEXT, CLIPBOARD_TARGETS };
+
+ class nsRetrievalContext {
+  public:
+   // Get actual clipboard content (GetClipboardData/GetClipboardText)
+diff -up firefox-88.0/widget/gtk/nsClipboardWayland.cpp.1703763 firefox-88.0/widget/gtk/nsClipboardWayland.cpp
+--- firefox-88.0/widget/gtk/nsClipboardWayland.cpp.1703763	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/gtk/nsClipboardWayland.cpp	2021-04-21 09:46:55.642676394 +0200
+@@ -233,6 +233,7 @@ nsWaylandDragContext* WaylandDataOffer::
+ static void data_offer_offer(void* data, struct wl_data_offer* wl_data_offer,
+                              const char* type) {
+   auto* offer = static_cast<DataOffer*>(data);
+  LOGCLIP(("Data offer %p add MIME %s\n", wl_data_offer, type));
+   offer->AddMIMEType(type);
+ }
+ 
+@@ -311,6 +312,8 @@ bool PrimaryDataOffer::RequestDataTransf
+ static void primary_data_offer(
+     void* data, gtk_primary_selection_offer* primary_selection_offer,
+     const char* mime_type) {
+  LOGCLIP(("Primary data offer %p add MIME %s\n", primary_selection_offer,
+           mime_type));
+   auto* offer = static_cast<DataOffer*>(data);
+   offer->AddMIMEType(mime_type);
+ }
+@@ -318,6 +321,8 @@ static void primary_data_offer(
+ static void primary_data_offer(
+     void* data, zwp_primary_selection_offer_v1* primary_selection_offer,
+     const char* mime_type) {
+  LOGCLIP(("Primary data offer %p add MIME %s\n", primary_selection_offer,
+           mime_type));
+   auto* offer = static_cast<DataOffer*>(data);
+   offer->AddMIMEType(mime_type);
+ }
+@@ -814,30 +819,15 @@ nsRetrievalContextWayland::~nsRetrievalC
+   g_hash_table_destroy(mActiveOffers);
+ }
+ 
+-GdkAtom* nsRetrievalContextWayland::GetTargets(int32_t aWhichClipboard,
+-                                               int* aTargetNum) {
+-  if (GetSelectionAtom(aWhichClipboard) == GDK_SELECTION_CLIPBOARD) {
+-    if (mClipboardOffer) {
+-      return mClipboardOffer->GetTargets(aTargetNum);
+-    }
+-  } else {
+-    if (mPrimaryOffer) {
+-      return mPrimaryOffer->GetTargets(aTargetNum);
+-    }
+-  }
+-
+-  *aTargetNum = 0;
+-  return nullptr;
+-}
+-
+ struct FastTrackClipboard {
+-  FastTrackClipboard(int aClipboardRequestNumber,
+  FastTrackClipboard(ClipboardDataType aDataType, int aClipboardRequestNumber,
+                      nsRetrievalContextWayland* aRetrievalContex)
+       : mClipboardRequestNumber(aClipboardRequestNumber),
+-        mRetrievalContex(aRetrievalContex) {}
+-
+        mRetrievalContex(aRetrievalContex),
+        mDataType(aDataType) {}
+   int mClipboardRequestNumber;
+   nsRetrievalContextWayland* mRetrievalContex;
+  ClipboardDataType mDataType;
+ };
+ 
+ static void wayland_clipboard_contents_received(
+@@ -846,17 +836,24 @@ static void wayland_clipboard_contents_r
+            selection_data));
+   FastTrackClipboard* fastTrack = static_cast<FastTrackClipboard*>(data);
+   fastTrack->mRetrievalContex->TransferFastTrackClipboard(
+-      fastTrack->mClipboardRequestNumber, selection_data);
+      fastTrack->mDataType, fastTrack->mClipboardRequestNumber, selection_data);
+   delete fastTrack;
+ }
+ 
+ void nsRetrievalContextWayland::TransferFastTrackClipboard(
+-    int aClipboardRequestNumber, GtkSelectionData* aSelectionData) {
+    ClipboardDataType aDataType, int aClipboardRequestNumber,
+    GtkSelectionData* aSelectionData) {
+   LOGCLIP(
+       ("nsRetrievalContextWayland::TransferFastTrackClipboard(), "
+        "aSelectionData = %p\n",
+        aSelectionData));
+ 
+  if (mClipboardRequestNumber != aClipboardRequestNumber) {
+    LOGCLIP(("    request number does not match!\n"));
+    NS_WARNING("Received obsoleted clipboard data!");
+  }
+  LOGCLIP(("    request number matches\n"));
+
+   int dataLength = gtk_selection_data_get_length(aSelectionData);
+   if (dataLength < 0) {
+     LOGCLIP(
+@@ -866,24 +863,76 @@ void nsRetrievalContextWayland::Transfer
+     return;
+   }
+ 
+-  if (mClipboardRequestNumber == aClipboardRequestNumber) {
+-    LOGCLIP(("    request number matches\n"));
+-    LOGCLIP(("    fastracking %d bytes of data.\n", dataLength));
+-    mClipboardDataLength = dataLength;
+-    if (dataLength > 0) {
+-      mClipboardData = reinterpret_cast<char*>(
+-          g_malloc(sizeof(char) * (mClipboardDataLength + 1)));
+-      memcpy(mClipboardData, gtk_selection_data_get_data(aSelectionData),
+-             sizeof(char) * mClipboardDataLength);
+-      mClipboardData[mClipboardDataLength] = '\0';
+-      LOGCLIP(("    done, mClipboardData = %p\n", mClipboardData));
+-    } else {
+-      ReleaseClipboardData(mClipboardData);
+  switch (aDataType) {
+    case CLIPBOARD_TARGETS: {
+      LOGCLIP(("    fastracking %d bytes of clipboard targets.\n", dataLength));
+      gint n_targets = 0;
+      GdkAtom* targets = nullptr;
+
+      if (!gtk_selection_data_get_targets(aSelectionData, &targets,
+                                          &n_targets) ||
+          !n_targets) {
+        ReleaseClipboardData(mClipboardData);
+      }
+
+      mClipboardData = reinterpret_cast<char*>(targets);
+      mClipboardDataLength = n_targets;
+      break;
+    }
+    case CLIPBOARD_DATA:
+    case CLIPBOARD_TEXT: {
+      LOGCLIP(("    fastracking %d bytes of data.\n", dataLength));
+      mClipboardDataLength = dataLength;
+      if (dataLength > 0) {
+        mClipboardData = reinterpret_cast<char*>(
+            g_malloc(sizeof(char) * (mClipboardDataLength + 1)));
+        memcpy(mClipboardData, gtk_selection_data_get_data(aSelectionData),
+               sizeof(char) * mClipboardDataLength);
+        mClipboardData[mClipboardDataLength] = '\0';
+        LOGCLIP(("    done, mClipboardData = %p\n", mClipboardData));
+      } else {
+        ReleaseClipboardData(mClipboardData);
+      }
+    }
+  }
+}
+
+GdkAtom* nsRetrievalContextWayland::GetTargets(int32_t aWhichClipboard,
+                                               int* aTargetNum) {
+  /* If actual clipboard data is owned by us we don't need to go
+   * through Wayland but we ask Gtk+ to directly call data
+   * getter callback nsClipboard::SelectionGetEvent().
+   * see gtk_selection_convert() at gtk+/gtkselection.c.
+   */
+  GdkAtom selection = GetSelectionAtom(aWhichClipboard);
+  if (gdk_selection_owner_get(selection)) {
+    LOGCLIP(("  Asking for internal clipboard content.\n"));
+    mClipboardRequestNumber++;
+    gtk_clipboard_request_contents(
+        gtk_clipboard_get(selection), gdk_atom_intern("TARGETS", FALSE),
+        wayland_clipboard_contents_received,
+        new FastTrackClipboard(CLIPBOARD_TARGETS, mClipboardRequestNumber,
+                               this));
+    *aTargetNum = mClipboardDataLength;
+    GdkAtom* targets = static_cast<GdkAtom*>((void*)mClipboardData);
+    // We don't hold the target list internally but we transfer the ownership.
+    mClipboardData = nullptr;
+    mClipboardDataLength = 0;
+    return targets;
+  }
+
+  if (GetSelectionAtom(aWhichClipboard) == GDK_SELECTION_CLIPBOARD) {
+    if (mClipboardOffer) {
+      return mClipboardOffer->GetTargets(aTargetNum);
+     }
+   } else {
+-    LOGCLIP(("    request number does not match!\n"));
+-    NS_WARNING("Received obsoleted clipboard data!");
+    if (mPrimaryOffer) {
+      return mPrimaryOffer->GetTargets(aTargetNum);
+    }
+   }
+
+  *aTargetNum = 0;
+  return nullptr;
+ }
+ 
+ const char* nsRetrievalContextWayland::GetClipboardData(
+@@ -906,7 +955,7 @@ const char* nsRetrievalContextWayland::G
+     gtk_clipboard_request_contents(
+         gtk_clipboard_get(selection), gdk_atom_intern(aMimeType, FALSE),
+         wayland_clipboard_contents_received,
+-        new FastTrackClipboard(mClipboardRequestNumber, this));
+        new FastTrackClipboard(CLIPBOARD_DATA, mClipboardRequestNumber, this));
+   } else {
+     LOGCLIP(("  Asking for remote clipboard content.\n"));
+     const auto& dataOffer =
+diff -up firefox-88.0/widget/gtk/nsClipboardWayland.h.1703763 firefox-88.0/widget/gtk/nsClipboardWayland.h
+--- firefox-88.0/widget/gtk/nsClipboardWayland.h.1703763	2021-04-21 09:46:55.642676394 +0200
+++ firefox-88.0/widget/gtk/nsClipboardWayland.h	2021-04-21 09:56:10.939329774 +0200
+@@ -134,7 +134,8 @@ class nsRetrievalContextWayland : public
+ 
+   void ClearDragAndDropDataOffer();
+ 
+-  void TransferFastTrackClipboard(int aClipboardRequestNumber,
+  void TransferFastTrackClipboard(ClipboardDataType aDataType,
+                                  int aClipboardRequestNumber,
+                                   GtkSelectionData* aSelectionData);
+ 
+   virtual ~nsRetrievalContextWayland() override;
+diff -up firefox-88.0/widget/gtk/nsClipboardX11.h.1703763 firefox-88.0/widget/gtk/nsClipboardX11.h
+--- firefox-88.0/widget/gtk/nsClipboardX11.h.1703763	2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/gtk/nsClipboardX11.h	2021-04-21 09:46:55.642676394 +0200
+@@ -10,8 +10,6 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-enum ClipboardDataType { CLIPBOARD_DATA, CLIPBOARD_TEXT, CLIPBOARD_TARGETS };
+-
+ class nsRetrievalContextX11 : public nsRetrievalContext {
+  public:
+   enum State { INITIAL, COMPLETED, TIMED_OUT };
--- a/mozilla-1705048.patch
+++ b/mozilla-1705048.patch
@ -0,0 +1,70 @@
+diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/nsWindow.cpp
+--- firefox-88.0/widget/gtk/nsWindow.cpp.1705048	2021-05-04 15:43:16.039586526 +0200
+++ firefox-88.0/widget/gtk/nsWindow.cpp	2021-05-04 15:47:26.358614462 +0200
+@@ -553,6 +553,7 @@ nsWindow::nsWindow() {
+   mTitlebarBackdropState = false;
+ 
+   mHasAlphaVisual = false;
+  mIsWaylandPanelWindow = false;
+   mIsPIPWindow = false;
+   mAlwaysOnTop = false;
+ 
+@@ -3713,7 +3714,7 @@ void nsWindow::OnButtonPressEvent(GdkEve
+ 
+   LayoutDeviceIntPoint refPoint =
+       GdkEventCoordsToDevicePixels(aEvent->x, aEvent->y);
+-  if (mDraggableRegion.Contains(refPoint.x, refPoint.y) &&
+  if ((mIsWaylandPanelWindow || mDraggableRegion.Contains(refPoint.x, refPoint.y)) &&
+       domButton == MouseButton::ePrimary &&
+       eventStatus != nsEventStatus_eConsumeNoDefault) {
+     mWindowShouldStartDragging = true;
+@@ -4614,8 +4615,9 @@ nsresult nsWindow::Create(nsIWidget* aPa
+       // as a workaround.
+       mWindowType = eWindowType_toplevel;
+     } else if (mWindowType == eWindowType_popup && !aNativeParent && !aParent) {
+-      // Workaround for Wayland where the popup windows always need to have
+-      // parent window. For example webrtc ui is a popup window without parent.
+      // mIsWaylandPanelWindow is a special toplevel window on Wayland which
+      // emulates X11 popup window without parent.
+      mIsWaylandPanelWindow = true;
+       mWindowType = eWindowType_toplevel;
+     }
+   }
+@@ -4642,8 +4644,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
+       // popup window position.
+       GtkWindowType type = GTK_WINDOW_TOPLEVEL;
+       if (mWindowType == eWindowType_popup) {
+-        type = (mIsX11Display && aInitData->mNoAutoHide) ? GTK_WINDOW_TOPLEVEL
+-                                                         : GTK_WINDOW_POPUP;
+        type = GTK_WINDOW_POPUP;
+        if (GdkIsX11Display() && aInitData->mNoAutoHide) {
+          type = GTK_WINDOW_TOPLEVEL;
+        }
+       }
+       mShell = gtk_window_new(type);
+ 
+@@ -4890,6 +4894,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
+       }
+ #endif
+ 
+      if (mIsWaylandPanelWindow) {
+        gtk_window_set_decorated(GTK_WINDOW(mShell), false);
+      }
+
+       if (mWindowType == eWindowType_popup) {
+         // gdk does not automatically set the cursor for "temporary"
+         // windows, which are what gtk uses for popups.
+diff -up firefox-88.0/widget/gtk/nsWindow.h.1705048 firefox-88.0/widget/gtk/nsWindow.h
+--- firefox-88.0/widget/gtk/nsWindow.h.1705048	2021-05-04 15:43:16.041586502 +0200
+++ firefox-88.0/widget/gtk/nsWindow.h	2021-05-04 15:45:01.703331956 +0200
+@@ -591,6 +591,10 @@ class nsWindow final : public nsBaseWidg
+   LayoutDeviceIntRegion mDraggableRegion;
+   // It's PictureInPicture window.
+   bool mIsPIPWindow;
+  // It's undecorated popup utility window, without resizers/titlebar,
+  // movable by mouse. Used on Wayland as a workaround for popups without
+  // parent (for instance WebRTC sharing indicator).
+  bool mIsWaylandPanelWindow;
+   bool mAlwaysOnTop;
+ 
+ #ifdef ACCESSIBILITY
--- a/mozilla-1885133.patch
+++ b/mozilla-1885133.patch
@ -0,0 +1,21 @@
+diff --git a/browser/components/shell/nsGNOMEShellDBusHelper.cpp b/browser/components/shell/nsGNOMEShellDBusHelper.cpp
+--- a/browser/components/shell/nsGNOMEShellDBusHelper.cpp
+++ b/browser/components/shell/nsGNOMEShellDBusHelper.cpp
+@@ -29,7 +29,7 @@ static bool GetGnomeSearchTitle(const ch
+   }
+ 
+   AutoTArray<nsString, 1> formatStrings;
+-  CopyASCIItoUTF16(nsCString(aSearchedTerm), *formatStrings.AppendElement());
+  CopyUTF8toUTF16(nsCString(aSearchedTerm), *formatStrings.AppendElement());
+ 
+   nsAutoString gnomeSearchTitle;
+   bundle->FormatStringFromName("gnomeSearchProviderSearch", formatStrings,
+@@ -41,7 +41,7 @@ static bool GetGnomeSearchTitle(const ch
+ static const char* introspect_template =
+     "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection "
+     "1.0//EN\"\n"
+-    "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\";>\n"
+    "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
+     "<node>\n"
+     " <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
+     "   <method name=\"Introspect\">\n"
--- a/mozilla-440908.patch
+++ b/mozilla-440908.patch
@ -0,0 +1,111 @@
+diff -up firefox-56.0/modules/libpref/prefapi.cpp.440908 firefox-56.0/modules/libpref/prefapi.cpp
+--- firefox-56.0/modules/libpref/prefapi.cpp.440908	2017-09-14 22:15:52.000000000 +0200
+++ firefox-56.0/modules/libpref/prefapi.cpp	2017-09-25 10:39:39.266572792 +0200
+@@ -1036,8 +1036,8 @@ void PREF_ReaderCallback(void       *clo
+                          PrefValue   value,
+                          PrefType    type,
+                          bool        isDefault,
+-                         bool        isStickyDefault)
+-
+                         bool        isStickyDefault,
+                         bool        isLocked)
+ {
+     uint32_t flags = 0;
+     if (isDefault) {
+@@ -1049,4 +1049,6 @@ void PREF_ReaderCallback(void       *clo
+         flags |= kPrefForceSet;
+     }
+     pref_HashPref(pref, value, type, flags);
+    if (isLocked)
+        PREF_LockPref(pref, true);
+ }
+diff -up firefox-56.0/modules/libpref/prefapi.h.440908 firefox-56.0/modules/libpref/prefapi.h
+--- firefox-56.0/modules/libpref/prefapi.h.440908	2017-07-31 18:20:51.000000000 +0200
+++ firefox-56.0/modules/libpref/prefapi.h	2017-09-25 10:39:39.267572789 +0200
+@@ -246,8 +246,8 @@ void PREF_ReaderCallback( void *closure,
+                           PrefValue   value,
+                           PrefType    type,
+                           bool        isDefault,
+-                          bool        isStickyDefault);
+-
+                          bool        isStickyDefault,
+                          bool        isLocked);
+ 
+ /*
+  * Callback whenever we change a preference
+diff -up firefox-56.0/modules/libpref/prefread.cpp.440908 firefox-56.0/modules/libpref/prefread.cpp
+--- firefox-56.0/modules/libpref/prefread.cpp.440908	2017-09-14 22:15:52.000000000 +0200
+++ firefox-56.0/modules/libpref/prefread.cpp	2017-09-25 10:39:39.267572789 +0200
+@@ -43,6 +43,7 @@ enum {
+ #define BITS_PER_HEX_DIGIT      4
+ 
+ static const char kUserPref[] = "user_pref";
+static const char kLockPref[] = "lockPref";
+ static const char kPref[] = "pref";
+ static const char kPrefSticky[] = "sticky_pref";
+ static const char kTrue[] = "true";
+@@ -146,7 +147,7 @@ pref_DoCallback(PrefParseState *ps)
+         break;
+     }
+     (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault,
+-                  ps->fstickydefault);
+                  ps->fstickydefault, ps->flock);
+     return true;
+ }
+ 
+@@ -215,6 +216,7 @@ PREF_ParseBuf(PrefParseState *ps, const
+                 ps->vtype = PrefType::Invalid;
+                 ps->fdefault = false;
+                 ps->fstickydefault = false;
+                ps->flock = false;
+             }
+             switch (c) {
+             case '/':       /* begin comment block or line? */
+@@ -225,11 +227,14 @@ PREF_ParseBuf(PrefParseState *ps, const
+                 break;
+             case 'u':       /* indicating user_pref */
+             case 's':       /* indicating sticky_pref */
+            case 'l':       /* indicating lockPref */
+             case 'p':       /* indicating pref */
+                 if (c == 'u') {
+                   ps->smatch = kUserPref;
+                 } else if (c == 's') {
+                   ps->smatch = kPrefSticky;
+                } else if (c == 'l') {
+                  ps->smatch = kLockPref;
+                 } else {
+                   ps->smatch = kPref;
+                 }
+@@ -277,8 +282,10 @@ PREF_ParseBuf(PrefParseState *ps, const
+         /* name parsing */
+         case PREF_PARSE_UNTIL_NAME:
+             if (c == '\"' || c == '\'') {
+-                ps->fdefault = (ps->smatch == kPref || ps->smatch == kPrefSticky);
+                ps->fdefault = (ps->smatch == kPref || ps->smatch == kPrefSticky
+                                || ps->smatch == kLockPref);
+                 ps->fstickydefault = (ps->smatch == kPrefSticky);
+                ps->flock = (ps->smatch == kLockPref);
+                 ps->quotechar = c;
+                 ps->nextstate = PREF_PARSE_UNTIL_COMMA; /* return here when done */
+                 state = PREF_PARSE_QUOTED_STRING;
+diff -up firefox-56.0/modules/libpref/prefread.h.440908 firefox-56.0/modules/libpref/prefread.h
+--- firefox-56.0/modules/libpref/prefread.h.440908	2017-09-14 22:15:52.000000000 +0200
+++ firefox-56.0/modules/libpref/prefread.h	2017-09-25 10:39:39.267572789 +0200
+@@ -34,7 +34,8 @@ typedef void (*PrefReader)(void       *c
+                            PrefValue   val,
+                            PrefType    type,
+                            bool        defPref,
+-                           bool        stickyPref);
+                           bool        stickyPref,
+                           bool        lockPref);
+ 
+ /**
+  * Report any errors or warnings we encounter during parsing.
+@@ -62,6 +63,7 @@ typedef struct PrefParseState {
+     PrefType    vtype;      /* PREF_STRING,INT,BOOL          */
+     bool        fdefault;   /* true if (default) pref        */
+     bool        fstickydefault; /* true if (sticky) pref     */
+    bool        flock;      /* true if pref to be locked     */
+ } PrefParseState;
+ 
+ /**
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@ -0,0 +1,14 @@
+diff -up firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h
+--- firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm	2017-03-03 13:53:52.480754536 +0100
+++ firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h	2017-03-03 13:56:01.476018102 +0100
+@@ -203,6 +203,10 @@
+     #define SK_ARM_HAS_CRC32
+ #endif
+ 
+#if defined(__aarch64__)
+    #undef SK_ARM_HAS_NEON
+#endif
+
+ //////////////////////////////////////////////////////////////////////
+ 
+ #if !defined(SKIA_IMPLEMENTATION)
--- a/org.mozilla.firefox.SearchProvider.service
+++ b/org.mozilla.firefox.SearchProvider.service
@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.mozilla.firefox.SearchProvider
-Exec=/usr/lib64/firefox/firefox --dbus-service /usr/bin/firefox
--- a/org.mozilla.firefox.appdata.xml.in
+++ b/org.mozilla.firefox.appdata.xml.in
@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2019 Firefox contributors -->
-<component type="desktop-application">
-  <id>org.mozilla.firefox</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>Firefox</name>
-  <summary>Web Browser</summary>
-  <summary xml:lang="ca">Navegador web</summary>
-  <summary xml:lang="cs">Webový prohlížeč</summary>
-  <summary xml:lang="es">Navegador web</summary>
-  <summary xml:lang="fa">مرورگر اینترنتی</summary>
-  <summary xml:lang="fi">WWW-selain</summary>
-  <summary xml:lang="fr">Navigateur Web</summary>
-  <summary xml:lang="hu">Webböngésző</summary>
-  <summary xml:lang="it">Browser Web</summary>
-  <summary xml:lang="ja">ウェブ・ブラウザ</summary>
-  <summary xml:lang="ko">웹 브라우저</summary>
-  <summary xml:lang="nb">Nettleser</summary>
-  <summary xml:lang="nl">Webbrowser</summary>
-  <summary xml:lang="nn">Nettlesar</summary>
-  <summary xml:lang="no">Nettleser</summary>
-  <summary xml:lang="pl">Przeglądarka WWW</summary>
-  <summary xml:lang="pt">Navegador Web</summary>
-  <summary xml:lang="pt_BR">Navegador Web</summary>
-  <summary xml:lang="sk">Internetový prehliadač</summary>
-  <summary xml:lang="sv">Webbläsare</summary>
-  <description>
-    <p>
-      Bringing together all kinds of awesomeness to make browsing better for you.
-      Get to your favorite sites quickly – even if you don’t remember the URLs.
-      Type your term into the location bar (aka the Awesome Bar) and the autocomplete
-      function will include possible matches from your browsing history, bookmarked
-      sites and open tabs.
-    </p>
-  </description>
-  <url type="homepage">https://www.mozilla.org</url>
-  <update_contact>stransky@redhat.com</update_contact>
-  <kudos>
-    <kudo>ModernToolkit</kudo>
-    <kudo>SearchProvider</kudo>
-  </kudos>
-  <project_group>Mozilla</project_group>
-  <project_license>GPL-3.0+</project_license>
-  <developer_name>Mozilla Corporation</developer_name>
-  <url type="bugtracker">https://bugzilla.mozilla.org/</url>
-  <url type="help">https://support.mozilla.org/</url>
-  <translation type="gettext">firefox</translation>
-  <launchable type="desktop-id">org.mozilla.firefox.desktop</launchable>
-  <provides>
-    <id>firefox.desktop</id>
-  </provides>
-  <screenshots>
-    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/a.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/b.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/c.png</screenshot>
-  </screenshots>
-  <content_rating type="oars-1.1"/>
-  <releases>
-    <release version="__VERSION__" date="__DATE__"/>
-  </releases>
-</component>
--- a/org.mozilla.firefox.desktop
+++ b/org.mozilla.firefox.desktop
@ -1,276 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Firefox
-GenericName=Web Browser
-GenericName[ca]=Navegador web
-GenericName[cs]=Webový prohlížeč
-GenericName[es]=Navegador web
-GenericName[fa]=مرورگر اینترنتی
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブ・ブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[no]=Nettleser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[sk]=Internetový prehliadač
-GenericName[sv]=Webbläsare
-Comment=Browse the Web
-Comment[ca]=Navegueu per el web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[de]=Im Internet surfen
-Comment[es]=Navegue por la web
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Navigue sur Internet
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[sk]=Prehliadanie internetu
-Comment[sv]=Surfa på webben
-Exec=firefox %u
-Icon=firefox
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
-Keywords=web;browser;internet;
-Actions=new-window;new-private-window;profile-manager-window;
-
-[Desktop Action new-window]
-Name=Open a New Window
-Name[ach]=Dirica manyen
-Name[af]=Nuwe venster
-Name[an]=Nueva finestra
-Name[ar]=نافذة جديدة
-Name[as]=নতুন উইন্ডো
-Name[ast]=Ventana nueva
-Name[az]=Yeni Pəncərə
-Name[be]=Новае акно
-Name[bg]=Нов прозорец
-Name[bn_BD]=নতুন উইন্ডো (N)
-Name[bn_IN]=নতুন উইন্ডো
-Name[br]=Prenestr nevez
-Name[brx]=गोदान उइन्ड'(N)
-Name[bs]=Novi prozor
-Name[ca]=Finestra nova
-Name[cak]=K'ak'a' tzuwäch
-Name[cs]=Nové okno
-Name[cy]=Ffenestr Newydd
-Name[da]=Nyt vindue
-Name[de]=Neues Fenster
-Name[dsb]=Nowe wokno
-Name[el]=Νέο παράθυρο
-Name[en_GB]=New Window
-Name[en_US]=New Window
-Name[en_ZA]=New Window
-Name[eo]=Nova fenestro
-Name[es_AR]=Nueva ventana
-Name[es_CL]=Nueva ventana
-Name[es_ES]=Nueva ventana
-Name[es_MX]=Nueva ventana
-Name[et]=Uus aken
-Name[eu]=Leiho berria
-Name[fa]=پنجره جدید‌
-Name[ff]=Henorde Hesere
-Name[fi]=Uusi ikkuna
-Name[fr]=Nouvelle fenêtre
-Name[fy_NL]=Nij finster
-Name[ga_IE]=Fuinneog Nua
-Name[gd]=Uinneag ùr
-Name[gl]=Nova xanela
-Name[gn]=Ovetã pyahu
-Name[gu_IN]=નવી વિન્ડો
-Name[he]=חלון חדש
-Name[hi_IN]=नया विंडो
-Name[hr]=Novi prozor
-Name[hsb]=Nowe wokno
-Name[hu]=Új ablak
-Name[hy_AM]=Նոր Պատուհան
-Name[id]=Jendela Baru
-Name[is]=Nýr gluggi
-Name[it]=Nuova finestra
-Name[ja]=新しいウィンドウ
-Name[ja_JP-mac]=新規ウインドウ
-Name[ka]=ახალი ფანჯარა
-Name[kk]=Жаңа терезе
-Name[km]=បង្អួចថ្មី
-Name[kn]=ಹೊಸ ಕಿಟಕಿ
-Name[ko]=새 창
-Name[kok]=नवें जनेल
-Name[ks]=نئئ وِنڈو
-Name[lij]=Neuvo barcon
-Name[lo]=ຫນ້າຕ່າງໃຫມ່
-Name[lt]=Naujas langas
-Name[ltg]=Jauns lūgs
-Name[lv]=Jauns logs
-Name[mai]=नव विंडो
-Name[mk]=Нов прозорец
-Name[ml]=പുതിയ ജാലകം
-Name[mr]=नवीन पटल
-Name[ms]=Tetingkap Baru
-Name[my]=ဝင်းဒိုးအသစ်
-Name[nb_NO]=Nytt vindu
-Name[ne_NP]=नयाँ सञ्झ्याल
-Name[nl]=Nieuw venster
-Name[nn_NO]=Nytt vindauge
-Name[or]=ନୂତନ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ
-Name[pl]=Nowe okno
-Name[pt_BR]=Nova janela
-Name[pt_PT]=Nova janela
-Name[rm]=Nova fanestra
-Name[ro]=Fereastră nouă
-Name[ru]=Новое окно
-Name[sat]=नावा विंडो (N)
-Name[si]=නව කවුළුවක්
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[son]=Zanfun taaga
-Name[sq]=Dritare e Re
-Name[sr]=Нови прозор
-Name[sv_SE]=Nytt fönster
-Name[ta]=புதிய சாளரம்
-Name[te]=కొత్త విండో
-Name[th]=หน้าต่างใหม่
-Name[tr]=Yeni pencere
-Name[tsz]=Eraatarakua jimpani
-Name[uk]=Нове вікно
-Name[ur]=نیا دریچہ
-Name[uz]=Yangi oyna
-Name[vi]=Cửa sổ mới
-Name[wo]=Palanteer bu bees
-Name[xh]=Ifestile entsha
-Name[zh_CN]=新建窗口
-Name[zh_TW]=開新視窗
-Exec=firefox --new-window %u
-
-[Desktop Action new-private-window]
-Name=Open a New Private Window
-Name[ach]=Dirica manyen me mung
-Name[af]=Nuwe privaatvenster
-Name[an]=Nueva finestra privada
-Name[ar]=نافذة خاصة جديدة
-Name[as]=নতুন ব্যক্তিগত উইন্ডো
-Name[ast]=Ventana privada nueva
-Name[az]=Yeni Məxfi Pəncərə
-Name[be]=Новае акно адасаблення
-Name[bg]=Нов прозорец за поверително сърфиране
-Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
-Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো
-Name[br]=Prenestr merdeiñ prevez nevez
-Name[brx]=गोदान प्राइभेट उइन्ड'
-Name[bs]=Novi privatni prozor
-Name[ca]=Finestra privada nova
-Name[cak]=K'ak'a' ichinan tzuwäch
-Name[cs]=Nové anonymní okno
-Name[cy]=Ffenestr Breifat Newydd
-Name[da]=Nyt privat vindue
-Name[de]=Neues privates Fenster
-Name[dsb]=Nowe priwatne wokno
-Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
-Name[en_GB]=New Private Window
-Name[en_US]=New Private Window
-Name[en_ZA]=New Private Window
-Name[eo]=Nova privata fenestro
-Name[es_AR]=Nueva ventana privada
-Name[es_CL]=Nueva ventana privada
-Name[es_ES]=Nueva ventana privada
-Name[es_MX]=Nueva ventana privada
-Name[et]=Uus privaatne aken
-Name[eu]=Leiho pribatu berria
-Name[fa]=پنجره ناشناس جدید
-Name[ff]=Henorde Suturo Hesere
-Name[fi]=Uusi yksityinen ikkuna
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[fy_NL]=Nij priveefinster
-Name[ga_IE]=Fuinneog Nua Phríobháideach
-Name[gd]=Uinneag phrìobhaideach ùr
-Name[gl]=Nova xanela privada
-Name[gn]=Ovetã ñemi pyahu
-Name[gu_IN]=નવી ખાનગી વિન્ડો
-Name[he]=חלון פרטי חדש
-Name[hi_IN]=नयी निजी विंडो
-Name[hr]=Novi privatni prozor
-Name[hsb]=Nowe priwatne wokno
-Name[hu]=Új privát ablak
-Name[hy_AM]=Սկսել Գաղտնի դիտարկում
-Name[id]=Jendela Mode Pribadi Baru
-Name[is]=Nýr huliðsgluggi
-Name[it]=Nuova finestra anonima
-Name[ja]=新しいプライベートウィンドウ
-Name[ja_JP-mac]=新規プライベートウインドウ
-Name[ka]=ახალი პირადი ფანჯარა
-Name[kk]=Жаңа жекелік терезе
-Name[km]=បង្អួចឯកជនថ្មី
-Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
-Name[ko]=새 사생활 보호 모드
-Name[kok]=नवो खाजगी विंडो
-Name[ks]=نْو پرایوٹ وینڈو&amp;
-Name[lij]=Neuvo barcon privou
-Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່
-Name[lt]=Naujas privataus naršymo langas
-Name[ltg]=Jauns privatais lūgs
-Name[lv]=Jauns privātais logs
-Name[mai]=नया निज विंडो (W)
-Name[mk]=Нов приватен прозорец
-Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
-Name[mr]=नवीन वैयक्तिक पटल
-Name[ms]=Tetingkap Persendirian Baharu
-Name[my]=New Private Window
-Name[nb_NO]=Nytt privat vindu
-Name[ne_NP]=नयाँ निजी सञ्झ्याल
-Name[nl]=Nieuw privévenster
-Name[nn_NO]=Nytt privat vindauge
-Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
-Name[pl]=Nowe okno prywatne
-Name[pt_BR]=Nova janela privativa
-Name[pt_PT]=Nova janela privada
-Name[rm]=Nova fanestra privata
-Name[ro]=Fereastră privată nouă
-Name[ru]=Новое приватное окно
-Name[sat]=नावा निजेराक् विंडो (W )
-Name[si]=නව පුද්ගලික කවුළුව (W)
-Name[sk]=Nové okno v režime Súkromné prehliadanie
-Name[sl]=Novo zasebno okno
-Name[son]=Sutura zanfun taaga
-Name[sq]=Dritare e Re Private
-Name[sr]=Нови приватан прозор
-Name[sv_SE]=Nytt privat fönster
-Name[ta]=புதிய தனிப்பட்ட சாளரம்
-Name[te]=కొత్త ఆంతరంగిక విండో
-Name[th]=หน้าต่างส่วนตัวใหม่
-Name[tr]=Yeni gizli pencere
-Name[tsz]=Juchiiti eraatarakua jimpani
-Name[uk]=Приватне вікно
-Name[ur]=نیا نجی دریچہ
-Name[uz]=Yangi maxfiy oyna
-Name[vi]=Cửa sổ riêng tư mới
-Name[wo]=Panlanteeru biir bu bees
-Name[xh]=Ifestile yangasese entsha
-Name[zh_CN]=新建隐私浏览窗口
-Name[zh_TW]=新增隱私視窗
-Exec=firefox --private-window %u
-
-[Desktop Action profile-manager-window]
-Name=Open the Profile Manager
-Name[cs]=Správa profilů
-Name[de]=Profilverwaltung öffnen
-Name[fr]=Ouvrir le gestionnaire de profils
-Exec=firefox --ProfileManager
--- a/org.mozilla.firefox.search-provider.ini
+++ b/org.mozilla.firefox.search-provider.ini
@ -1,5 +0,0 @@
-[Shell Search Provider]
-DesktopId=org.mozilla.firefox.desktop
-BusName=org.mozilla.firefox.SearchProvider
-ObjectPath=/org/mozilla/firefox/SearchProvider
-Version=2
--- a/pgo.patch
+++ b/pgo.patch
@ -1,46 +1,36 @@
-diff -up firefox-145.0/build/moz.configure/lto-pgo.configure.pgo firefox-145.0/build/moz.configure/lto-pgo.configure
--- firefox-145.0/build/moz.configure/lto-pgo.configure.pgo	2025-11-03 16:56:55.000000000 +0100
-+++ firefox-145.0/build/moz.configure/lto-pgo.configure	2025-11-05 13:59:53.477443914 +0100
-@@ -96,12 +96,16 @@ set_config("PGO_PROFILE_PATH", pgo_profi
- 
- @depends(
-     "--enable-profile-use",
-+    c_compiler,
-     pgo_profile_path,
-     llvm_profdata,
-     llvm_profdata_order,
-     build_environment,
- )
-def orderfile_path(profile_use, path, profdata, profdata_order, build_env):
-+def orderfile_path(profile_use, compiler, path, profdata, profdata_order, build_env):
-+    if compiler.type == "gcc":
-+        return None
-+
-     if not profile_use:
-         return None
- 
-@@ -145,7 +149,7 @@ def pgo_flags(
-         return namespace(
-             gen_cflags=["-fprofile-generate"],
-             gen_ldflags=["-fprofile-generate"],
-            use_cflags=["-fprofile-use", "-fprofile-correction", "-Wcoverage-mismatch"],
-+            use_cflags=["-fprofile-use", "-fprofile-correction", "-Wno-coverage-mismatch"],
-             use_ldflags=["-fprofile-use"],
-         )
- 
-diff -up firefox-145.0/build/pgo/profileserver.py.pgo firefox-145.0/build/pgo/profileserver.py
--- firefox-145.0/build/pgo/profileserver.py.pgo	2025-11-03 16:56:55.000000000 +0100
-+++ firefox-145.0/build/pgo/profileserver.py	2025-11-05 13:59:53.477602066 +0100
-@@ -10,7 +10,7 @@ import subprocess
- import sys
+diff -up firefox-88.0/build/moz.configure/lto-pgo.configure.pgo firefox-88.0/build/moz.configure/lto-pgo.configure
+--- firefox-88.0/build/moz.configure/lto-pgo.configure.pgo	2021-04-15 21:44:26.000000000 +0200
+++ firefox-88.0/build/moz.configure/lto-pgo.configure	2021-04-19 13:45:00.240696430 +0200
+@@ -240,13 +240,13 @@ def lto(
+                 cflags.append("-flto")
+                 ldflags.append("-flto")
+             else:
+-                cflags.append("-flto=thin")
+-                ldflags.append("-flto=thin")
+                cflags.append("-flto")
+                ldflags.append("-flto")
+         elif c_compiler.type == "clang-cl":
+             if len(value) and value[0].lower() == "full":
+                 cflags.append("-flto")
+             else:
+-                cflags.append("-flto=thin")
+                cflags.append("-flto")
+             # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
+             # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
+             cflags.append("-fuse-ld=lld")
+diff -up firefox-88.0/build/pgo/profileserver.py.pgo firefox-88.0/build/pgo/profileserver.py
+--- firefox-88.0/build/pgo/profileserver.py.pgo	2021-04-15 21:44:26.000000000 +0200
+++ firefox-88.0/build/pgo/profileserver.py	2021-04-19 13:45:00.240696430 +0200
+@@ -11,7 +11,7 @@ import glob
+ import subprocess
 
 import mozcrash
-from mozbuild.base import BinaryNotFoundException, MozbuildObject
-+from mozbuild.base import BinaryNotFoundException, MozbuildObject, BuildEnvironmentNotFoundException
- from mozfile import TemporaryDirectory, json
+-from mozbuild.base import MozbuildObject, BinaryNotFoundException
+from mozbuild.base import MozbuildObject, BinaryNotFoundException, BuildEnvironmentNotFoundException
+ from mozfile import TemporaryDirectory
 from mozhttpd import MozHttpd
 from mozprofile import FirefoxProfile, Preferences
-@@ -96,9 +96,22 @@ if __name__ == "__main__":
+@@ -87,9 +87,22 @@ if __name__ == "__main__":
     locations = ServerLocations()
     locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
 
@ -66,55 +56,49 @@ diff -up firefox-145.0/build/pgo/profileserver.py.pgo firefox-145.0/build/pgo/pr
 
     with TemporaryDirectory() as profilePath:
         # TODO: refactor this into mozprofile
-diff -up firefox-145.0/gfx/2d/moz.build.pgo firefox-145.0/gfx/2d/moz.build
--- firefox-145.0/gfx/2d/moz.build.pgo	2025-11-03 16:56:57.000000000 +0100
-+++ firefox-145.0/gfx/2d/moz.build	2025-11-05 14:21:20.485610837 +0100
-@@ -137,11 +137,11 @@ if CONFIG["INTEL_ARCHITECTURE"]:
-     DEFINES["USE_SSE2"] = True
-     # The file uses SSE2 intrinsics, so it needs special compile flags on some
-     # compilers.
-    SOURCES["ConvolutionFilterAVX2.cpp"].flags += ["-mavx2"]
-+    SOURCES["ConvolutionFilterAVX2.cpp"].flags += ["-mavx2", "-fno-lto"]
-     SOURCES["ConvolutionFilterSSE2.cpp"].flags += CONFIG["SSE2_FLAGS"]
-     SOURCES["FilterProcessingSSE2.cpp"].flags += CONFIG["SSE2_FLAGS"]
-     SOURCES["ImageScalingSSE2.cpp"].flags += CONFIG["SSE2_FLAGS"]
-    SOURCES["SwizzleAVX2.cpp"].flags += ["-mavx2"]
-+    SOURCES["SwizzleAVX2.cpp"].flags += ["-mavx2", "-fno-lto"]
-     SOURCES["SwizzleSSE2.cpp"].flags += CONFIG["SSE2_FLAGS"]
-     SOURCES["SwizzleSSSE3.cpp"].flags += CONFIG["SSSE3_FLAGS"]
+@@ -212,6 +225,10 @@ if __name__ == "__main__":
+             print("Firefox exited successfully, but produced a crashreport")
+             sys.exit(1)
 
-diff -up firefox-145.0/gfx/skia/generate_mozbuild.py.pgo firefox-145.0/gfx/skia/generate_mozbuild.py
--- firefox-145.0/gfx/skia/generate_mozbuild.py.pgo	2025-11-03 16:56:57.000000000 +0100
-+++ firefox-145.0/gfx/skia/generate_mozbuild.py	2025-11-05 13:59:53.477947055 +0100
-@@ -50,8 +50,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
- if CONFIG['INTEL_ARCHITECTURE']:
-     SOURCES['skia/modules/skcms/skcms.cc'].flags += ['-DSKCMS_DISABLE_SKX']
-     skia_ssse3_flags = ['-Dskvx=skvx_ssse3', '-mssse3']
-    skia_avx_flags = ['-Dskvx=skvx_avx', '-mavx']
-    skia_hsw_flags = ['-Dskvx=skvx_hsw', '-mavx2', '-mf16c', '-mfma']
-+    skia_avx_flags = ['-Dskvx=skvx_avx', '-mavx', '-fno-lto']
-+    skia_hsw_flags = ['-Dskvx=skvx_hsw', '-mavx2', '-mf16c', '-mfma', '-fno-lto']
-     SOURCES['skia/src/core/SkBitmapProcState_opts_ssse3.cpp'].flags += skia_ssse3_flags
-     SOURCES['skia/src/core/SkBlitMask_opts_ssse3.cpp'].flags += skia_ssse3_flags
-     SOURCES['skia/src/core/SkSwizzler_opts_ssse3.cpp'].flags += ['-Dskvx=skvx_ssse3']
-diff -up firefox-145.0/gfx/skia/moz.build.pgo firefox-145.0/gfx/skia/moz.build
--- firefox-145.0/gfx/skia/moz.build.pgo	2025-11-03 16:56:57.000000000 +0100
-+++ firefox-145.0/gfx/skia/moz.build	2025-11-05 13:59:53.478077484 +0100
-@@ -597,8 +597,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
- if CONFIG['INTEL_ARCHITECTURE']:
-     SOURCES['skia/modules/skcms/skcms.cc'].flags += ['-DSKCMS_DISABLE_SKX']
-     skia_ssse3_flags = ['-Dskvx=skvx_ssse3', '-mssse3']
-    skia_avx_flags = ['-Dskvx=skvx_avx', '-mavx']
-    skia_hsw_flags = ['-Dskvx=skvx_hsw', '-mavx2', '-mf16c', '-mfma']
-+    skia_avx_flags = ['-Dskvx=skvx_avx', '-mavx', '-fno-lto']
-+    skia_hsw_flags = ['-Dskvx=skvx_hsw', '-mavx2', '-mf16c', '-mfma', '-fno-lto']
-     SOURCES['skia/src/core/SkBitmapProcState_opts_ssse3.cpp'].flags += skia_ssse3_flags
-     SOURCES['skia/src/core/SkBlitMask_opts_ssse3.cpp'].flags += skia_ssse3_flags
-     SOURCES['skia/src/core/SkSwizzler_opts_ssse3.cpp'].flags += ['-Dskvx=skvx_ssse3']
-diff -up firefox-145.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-145.0/toolkit/components/terminator/nsTerminator.cpp
--- firefox-145.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2025-11-03 16:57:15.000000000 +0100
-+++ firefox-145.0/toolkit/components/terminator/nsTerminator.cpp	2025-11-05 13:59:53.478238011 +0100
-@@ -330,6 +330,11 @@ void nsTerminator::StartWatchdog() {
+        print('Copying profile data....')
+        os.system('pwd');
+        os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
+
+         llvm_profdata = env.get("LLVM_PROFDATA")
+         if llvm_profdata:
+             profraw_files = glob.glob("*.profraw")
+diff -up firefox-88.0/build/unix/mozconfig.unix.pgo firefox-88.0/build/unix/mozconfig.unix
+--- firefox-88.0/build/unix/mozconfig.unix.pgo	2021-04-15 21:44:26.000000000 +0200
+++ firefox-88.0/build/unix/mozconfig.unix	2021-04-19 13:45:00.240696430 +0200
+@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
+     CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
+     CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
+ 
+    if [ -n "$MOZ_PGO" ]; then
+        if [ -z "$USE_ARTIFACT" ]; then
+            ac_add_options --enable-lto
+        fi
+        export AR="$topsrcdir/gcc/bin/gcc-ar"
+        export NM="$topsrcdir/gcc/bin/gcc-nm"
+        export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
+    fi
+
+     # We want to make sure we use binutils and other binaries in the tooltool
+     # package.
+     mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
+diff -up firefox-88.0/extensions/spellcheck/src/moz.build.pgo firefox-88.0/extensions/spellcheck/src/moz.build
+--- firefox-88.0/extensions/spellcheck/src/moz.build.pgo	2021-04-15 21:44:28.000000000 +0200
+++ firefox-88.0/extensions/spellcheck/src/moz.build	2021-04-19 13:45:00.240696430 +0200
+@@ -31,3 +31,5 @@ EXPORTS.mozilla += [
+ 
+ if CONFIG["CC_TYPE"] in ("clang", "gcc"):
+     CXXFLAGS += ["-Wno-error=shadow"]
+
+CXXFLAGS += ['-fno-devirtualize']
+diff -up firefox-88.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-88.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-88.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2021-04-19 13:45:00.240696430 +0200
+++ firefox-88.0/toolkit/components/terminator/nsTerminator.cpp	2021-04-19 13:46:01.144530790 +0200
+@@ -456,6 +456,11 @@ void nsTerminator::StartWatchdog() {
   }
 #endif
 
@ -124,5 +108,5 @@ diff -up firefox-145.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefo
 +  crashAfterMS = INT32_MAX;
 +
   UniquePtr<Options> options(new Options());
-   // crashAfterTicks is guaranteed to be > 0 as
-   // crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
+   const PRIntervalTime ticksDuration =
+       PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
--- a/rhbz-1173156.patch
+++ b/rhbz-1173156.patch
@ -1,12 +1,12 @@
-diff -up firefox-132.0/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156 firefox-132.0/extensions/auth/nsAuthSambaNTLM.cpp
--- firefox-132.0/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156	2024-10-23 09:26:41.433895188 +0200
-+++ firefox-132.0/extensions/auth/nsAuthSambaNTLM.cpp	2024-10-23 10:05:11.025801336 +0200
-@@ -153,7 +153,7 @@ nsresult nsAuthSambaNTLM::SpawnNTLMAuthH
-     options.fds_to_remap.push_back(
-         std::pair{fromChildPipeWrite.get(), STDOUT_FILENO});
- 
-    std::vector<std::string> argvVec{"ntlm_auth",        "--helper-protocol",
-+    std::vector<std::string> argvVec{"/usr/bin/ntlm_auth", "--helper-protocol",
-                                      "ntlmssp-client-1", "--use-cached-creds",
-                                      "--username",       username};
+diff -up firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156 firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp
+--- firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156	2019-01-22 10:36:09.284069020 +0100
+++ firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp	2019-01-22 10:37:12.669757744 +0100
+@@ -161,7 +161,7 @@ nsresult nsAuthSambaNTLM::SpawnNTLMAuthH
+   const char* username = PR_GetEnv("USER");
+   if (!username) return NS_ERROR_FAILURE;
 
+-  const char* const args[] = {"ntlm_auth",
+  const char* const args[] = {"/usr/bin/ntlm_auth",
+                               "--helper-protocol",
+                               "ntlmssp-client-1",
+                               "--use-cached-creds",
--- a/rhbz-1219542-s390-build.patch
+++ b/rhbz-1219542-s390-build.patch
@ -0,0 +1,23 @@
+diff -up firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390 firefox-55.0/js/src/old-configure.in
+--- firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390	2017-07-31 18:20:48.000000000 +0200
+++ firefox-55.0/js/src/old-configure.in	2017-08-02 14:31:32.190243669 +0200
+@@ -541,7 +541,7 @@ case "$host" in
+ 
+ *-linux*|*-kfreebsd*-gnu|*-gnu*)
+     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+-    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}"
+     ;;
+ 
+ *)
+@@ -617,8 +617,8 @@ case "$target" in
+ 
+ *-*linux*)
+     if test "$GNU_CC" -o "$GNU_CXX"; then
+-        MOZ_PGO_OPTIMIZE_FLAGS="-O3"
+-        MOZ_OPTIMIZE_FLAGS="-O3"
+        MOZ_PGO_OPTIMIZE_FLAGS="-O1"
+        MOZ_OPTIMIZE_FLAGS="-O1"
+         if test -z "$CLANG_CC"; then
+            MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
+         fi
--- a/rhbz-1400293-fix-mozilla-1324096.patch
+++ b/rhbz-1400293-fix-mozilla-1324096.patch
@ -0,0 +1,72 @@
+diff --git a/security/certverifier/CertVerifier.cpp b/security/certverifier/CertVerifier.cpp
+--- a/security/certverifier/CertVerifier.cpp
+++ b/security/certverifier/CertVerifier.cpp
+@@ -120,16 +120,20 @@ IsCertChainRootBuiltInRoot(const UniqueC
+   }
+   CERTCertificate* root = rootNode->cert;
+   if (!root) {
+     return Result::FATAL_ERROR_LIBRARY_FAILURE;
+   }
+   return IsCertBuiltInRoot(root, result);
+ }
+ 
+// The term "builtin root" traditionally refers to a root CA certificate that
+// has been added to the NSS trust store, because it has been approved
+// for inclusion according to the Mozilla CA policy, and might be accepted
+// by Mozilla applications as an issuer for certificates seen on the public web.
+ Result
+ IsCertBuiltInRoot(CERTCertificate* cert, bool& result)
+ {
+   result = false;
+ #ifdef DEBUG
+   nsCOMPtr<nsINSSComponent> component(do_GetService(PSM_COMPONENT_CONTRACTID));
+   if (!component) {
+     return Result::FATAL_ERROR_LIBRARY_FAILURE;
+@@ -142,25 +146,38 @@ IsCertBuiltInRoot(CERTCertificate* cert,
+     return Success;
+   }
+ #endif // DEBUG
+   AutoSECMODListReadLock lock;
+   for (SECMODModuleList* list = SECMOD_GetDefaultModuleList(); list;
+        list = list->next) {
+     for (int i = 0; i < list->module->slotCount; i++) {
+       PK11SlotInfo* slot = list->module->slots[i];
+-      // PK11_HasRootCerts should return true if and only if the given slot has
+-      // an object with a CKA_CLASS of CKO_NETSCAPE_BUILTIN_ROOT_LIST, which
+-      // should be true only of the builtin root list.
+-      // If we can find a copy of the given certificate on the slot with the
+-      // builtin root list, that certificate must be a builtin.
+-      if (PK11_IsPresent(slot) && PK11_HasRootCerts(slot) &&
+-          PK11_FindCertInSlot(slot, cert, nullptr) != CK_INVALID_HANDLE) {
+-        result = true;
+-        return Success;
+      // We're searching for the "builtin root module", which is a module that
+      // contains an object with a CKA_CLASS of CKO_NETSCAPE_BUILTIN_ROOT_LIST.
+      // We use PK11_HasRootCerts() to identify a module with that property.
+      // In the past, we exclusively used the PKCS#11 module named nssckbi,
+      // which is provided by the NSS library.
+      // Nowadays, some distributions use a replacement module, which contains
+      // the builtin roots, but which also contains additional CA certificates,
+      // such as CAs trusted in a local deployment.
+      // We want to be able to distinguish between these two categories,
+      // because a CA, which may issue certificates for the public web,
+      // is expected to comply with additional requirements.
+      // If the certificate has attribute CKA_NSS_MOZILLA_CA_POLICY set to true,
+      // then we treat it as a "builtin root".
+      if (PK11_IsPresent(slot) && PK11_HasRootCerts(slot)) {
+        CK_OBJECT_HANDLE handle = PK11_FindCertInSlot(slot, cert, nullptr);
+        if (handle != CK_INVALID_HANDLE &&
+            PK11_HasAttributeSet(slot, handle, CKA_NSS_MOZILLA_CA_POLICY,
+                                 false)) {
+          // Attribute was found, and is set to true
+          result = true;
+          break;
+        }
+       }
+     }
+   }
+   return Success;
+ }
+ 
+ static Result
+ BuildCertChainForOneKeyUsage(NSSCertDBTrustDomain& trustDomain, Input certDER,
--- a/6
+++ b/6
@ -46,7 +46,7 @@ if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then
 fi

 # Basic render testing
-export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.wayland.test-workarounds.enabled=true"
+export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.wayland-focus-workaroud=true"
 #export TEST_FLAVOUR=""
 #if [ $RUN_REFTEST -ne 0 ] ; then
 #  ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
@ -61,8 +61,6 @@ export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.way
 # WebRender testing
 export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
 export TEST_FLAVOUR="-wr"
-# Use dom/base/test or dom/base/test/chrome for short version
-export MOCHITEST_DIR='dom'
 if [ $RUN_REFTEST -ne 0 ] ; then
  ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
  sleep 60
@ -72,7 +70,7 @@ if [ $RUN_CRASHTEST -ne 0 ] ; then
  sleep 60
 fi
 if [ $RUN_MOCHITEST -ne 0 ] ; then
-  ./mach mochitest $MOCHITEST_DIR $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+  ./mach mochitest dom $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
  sleep 60
 fi

--- a/29
+++ b/29
@ -20,24 +20,21 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
    # if not found, launch a new one
    eval `dbus-launch --sh-syntax`
 fi
+eval `echo '' | /usr/bin/gnome-keyring-daemon -r -d --unlock --components=secrets`

 if [ -z "$XDG_RUNTIME_DIR" ]; then
  export XDG_RUNTIME_DIR=$HOME
 fi

-export WAYLAND_DISPLAY=firefox-pgo-wayland-0
-if [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
-  rm -f $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY
-  rm -f $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY.lock
+. xvfb-run -s "-screen 0 1600x1200x24" -n 80 mutter --display=:80 --wayland --nested &
+export DISPLAY=:80
+
+if [ -z "$WAYLAND_DISPLAY" ] ; then
+  export WAYLAND_DISPLAY=wayland-0
+else
+  export WAYLAND_DISPLAY=wayland-1
 fi
-
-echo "Launch mutter for $WAYLAND_DISPLAY"
-mutter --headless --virtual-monitor 1920x1080 --wayland-display=$WAYLAND_DISPLAY --no-x11 & MUTTER_PID=$!
-export MUTTER_PID
-echo "Mutter PID $MUTTER_PID"
-
-echo "Waiting for mutter to start..."
-sleep 5
+sleep 10
 retry_count=0
 max_retries=5
 until [ $retry_count -gt $max_retries ]; do
@ -50,10 +47,4 @@ until [ $retry_count -gt $max_retries ]; do
  fi
 done

-if [ ! -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
-  echo "Mutter failed to start!"
-  exit 1
-fi
-
-echo "Mutter is running, $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY is here."
-
+env | grep "DISPLAY"
--- a/rust-thirdparty-checksum-fix.patch
+++ b/rust-thirdparty-checksum-fix.patch
--- a/11
+++ b/11
@ -1,7 +1,4 @@
-SHA512 (mochitest-python.tar.gz) = 089b1593068b76f4572af0086eaccf52a6a1299bfffb58593206d19bf021ae381f2380bbfeb4371586cd53706ff6dde3d240238b2caf19b96c57dfc2f4524e36
-SHA512 (dump_syms-vendor.tar.xz) = ee0ea52aac781b8dd48936a3d13b140bd725a48cc488d23693b68edbe3bcfba5723022dba3c3849d0da1bacf0e37ddd307cfc56304159f91b71495ce8a08b54a
-SHA512 (wasi-sdk-25.tar.gz) = 1285981d26aa5eff27f08ed4b409909639ddcd62c94ee0cff7093ef68722f4b024c099ca3aa3ab50411e9aace13b86f1f30c5e08a3fc58b6a46b87369d6904aa
-SHA512 (wasm-component-ld-vendor.tar.xz) = 707d942d31455ae0a4f68bf419fb09a20407b6747f831ca554dcd00925b7ea98ef4d03a8652b6d2ae54cf48d7ad15d85aa7eb8d0778ef66b89593eaa8b5c3465
-SHA512 (cbindgen-vendor.tar.xz) = bea420e66bdd1c7c944655dd3e01abd6e7d6ac4b245c7ee190f31d800f7786f21e5cae11715b479bf795f4369d18c40dc12df19e0b643664f2f78e5c8a681415
-SHA512 (firefox-langpacks-147.0-20260106.tar.xz) = 4006c6e8dda8722509c1d1756807373d431d75b20d5a0c3f19e72a2a0dc76df62b15ef871e3fff2d30b2682e6a56b4a4541d8445ea1b83641559a3270e0057b7
-SHA512 (firefox-147.0.source.tar.xz) = ac9017b1a2da7b2f139392c394c36341fd3476e3d4ea1a3c7e5e7bf100dc30d185132ef9256be7e6b0f9dbfc69234ac571ea1fc6db9d84543b15772f4ec85161
+SHA512 (mochitest-python.tar.gz) = 7f357cb8bd93d64be5cb75819a8a813d2f8f217ff25f0df8c3190910744132405d45797b3900775a44b554f5c70cf2682809c9e7a686ca131fddcd81e98028d9
+SHA512 (cbindgen-vendor.tar.xz) = f122880b80009e5d5147b40147ba383731922e618d50312067cab0be6a0873adde5d5dbe2e6688b41c1a7e0f0ca2f1cccfa789e7b834b69f8c5445cc46ecccaf
+SHA512 (firefox-88.0.1.source.tar.xz) = e2d7fc950ba49f225c83ee1d799d6318fcf16c33a3b7f40b85c49d5b7865f7e632c703e5fd227a303b56e2565d0796283ebb12d7fd1a02781dcaa45e84cea934
+SHA512 (firefox-langpacks-88.0.1-20210510.tar.xz) = 9a2818dac19d1dd728dff0ad9a24c199c3b03aacbde1985344ae3b9a16ad7519d2e74f75c3c0c447ffb031ba542c307eb847d20d346aceedf194dbb068396834
--- a/wasi.patch
+++ b/wasi.patch
@ -1,35 +0,0 @@
-diff -up firefox-134.0.1/toolkit/moz.configure.wasi firefox-134.0.1/toolkit/moz.configure
--- firefox-134.0.1/toolkit/moz.configure.wasi	2025-01-13 14:46:04.000000000 +0100
-+++ firefox-134.0.1/toolkit/moz.configure	2025-01-17 08:39:38.870092763 +0100
-@@ -2767,7 +2776,7 @@ with only_when(requires_wasm_sandboxing
-     def wasi_sysroot_flags(wasi_sysroot):
-         if wasi_sysroot:
-             log.info("Using wasi sysroot in %s", wasi_sysroot)
-            return ["--sysroot=%s" % wasi_sysroot]
-+            return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs",  "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/raid/CVS/firefox/firefox-147.0-build/firefox-147.0/wasi-sdk-25/build/sysroot/install/wasi-resource-dir/lib/wasi/libclang_rt.builtins-wasm32.a"]
-         return []
- 
-     set_config("WASI_SYSROOT", wasi_sysroot)
-diff -up firefox-134.0.1/wasi-sdk-25/cmake/wasi-sdk-toolchain.cmake.wasi firefox-134.0.1/wasi-sdk-25/cmake/wasi-sdk-toolchain.cmake
--- firefox-134.0.1/wasi-sdk-25/cmake/wasi-sdk-toolchain.cmake.wasi	2025-01-17 08:40:23.004159900 +0100
-+++ firefox-134.0.1/wasi-sdk-25/cmake/wasi-sdk-toolchain.cmake	2025-01-17 08:40:35.478178790 +0100
-@@ -126,7 +126,7 @@ endif()
- add_custom_command(
-   OUTPUT ${wasm_component_ld}
-   COMMAND
-    cargo install --root ${wasm_component_ld_root} ${rust_target_flag}
-+    cargo install --offline --root ${wasm_component_ld_root} ${rust_target_flag}
-       wasm-component-ld@${wasm_component_ld_version}
-   COMMAND
-     cmake -E make_directory ${wasi_tmp_install}/bin
-diff -up firefox-134.0.2/wasi-sdk-25/version.py.wasi firefox-134.0.2/wasi-sdk-25/version.py
--- firefox-134.0.2/wasi-sdk-25/version.py.wasi	2025-01-16 08:03:26.042654800 +0100
-+++ firefox-134.0.2/wasi-sdk-25/version.py	2025-01-22 14:08:34.563909971 +0100
-@@ -60,6 +60,7 @@ assert parse_git_version(
- 
- 
- def git_version():
-+    return 25
-     version = exec(['git', 'describe', '--long', '--candidates=999',
-                     '--match=wasi-sdk-*', '--dirty=+m', f'--abbrev={GIT_REF_LEN}'],
-                     os.path.dirname(sys.argv[0]))
--- a/wasi.patch.template
+++ b/wasi.patch.template
@ -1,35 +0,0 @@
-diff -up firefox-134.0.1/toolkit/moz.configure.wasi firefox-134.0.1/toolkit/moz.configure
--- firefox-134.0.1/toolkit/moz.configure.wasi	2025-01-13 14:46:04.000000000 +0100
-+++ firefox-134.0.1/toolkit/moz.configure	2025-01-17 08:39:38.870092763 +0100
-@@ -2767,7 +2776,7 @@ with only_when(requires_wasm_sandboxing
-     def wasi_sysroot_flags(wasi_sysroot):
-         if wasi_sysroot:
-             log.info("Using wasi sysroot in %s", wasi_sysroot)
-            return ["--sysroot=%s" % wasi_sysroot]
-+            return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs",  "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "LIBCLANG_RT_PLACEHOLDER"]
-         return []
- 
-     set_config("WASI_SYSROOT", wasi_sysroot)
-diff -up firefox-134.0.1/wasi-sdk-25/cmake/wasi-sdk-toolchain.cmake.wasi firefox-134.0.1/wasi-sdk-25/cmake/wasi-sdk-toolchain.cmake
--- firefox-134.0.1/wasi-sdk-25/cmake/wasi-sdk-toolchain.cmake.wasi	2025-01-17 08:40:23.004159900 +0100
-+++ firefox-134.0.1/wasi-sdk-25/cmake/wasi-sdk-toolchain.cmake	2025-01-17 08:40:35.478178790 +0100
-@@ -126,7 +126,7 @@ endif()
- add_custom_command(
-   OUTPUT ${wasm_component_ld}
-   COMMAND
-    cargo install --root ${wasm_component_ld_root} ${rust_target_flag}
-+    cargo install --offline --root ${wasm_component_ld_root} ${rust_target_flag}
-       wasm-component-ld@${wasm_component_ld_version}
-   COMMAND
-     cmake -E make_directory ${wasi_tmp_install}/bin
-diff -up firefox-134.0.2/wasi-sdk-25/version.py.wasi firefox-134.0.2/wasi-sdk-25/version.py
--- firefox-134.0.2/wasi-sdk-25/version.py.wasi	2025-01-16 08:03:26.042654800 +0100
-+++ firefox-134.0.2/wasi-sdk-25/version.py	2025-01-22 14:08:34.563909971 +0100
-@@ -60,6 +60,7 @@ assert parse_git_version(
- 
- 
- def git_version():
-+    return 25
-     version = exec(['git', 'describe', '--long', '--candidates=999',
-                     '--match=wasi-sdk-*', '--dirty=+m', f'--abbrev={GIT_REF_LEN}'],
-                     os.path.dirname(sys.argv[0]))
Author	SHA1	Message	Date
Martin Stransky	0517f593a1	Merge branch 'main' into f32	2021-05-10 10:33:14 +02:00
Martin Stransky	231b1e41ba	Merge branch 'main' into f32	2021-05-04 15:49:55 +02:00
Martin Stransky	1f5f715077	Merge branch 'main' into f32	2021-04-30 11:47:24 +02:00
Martin Stransky	59ffbed28f	Merge branch 'main' into f32	2021-04-30 10:59:21 +02:00
Martin Stransky	9fcccd86fc	Merge branch 'main' into f32	2021-04-27 22:44:44 +02:00
Martin Stransky	d83e3ed274	Merge branch 'main' into f32	2021-04-27 14:35:49 +02:00
Martin Stransky	bf72c12361	Merge branch 'main' into f32	2021-04-23 10:33:09 +02:00
Martin Stransky	6112de9a01	Merge branch 'main' into f32	2021-04-23 10:31:14 +02:00
Martin Stransky	ebe7b17917	Merge branch 'main' into f32	2021-04-22 16:02:14 +02:00
Martin Stransky	924dc15623	Merge branch 'main' into f32	2021-04-22 15:56:03 +02:00
Martin Stransky	a5aace31e9	Merge branch 'main' into f32	2021-04-22 08:07:58 +02:00
Martin Stransky	ef0bcb84b8	Merge branch 'main' into f32	2021-04-21 09:58:35 +02:00
Martin Stransky	7c19550546	Merge branch 'main' into f32	2021-04-20 16:46:59 +02:00
Martin Stransky	0156172839	Merge branch 'main' into f32	2021-04-20 09:14:47 +02:00
Martin Stransky	d027e1dddb	Merge branch 'main' into f32	2021-04-20 09:12:08 +02:00
Martin Stransky	08f234ce18	Merge branch 'main' into f32	2021-04-12 10:46:41 +02:00
Martin Stransky	8cdb738ec2	Merge branch 'main' into f32	2021-04-07 22:07:06 +02:00
Martin Stransky	9e324b1db7	Merge branch 'main' into f32	2021-04-06 09:58:52 +02:00
Martin Stransky	564384f6af	Merge branch 'main' into f32	2021-04-05 20:30:45 +02:00
Martin Stransky	04ccacf58f	Merge branch 'main' into f32	2021-04-04 18:51:22 +02:00
Martin Stransky	5c93c715ec	Merge branch 'main' into f32	2021-04-01 20:22:05 +02:00
Martin Stransky	bceacbe4cc	Merge branch 'main' into f32	2021-04-01 11:34:56 +02:00
Martin Stransky	22e3fbeb9f	Merge branch 'main' into f32	2021-04-01 11:32:32 +02:00
Martin Stransky	c6eaeb161d	Merge branch 'main' into f32	2021-03-31 18:06:41 +02:00
Martin Stransky	3f6041a941	Merge branch 'main' into f32	2021-03-30 09:02:02 +02:00
Martin Stransky	c34a27c48b	Merge branch 'main' into f32	2021-03-29 18:57:57 +02:00
Martin Stransky	d37c2be6f1	Merge branch 'main' into f32	2021-03-29 16:27:22 +02:00
Martin Stransky	fb6942713a	Merge branch 'main' into f32	2021-03-25 20:15:16 +01:00
Martin Stransky	c3ca6e369c	Merge branch 'main' into f32	2021-03-24 19:31:28 +01:00
Martin Stransky	ec0ab18536	Merge branch 'main' into f32	2021-03-24 15:58:51 +01:00
Martin Stransky	94a88f8de3	Merge branch 'main' into f32	2021-03-23 10:29:45 +01:00
Martin Stransky	d1a1ae98ac	Merge branch 'main' into f32	2021-03-13 16:42:01 +01:00
Martin Stransky	e9162ca5d8	Merge branch 'main' into f32	2021-03-13 16:33:21 +01:00
Martin Stransky	ccad5a287a	Merge branch 'main' into f32	2021-03-12 12:36:51 +01:00
Martin Stransky	fa7445a9c4	Merge branch 'main' into f32	2021-03-10 09:17:27 +01:00
Martin Stransky	49db8a231b	Merge branch 'main' into f32	2021-03-03 17:31:17 +01:00
Martin Stransky	777d01c28b	Merge branch 'main' into f32	2021-03-03 15:14:35 +01:00
Martin Stransky	01b033754e	Merge branch 'main' into f32	2021-03-03 15:01:11 +01:00
Martin Stransky	f889456744	Merge branch 'main' into f32	2021-03-02 11:35:56 +01:00
Martin Stransky	1e96d3c21e	Merge branch 'main' into f32	2021-03-02 08:11:55 +01:00
Martin Stransky	610de9269d	Merge branch 'main' into f32	2021-03-01 19:39:24 +01:00
Martin Stransky	d592408078	Merge branch 'main' into f32	2021-03-01 15:12:36 +01:00
Martin Stransky	9e9f6caa67	Merge branch 'rawhide' into f32	2021-02-27 10:29:54 +01:00
Martin Stransky	98f4e52bbe	Merge branch 'rawhide' into f32	2021-02-27 10:23:08 +01:00
Martin Stransky	75189c323e	Merge branch 'f32' of ssh://pkgs.fedoraproject.org/rpms/firefox into f32	2021-02-26 08:28:08 +01:00
Martin Stransky	d7e73a2169	Merge branch 'main' into f32	2021-02-24 12:40:48 +01:00
Martin Stransky	abd1dcce03	Merge branch 'main' into f32	2021-02-23 12:09:38 +01:00
Martin Stransky	75ee50ad2f	Merge branch 'main' into f32	2021-02-23 11:54:29 +01:00
Martin Stransky	985a8f0d9a	Merge branch 'main' into f32	2021-02-08 17:21:49 +01:00
Martin Stransky	c908c37da9	Merge branch 'master' into f32	2021-02-01 16:24:07 +01:00
Martin Stransky	7407e1d7e8	Merge branch 'master' into f32	2021-01-31 12:42:22 +01:00
Martin Stransky	dc02ecff99	Merge branch 'master' into f32	2021-01-30 16:01:50 +01:00
Martin Stransky	44da383487	Merge branch 'master' into f32	2021-01-30 15:20:58 +01:00
Martin Stransky	b067b3c6b6	Merge branch 'master' into f32	2021-01-30 14:57:41 +01:00
Martin Stransky	5bcc2fb976	Merge branch 'master' into f32	2021-01-28 13:45:33 +01:00
Martin Stransky	dc36684eab	Merge branch 'master' into f32	2021-01-26 23:47:14 +01:00
Martin Stransky	8eaed4e551	Merge branch 'master' into f32	2021-01-25 15:35:20 +01:00
Martin Stransky	59421f3205	Merge branch 'master' into f32	2021-01-25 15:18:52 +01:00
Martin Stransky	2c5442d5ac	Merge branch 'master' into f32	2021-01-22 11:21:01 +01:00
Martin Stransky	fcc30264f3	Merge branch 'master' into f32	2021-01-22 09:37:32 +01:00
Martin Stransky	ebe897cd35	Merge branch 'master' into f32	2021-01-21 19:03:55 +01:00
Martin Stransky	fa99df3c24	Merge branch 'master' into f32	2021-01-21 13:56:13 +01:00
Martin Stransky	f1beee947c	Merge branch 'master' into f32	2021-01-20 16:35:22 +01:00
Martin Stransky	efda6ec55c	Merge branch 'master' into f32	2021-01-19 19:07:27 +01:00
Martin Stransky	3514188b57	Merge branch 'master' into f32	2021-01-15 10:29:48 +01:00
Martin Stransky	42f4203480	Merge branch 'master' into f32	2021-01-15 10:24:06 +01:00
Martin Stransky	2852dbe871	Merge branch 'master' into f32	2021-01-14 14:06:27 +01:00
Martin Stransky	4202c273c8	Merge branch 'master' into f32	2021-01-13 09:55:44 +01:00
Martin Stransky	c34d24bebb	Merge branch 'master' into f32	2021-01-12 22:37:07 +01:00
Martin Stransky	ee8a23a977	Merge branch 'master' into f32	2021-01-12 22:33:53 +01:00
Martin Stransky	993d8c4f7e	Merge branch 'master' into f32	2021-01-12 14:17:56 +01:00
Martin Stransky	6401438e96	Merge branch 'master' into f32	2021-01-12 14:15:48 +01:00
Martin Stransky	0daf1e56a4	Merge branch 'master' into f32	2021-01-11 13:36:06 +01:00
Martin Stransky	dc2fbc1fdb	Merge branch 'master' into f32	2021-01-06 13:09:36 +01:00
Martin Stransky	81c8b4f253	Merge branch 'master' into f32	2021-01-06 11:00:10 +01:00
Martin Stransky	487abff38b	Merge branch 'master' into f32	2021-01-05 18:44:22 +01:00
Martin Stransky	c57e73233c	merge	2021-01-05 10:40:59 +01:00
Martin Stransky	a9b1dda85b	Release up	2021-01-05 10:37:03 +01:00