Merge branch 'master' into f29

2019-11-27 19:21:58 +01:00 · 2019-11-27 11:53:48 +01:00 · 2019-11-27 11:49:10 +01:00 · 2019-11-27 10:37:45 +01:00 · 2019-11-27 09:57:22 +01:00 · 2019-11-26 14:24:10 +01:00
86 changed files with 8909 additions and 7005 deletions
--- a/.gitignore
+++ b/.gitignore
@ -373,377 +373,3 @@ firefox-3.6.4.source.tar.bz2
 /firefox-71.0b12.source.tar.xz
 /firefox-71.0.source.tar.xz
 /firefox-langpacks-71.0-20191126.tar.xz
-/firefox-langpacks-71.0-20191202.tar.xz
-/firefox-72.0.source.tar.xz
-/firefox-langpacks-72.0-20200103.tar.xz
-/firefox-langpacks-72.0-20200106.tar.xz
-/firefox-72.0.1.source.tar.xz
-/firefox-langpacks-72.0.1-20200108.tar.xz
-/firefox-72.0.2.source.tar.xz
-/firefox-langpacks-72.0.2-20200120.tar.xz
-/firefox-73.0.source.tar.xz
-/firefox-langpacks-73.0-20200211.tar.xz
-/firefox-73.0.1.source.tar.xz
-/firefox-langpacks-73.0.1-20200220.tar.xz
-/firefox-74.0.source.tar.xz
-/firefox-langpacks-74.0-20200303.tar.xz
-/firefox-langpacks-74.0-20200309.tar.xz
-/firefox-langpacks-74.0-20200310.tar.xz
-/firefox-74.0.1.source.tar.xz
-/firefox-langpacks-74.0.1-20200404.tar.xz
-/firefox-75.0.source.tar.xz
-/firefox-langpacks-75.0-20200406.tar.xz
-/firefox-76.0.source.tar.xz
-/firefox-langpacks-76.0-20200502.tar.xz
-/firefox-76.0.1.source.tar.xz
-/firefox-langpacks-76.0.1-20200508.tar.xz
-/firefox-77.0.source.tar.xz
-/firefox-langpacks-77.0-20200529.tar.xz
-/firefox-langpacks-77.0-20200602.tar.xz
-/firefox-77.0.1.source.tar.xz
-/firefox-langpacks-77.0.1-20200603.tar.xz
-/firefox-78.0.source.tar.xz
-/firefox-langpacks-78.0-20200629.tar.xz
-/firefox-78.0.1.source.tar.xz
-/firefox-langpacks-78.0.1-20200701.tar.xz
-/firefox-78.0.2.source.tar.xz
-/firefox-langpacks-78.0.2-20200709.tar.xz
-/firefox-79.0.source.tar.xz
-/firefox-langpacks-79.0-20200727.tar.xz
-/firefox-80.0.source.tar.xz
-/firefox-langpacks-80.0-20200818.tar.xz
-/firefox-langpacks-80.0-20200820.tar.xz
-/firefox-80.0.1.source.tar.xz
-/firefox-langpacks-80.0.1-20200901.tar.xz
-/firefox-81.0.source.tar.xz
-/firefox-langpacks-81.0-20200915.tar.xz
-/firefox-langpacks-81.0-20200921.tar.xz
-/firefox-81.0.1.source.tar.xz
-/firefox-langpacks-81.0.1-20200930.tar.xz
-/firefox-81.0.2.source.tar.xz
-/firefox-langpacks-81.0.2-20201012.tar.xz
-/firefox-82.0.source.tar.xz
-/firefox-langpacks-82.0-20201015.tar.xz
-/firefox-82.0.1.source.tar.xz
-/firefox-langpacks-82.0.1-20201028.tar.xz
-/firefox-82.0.2.source.tar.xz
-/firefox-langpacks-82.0.2-20201029.tar.xz
-/firefox-82.0.3.source.tar.xz
-/firefox-langpacks-82.0.3-20201109.tar.xz
-/firefox-83.0.source.tar.xz
-/firefox-langpacks-83.0-20201112.tar.xz
-/firefox-langpacks-83.0-20201116.tar.xz
-/firefox-testing.tar.gz
-/site-packages.tar.gz
-/mochitest-python.tar.gz
-/firefox-84.0.source.tar.xz
-/firefox-langpacks-84.0-20201210.tar.xz
-/firefox-langpacks-84.0-20201214.tar.xz
-/firefox-84.0.1.source.tar.xz
-/firefox-langpacks-84.0.1-20201222.tar.xz
-/firefox-84.0.2.source.tar.xz
-/firefox-langpacks-84.0.2-20210106.tar.xz
-/firefox-85.0.source.tar.xz
-/firefox-langpacks-85.0-20210120.tar.xz
-/firefox-85.0.1.source.tar.xz
-/firefox-langpacks-85.0.1-20210208.tar.xz
-/firefox-86.0.source.tar.xz
-/firefox-langpacks-86.0-20210222.tar.xz
-/firefox-86.0.1.source.tar.xz
-/firefox-langpacks-86.0.1-20210312.tar.xz
-/firefox-87.0.source.tar.xz
-/firefox-langpacks-87.0-20210322.tar.xz
-/firefox-langpacks-88.0-20210419.tar.xz
-/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/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+++ b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
@ -0,0 +1,15 @@
+diff -up firefox-68.0/mfbt/LinuxSignal.h.1238661 firefox-68.0/mfbt/LinuxSignal.h
+--- firefox-68.0/mfbt/LinuxSignal.h.1238661	2019-07-08 22:27:29.620749569 +0200
+++ firefox-68.0/mfbt/LinuxSignal.h	2019-07-08 22:44:17.794112428 +0200
+@@ -22,7 +22,10 @@ __attribute__((naked)) void SignalTrampo
+                                              void* aContext) {
+   asm volatile("nop; nop; nop; nop" : : : "memory");
+ 
+-  asm volatile("b %0" : : "X"(H) : "memory");
+  // Because the assembler may generate additional insturctions below, we
+  // need to ensure NOPs are inserted first by separating them out above.
+
+  asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
+ }
+ 
+ #  define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
--- a/D53011-remote-content-disappear-fix.diff
+++ b/D53011-remote-content-disappear-fix.diff
@ -0,0 +1,98 @@
+diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
+--- a/widget/gtk/nsWindow.h
+++ b/widget/gtk/nsWindow.h
+@@ -401,6 +401,8 @@
+ #ifdef MOZ_WAYLAND
+   virtual nsresult GetScreenRect(LayoutDeviceIntRect* aRect) override;
+ #endif
+  bool IsRemoteContent() { return HasRemoteContent(); }
+  static void HideWaylandOpenedPopups();
+ 
+  protected:
+   virtual ~nsWindow();
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
+@@ -1165,6 +1165,14 @@
+   }
+ }
+ 
+void nsWindow::HideWaylandOpenedPopups() {
+  while (gVisibleWaylandPopupWindows) {
+    nsWindow* window =
+        static_cast<nsWindow*>(gVisibleWaylandPopupWindows->data);
+    window->HideWaylandWindow();
+  }
+}
+
+ // Hide popup nsWindows which are no longer in the nsXULPopupManager widget
+ // chain list.
+ void nsWindow::CleanupWaylandPopups() {
+@@ -1218,7 +1226,10 @@
+ // popup needs to have an unique parent.
+ GtkWidget* nsWindow::ConfigureWaylandPopupWindows() {
+   MOZ_ASSERT(this->mWindowType == eWindowType_popup);
+-  LOG(("nsWindow::ConfigureWaylandPopupWindows [%p]\n", (void*)this));
+  LOG(
+      ("nsWindow::ConfigureWaylandPopupWindows [%p], frame %p hasRemoteContent "
+       "%d\n",
+       (void*)this, this->GetFrame(), this->HasRemoteContent()));
+ #if DEBUG
+   if (this->GetFrame() && this->GetFrame()->GetContent()->GetID()) {
+     nsCString nodeId;
+@@ -1245,14 +1256,14 @@
+     // gVisibleWaylandPopupWindows which were not yet been hidden.
+     CleanupWaylandPopups();
+     // Since the popups are shown by unknown order it can happen that child
+-    // popup is shown before parent popup. The
+    // popup is shown before parent popup.
+     // We look for the current window parent in nsXULPopupManager since it
+     // always has correct popup hierarchy while gVisibleWaylandPopupWindows may
+     // not.
+     nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
+     AutoTArray<nsIWidget*, 5> widgetChain;
+     pm->GetSubmenuWidgetChain(&widgetChain);
+-    for (unsigned long i = 0; i < widgetChain.Length(); i++) {
+    for (unsigned long i = 0; i < widgetChain.Length() - 1; i++) {
+       unsigned long parentIndex = i + 1;
+       if (widgetChain.Length() > parentIndex && widgetChain[i] == this) {
+         nsWindow* parentWindow =
+@@ -1264,6 +1275,29 @@
+       }
+     }
+   } else {
+    // Panels usually ends there
+    if (gVisibleWaylandPopupWindows && HasRemoteContent()) {
+      // If the new panel is remote content, we need to close all other popups
+      // before to keep the correct hierarchy because the remote content popup
+      // can replace the overflow-widget panel.
+      HideWaylandOpenedPopups();
+    } else if (gVisibleWaylandPopupWindows) {
+      // If there is any remote content panel currently opened, close all
+      // opened popups to keep the correct hierarchy.
+      GList* popupList = gVisibleWaylandPopupWindows;
+      while (popupList) {
+        nsWindow* waylandWnd = static_cast<nsWindow*>(popupList->data);
+        LOG(("  Checking [%p] IsRemoteContent %d\n", popupList->data,
+             waylandWnd->IsRemoteContent()));
+        if (waylandWnd->IsRemoteContent()) {
+          // close all popups including remote content before showing our panel
+          // Most likely returning from addon panel to overflow-widget.
+          HideWaylandOpenedPopups();
+          break;
+        }
+        popupList = popupList->next;
+      }
+    }
+     // For popups in panels use the last opened popup window as parent,
+     // panels are not stored in nsXULPopupManager.
+     if (gVisibleWaylandPopupWindows) {
+@@ -4380,6 +4414,7 @@
+ void nsWindow::HideWaylandWindow() {
+ #ifdef MOZ_WAYLAND
+   if (mWindowType == eWindowType_popup) {
+    LOG(("nsWindow::HideWaylandWindow: popup [%p]\n", this));
+     GList* foundWindow = g_list_find(gVisibleWaylandPopupWindows, this);
+     if (foundWindow) {
+       gVisibleWaylandPopupWindows =
+
--- a/D53965-dropdown-missing-on-multimonitor.diff
+++ b/D53965-dropdown-missing-on-multimonitor.diff
@ -0,0 +1,97 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
+@@ -1295,13 +1295,12 @@
+     GdkWindow* window, const GdkRectangle* flipped_rect,
+     const GdkRectangle* final_rect, gboolean flipped_x, gboolean flipped_y,
+     void* aWindow) {
+-  LOG(("%s [%p] flipped_x %d flipped_y %d\n", __FUNCTION__, aWindow, flipped_x,
+-       flipped_y));
+-
+-  LOG(("%s [%p] flipped %d %d w:%d h:%d\n", __FUNCTION__, aWindow,
+-       flipped_rect->x, flipped_rect->y, flipped_rect->width,
+-       flipped_rect->height));
+-  LOG(("%s [%p] final %d %d w:%d h:%d\n", __FUNCTION__, aWindow, final_rect->x,
+  LOG(("NativeMoveResizeWaylandPopupCallback [%p] flipped_x %d flipped_y %d\n",
+       aWindow, flipped_x, flipped_y));
+
+  LOG(("  flipped_rect x: %d y: %d width: %d height: %d\n", flipped_rect->x,
+       flipped_rect->y, flipped_rect->width, flipped_rect->height));
+  LOG(("  final_rect x: %d y: %d width: %d height: %d\n", final_rect->x,
+        final_rect->y, final_rect->width, final_rect->height));
+ }
+ #endif
+@@ -1312,12 +1311,13 @@
+   static auto sGdkWindowMoveToRect = (void (*)(
+       GdkWindow*, const GdkRectangle*, GdkGravity, GdkGravity, GdkAnchorHints,
+       gint, gint))dlsym(RTLD_DEFAULT, "gdk_window_move_to_rect");
+  LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p]\n", (void*)this));
+ 
+   // Compositor may be confused by windows with width/height = 0
+   // and positioning such windows leads to Bug 1555866.
+   if (!AreBoundsSane()) {
+-    LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] Bounds are not sane\n",
+-         (void*)this));
+    LOG(("  Bounds are not sane (width: %d height: %d)\n", mBounds.width,
+         mBounds.height));
+     return;
+   }
+ 
+@@ -1331,15 +1331,14 @@
+   // - gdk_window_move_to_rect() is not available
+   // - the widget doesn't have a valid GdkWindow
+   if (!sGdkWindowMoveToRect || !gdkWindow) {
+-    LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] use gtk_window_move()\n",
+-         (void*)this));
+    LOG(("  use gtk_window_move(%d, %d)\n", aPosition->x, aPosition->y));
+     gtk_window_move(GTK_WINDOW(mShell), aPosition->x, aPosition->y);
+     return;
+   }
+ 
+   GtkWidget* parentWindow = ConfigureWaylandPopupWindows();
+-  LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] Set popup parent %p\n",
+-       (void*)this, parentWindow));
+  LOG(("nsWindow::NativeMoveResizeWaylandPopup: Set popup parent %p\n",
+       parentWindow));
+ 
+   int x_parent, y_parent;
+   gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(parentWindow)),
+@@ -1351,12 +1350,6 @@
+     rect.height = aSize->height;
+   }
+ 
+-  LOG(("%s [%p] request position %d,%d\n", __FUNCTION__, (void*)this,
+-       aPosition->x, aPosition->y));
+-  if (aSize) {
+-    LOG(("  request size %d,%d\n", aSize->width, aSize->height));
+-  }
+-  LOG(("  request result %d %d\n", rect.x, rect.y));
+ #ifdef DEBUG
+   if (!g_signal_handler_find(
+           gdkWindow, G_SIGNAL_MATCH_FUNC, 0, 0, nullptr,
+@@ -1389,10 +1382,8 @@
+     HideWaylandWindow();
+   }
+ 
+-  LOG(
+-      ("nsWindow::NativeMoveResizeWaylandPopup [%p]: requested rect: x%d y%d "
+-       "w%d h%d\n",
+-       this, rect.x, rect.y, rect.width, rect.height));
+  LOG(("  requested rect: x: %d y: %d width: %d height: %d\n", rect.x, rect.y,
+       rect.width, rect.height));
+   if (aSize) {
+     LOG(("  aSize: x%d y%d w%d h%d\n", aSize->x, aSize->y, aSize->width,
+          aSize->height));
+@@ -7348,8 +7339,9 @@
+   if (monitor) {
+     GdkRectangle workArea;
+     s_gdk_monitor_get_workarea(monitor, &workArea);
+-    aRect->x = workArea.x;
+-    aRect->y = workArea.y;
+    // The monitor offset won't help us in Wayland, because we can't get the
+    // absolute position of our window.
+    aRect->x = aRect->y = 0;
+     aRect->width = workArea.width;
+     aRect->height = workArea.height;
+     LOG(("  workarea for [%p], monitor %p: x%d y%d w%d h%d\n", this, monitor,
+
--- a/bug1375074-save-restore-x28.patch
+++ b/bug1375074-save-restore-x28.patch
@ -0,0 +1,74 @@
+# HG changeset patch
+# User Lars T Hansen <lhansen@mozilla.com>
+# Date 1519822672 -3600
+#      Wed Feb 28 13:57:52 2018 +0100
+# Node ID 672f0415217b202ae59a930769dffd9d6ba6b87c
+# Parent  825fd04dacc6297d3a980ec4184079405950b35d
+Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor.
+
+diff --git a/js/src/jit-test/tests/bug1375074.js b/js/src/jit-test/tests/bug1375074.js
+new file mode 100644
+--- /dev/null
+++ b/js/src/jit-test/tests/bug1375074.js
+@@ -0,0 +1,18 @@
+// This forces the VM to start creating unboxed objects and thus stresses a
+// particular path into generated code for a specialized unboxed object
+// constructor.
+
+var K = 2000;			// 2000 should be plenty
+var s = "[";
+var i;
+for ( i=0; i < K-1; i++ )
+    s = s + `{"i":${i}},`;
+s += `{"i":${i}}]`;
+var v = JSON.parse(s);
+
+assertEq(v.length == K, true);
+
+for ( i=0; i < K; i++) {
+    assertEq(v[i] instanceof Object, true);
+    assertEq(v[i].i, i);
+}
+diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
+--- a/js/src/vm/UnboxedObject.cpp
+++ b/js/src/vm/UnboxedObject.cpp
+@@ -95,7 +95,15 @@ UnboxedLayout::makeConstructorCode(JSCon
+ #endif
+ 
+ #ifdef JS_CODEGEN_ARM64
+-    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
+    // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
+    // addressing.  The register we use for PSP may however also be used by
+    // calling code, and it is nonvolatile, so save it.  Do this as a special
+    // case first because the generic save/restore code needs the PSP to be
+    // initialized already.
+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
+
+    // Initialize the PSP from the SP.
+     masm.initStackPtr();
+ #endif
+ 
+@@ -233,7 +241,22 @@ UnboxedLayout::makeConstructorCode(JSCon
+         masm.pop(ScratchDoubleReg);
+     masm.PopRegsInMask(savedNonVolatileRegisters);
+ 
+#ifdef JS_CODEGEN_ARM64
+    // Now restore the value that was in the PSP register on entry, and return.
+
+    // Obtain the correct SP from the PSP.
+    masm.Mov(sp, PseudoStackPointer64);
+
+    // Restore the saved value of the PSP register, this value is whatever the
+    // caller had saved in it, not any actual SP value, and it must not be
+    // overwritten subsequently.
+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
+
+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
+    masm.Ret(vixl::lr);
+#else
+     masm.abiret();
+#endif
+ 
+     masm.bind(&failureStoreOther);
+ 
--- a/build-aarch64-skia.patch
+++ b/build-aarch64-skia.patch
@ -1,33 +1,46 @@
-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-68.0/gfx/skia/skia/include/private/SkHalf.h.old firefox-68.0/gfx/skia/skia/include/private/SkHalf.h
+--- firefox-68.0/gfx/skia/skia/include/private/SkHalf.h.old	2019-07-11 12:33:40.471936951 +0200
+++ firefox-68.0/gfx/skia/skia/include/private/SkHalf.h	2019-07-11 12:33:50.527913736 +0200
+@@ -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) {
+ 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-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.old firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
+--- firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.old	2019-07-11 12:39:08.694166900 +0200
+++ firefox-68.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2019-07-11 12:39:21.572136328 +0200
+@@ -830,7 +830,7 @@ SI F from_half(U16 h) {
+ }
+ 
+ SI U16 to_half(F f) {
+-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+#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(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+diff -up firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.old firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
+--- firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.old	2019-07-11 12:38:45.285222428 +0200
+++ firefox-68.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h	2019-07-11 12:38:57.414193679 +0200
+@@ -163,7 +163,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)
+#if 0 // defined(USING_NEON_F16C)
     return (U16)vcvt_f16_f32(f);
- #elif defined(USING_AVX512F)
+ #elif defined(__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) {
- }
- 
- 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);
- 
- #elif defined(SKRP_CPU_SKX)
--- 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-65.0/toolkit/moz.configure.disable-elfhack firefox-65.0/toolkit/moz.configure
+--- firefox-65.0/toolkit/moz.configure.disable-elfhack	2019-01-28 14:16:48.530345132 +0100
+++ firefox-65.0/toolkit/moz.configure	2019-01-28 14:18:03.231029682 +0100
+@@ -1036,7 +1036,7 @@ with only_when('--enable-compile-environ
+                help='{Enable|Disable} elf hacks')
+ 
+         set_config('USE_ELF_HACK',
+-                   depends_if('--enable-elf-hack')(lambda _: True))
+                   depends_if('--enable-elf-hack')(lambda _: False))
+ 
+ 
+ @depends(check_build_environment)
--- a/build-disable-multijobs-rust.patch
+++ b/build-disable-multijobs-rust.patch
@ -0,0 +1,14 @@
+diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
+@@ -10,6 +10,10 @@
+ # commands can be executed directly by make, without doing a round-trip
+ # through a shell.
+ 
+MOZ_MAKE_FLAGS := $(filter-out -j%,$(MAKEFLAGS))
+MAKEFLAGS += -j1
+
+
+ cargo_host_flag := --target=$(RUST_HOST_TARGET)
+ cargo_target_flag := --target=$(RUST_TARGET)
+ 
--- a/build-icu-big-endian.patch
+++ b/build-icu-big-endian.patch
@ -0,0 +1,12 @@
+diff -up firefox-61.0/build/autoconf/icu.m4.icu firefox-61.0/build/autoconf/icu.m4
+--- firefox-61.0/build/autoconf/icu.m4.icu	2018-06-20 09:03:17.957565445 +0200
+++ firefox-61.0/build/autoconf/icu.m4	2018-06-20 09:08:28.159403451 +0200
+@@ -77,7 +77,7 @@ if test -n "$USE_ICU"; then
+     # TODO: the l is actually endian-dependent
+     # We could make this set as 'l' or 'b' for little or big, respectively,
+     # but we'd need to check in a big-endian version of the file.
+-    ICU_DATA_FILE="icudt${version}l.dat"
+    ICU_DATA_FILE="icudt${version}b.dat"
+ fi
+ 
+ AC_SUBST(MOZ_ICU_VERSION)
--- a/build-jit-atomic-always-lucky.patch
+++ b/build-jit-atomic-always-lucky.patch
@ -0,0 +1,12 @@
+diff -up firefox-60.5.0/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-60.5.0/js/src/jit/AtomicOperations.h
+--- firefox-60.5.0/js/src/jit/AtomicOperations.h.jit-atomic-lucky	2019-01-22 10:20:27.993697161 +0100
+++ firefox-60.5.0/js/src/jit/AtomicOperations.h	2019-01-22 10:23:15.337873762 +0100
+@@ -394,7 +394,7 @@ inline bool AtomicOperations::isLockfree
+ #elif defined(__s390__) || defined(__s390x__)
+ #include "jit/none/AtomicOperations-feeling-lucky.h"
+ #else
+-#error "No AtomicOperations support provided for this platform"
+#include "jit/none/AtomicOperations-feeling-lucky.h"
+ #endif
+ 
+ #endif  // jit_AtomicOperations_h
--- 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,36 +0,0 @@
-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) {
- 
- 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 = {
-    *                 downloaderr, verifyerr or previouserrorencountered
-    */
-   installAddon(gmpAddon) {
-+    if (gmpAddon.isOpenH264) {
-+      return Promise.reject({ type: "disabled" });
-+    }
-     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/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-gcc-build.patch
+++ b/firefox-gcc-build.patch
@ -1,38 +0,0 @@
--- firefox-80.0.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h	2020-08-31 10:04:19.000000000 -0400
-+++ firefox-80.0.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h	2020-09-12 07:24:35.298931628 -0400
-@@ -1962,7 +1962,7 @@ struct kernel_statfs {
-                            LSS_ENTRYPOINT                                     \
-                            "pop %%ebx"                                        \
-                            args                                               \
-                           : "esp", "memory");                                \
-+                           : "memory");                                       \
-       LSS_RETURN(type,__res)
-     #undef  _syscall0
-     #define _syscall0(type,name)                                              \
-@@ -2019,7 +2019,7 @@ struct kernel_statfs {
-                              : "i" (__NR_##name), "ri" ((long)(arg1)),        \
-                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
-                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
-                             : "esp", "memory");                              \
-+                             : "memory");                                     \
-         LSS_RETURN(type,__res);                                               \
-       }
-     #undef  _syscall6
-@@ -2041,7 +2041,7 @@ struct kernel_statfs {
-                              : "i" (__NR_##name),  "0" ((long)(&__s)),        \
-                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
-                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
-                             : "esp", "memory");                              \
-+                             : "memory");                                     \
-         LSS_RETURN(type,__res);                                               \
-       }
-     LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
-@@ -2127,7 +2127,7 @@ struct kernel_statfs {
-                            : "0"(-EINVAL), "i"(__NR_clone),
-                              "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
-                              "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
-                           : "esp", "memory", "ecx", "edx", "esi", "edi");
-+                           : "memory", "ecx", "edx", "esi", "edi");
-       LSS_RETURN(int, __res);
-     }
-
--- 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-locale-debug.patch
+++ b/firefox-locale-debug.patch
@ -0,0 +1,11 @@
+diff -up firefox-63.0.1/intl/locale/LocaleService.cpp.old firefox-63.0.1/intl/locale/LocaleService.cpp
+--- firefox-63.0.1/intl/locale/LocaleService.cpp.old	2018-11-14 13:34:16.338285161 +0100
+++ firefox-63.0.1/intl/locale/LocaleService.cpp	2018-11-14 13:34:21.438270308 +0100
+@@ -708,7 +708,6 @@ LocaleService::GetDefaultLocale(nsACStri
+     GetGREFileContents("update.locale", &locale);
+     locale.Trim(" \t\n\r");
+     // This should never be empty.
+-    MOZ_ASSERT(!locale.IsEmpty());
+     if (SanitizeForBCP47(locale, true)) {
+       mDefaultLocale.Assign(locale);
+     }
--- a/18
+++ b/18
@ -1,20 +1,26 @@
 . $topsrcdir/browser/config/mozconfig

+ac_add_options --prefix="$PREFIX"
+ac_add_options --libdir="$LIBDIR"
 ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
 ac_add_options --disable-strip
+#ac_add_options --enable-libnotify
 ac_add_options --enable-necko-wifi
+ac_add_options --enable-startup-notification
 ac_add_options --disable-updater
 ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-pulseaudio
-ac_add_options --enable-av1
 ac_add_options --without-system-icu
+ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
+ac_add_options --with-google-location-service-api-keyfile=../google-api-key
+ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
 ac_add_options --enable-release
 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
+ac_add_options --disable-system-sqlite
+# Workaround for mozbz#1341234
+ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
+ac_add_options --enable-av1

 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
--- a/firefox-nss-addon-hack.patch
+++ b/firefox-nss-addon-hack.patch
@ -1,19 +0,0 @@
-diff -up firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp.nss-hack firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp
--- firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp.nss-hack      2021-01-11 12:12:02.585514543 +0100
-+++ firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp       2021-01-11 12:47:50.345984582 +0100
-@@ -1619,6 +1619,15 @@ SECStatus InitializeNSS(const nsACString
-     return srv;
-   }
-
-+  /* Sets the NSS_USE_ALG_IN_ANY_SIGNATURE bit.
-+   * does not change NSS_USE_ALG_IN_CERT_SIGNATURE,
-+   * so policy will still disable use of sha1 in
-+   * certificate related signature processing. */
-+  srv = NSS_SetAlgorithmPolicy(SEC_OID_SHA1, NSS_USE_ALG_IN_ANY_SIGNATURE, 0);
-+  if (srv != SECSuccess) {
-+    NS_WARNING("Unable to use SHA1 for Add-ons, expect broken/disabled Add-ons. See https://bugzilla.redhat.com/show_bug.cgi?id=1908018 for details.");
-+  }
-+
-   if (nssDbConfig == NSSDBConfig::ReadWrite) {
-     UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
-     if (!slot) {
--- a/firefox-nss-version.patch
+++ b/firefox-nss-version.patch
@ -0,0 +1,12 @@
+diff -up firefox-71.0/old-configure.in.nss-version firefox-71.0/old-configure.in
+--- firefox-71.0/old-configure.in.nss-version	2019-11-25 15:15:15.767572575 +0100
+++ firefox-71.0/old-configure.in	2019-11-25 15:16:47.363498527 +0100
+@@ -1512,7 +1512,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
+     _USE_SYSTEM_NSS=1 )
+ 
+ if test -n "$_USE_SYSTEM_NSS"; then
+-    AM_PATH_NSS(3.47.1, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+    AM_PATH_NSS(3.47.0, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ fi
+ 
+ NSS_CFLAGS="$NSS_CFLAGS -I${DIST}/include/nss"
--- a/firefox-pipewire.patch
+++ b/firefox-pipewire.patch
@ -0,0 +1,63 @@
+diff -up firefox-68.0/config/system-headers.mozbuild.firefox-pipewire firefox-68.0/config/system-headers.mozbuild
+--- firefox-68.0/config/system-headers.mozbuild.firefox-pipewire	2019-07-01 22:30:26.000000000 +0200
+++ firefox-68.0/config/system-headers.mozbuild	2019-07-08 15:26:15.397161627 +0200
+@@ -314,6 +314,7 @@ system_headers = [
+     'Gestalt.h',
+     'getopt.h',
+     'gio/gio.h',
+    'gio/gunixfdlist.h',
+     'glibconfig.h',
+     'glib.h',
+     'glib-object.h',
+@@ -607,6 +608,7 @@ system_headers = [
+     'Pgenerr.h',
+     'PGenErr.h',
+     'Ph.h',
+    'pipewire/pipewire.h',
+     'pixman.h',
+     'pk11func.h',
+     'pk11pqg.h',
+diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
+--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire	2019-07-01 22:30:33.000000000 +0200
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build	2019-07-08 15:26:15.397161627 +0200
+@@ -194,6 +194,28 @@ if CONFIG["OS_TARGET"] == "Linux":
+         "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
+     ]
+ 
+# PipeWire specific files
+if CONFIG["OS_TARGET"] == "Linux":
+
+    DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
+
+    OS_LIBS += [
+        "rt",
+        "pipewire-0.2",
+        "glib-2.0",
+        "gio-2.0",
+        "gobject-2.0"
+    ]
+
+    CXXFLAGS += CONFIG['TK_CFLAGS']
+
+    UNIFIED_SOURCES += [
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
+    ]
+
+
+ if CONFIG["OS_TARGET"] == "NetBSD":
+ 
+     DEFINES["USE_X11"] = "1"
+diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
+--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire	2019-07-08 16:42:13.936254926 +0200
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h	2019-07-08 16:42:17.509264974 +0200
+@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
+   bool disable_effects_ = true;
+   bool detect_updated_region_ = false;
+ #if defined(WEBRTC_USE_PIPEWIRE)
+-  bool allow_pipewire_ = false;
+  bool allow_pipewire_ = true;
+ #endif
+ };
+ 
--- 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("media.gmp-gmpopenh264.enabled",false);
 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("widget.gnome-search-provider.enabled",true);
--- a/firefox-search-provider.ini
+++ b/firefox-search-provider.ini
@ -0,0 +1,5 @@
+[Shell Search Provider]
+DesktopId=org.mozilla.Firefox.desktop
+BusName=org.mozilla.Firefox.SearchProvider
+ObjectPath=/org/mozilla/Firefox/SearchProvider
+Version=2
--- a/firefox-symbolic.svg
+++ b/firefox-symbolic.svg
--- a/firefox-wayland-cache-missing.patch
+++ b/firefox-wayland-cache-missing.patch
@ -0,0 +1,21 @@
+diff -up firefox-69.0.1/widget/gtk/WindowSurfaceWayland.cpp.old firefox-69.0.1/widget/gtk/WindowSurfaceWayland.cpp
+--- firefox-69.0.1/widget/gtk/WindowSurfaceWayland.cpp.old	2019-09-19 15:05:13.586437024 +0200
+++ firefox-69.0.1/widget/gtk/WindowSurfaceWayland.cpp	2019-09-19 15:09:39.649079248 +0200
+@@ -836,8 +836,15 @@ already_AddRefed<gfx::DrawTarget> Window
+     mBufferScreenRect = lockedScreenRect;
+   }
+ 
+-  mDrawToWaylandBufferDirectly =
+-      (windowRedraw || mRenderingCacheMode != CACHE_ALL);
+  if (mRenderingCacheMode == CACHE_ALL) {
+    mDrawToWaylandBufferDirectly = windowRedraw;
+  } else if (mRenderingCacheMode == CACHE_MISSING) {
+    mDrawToWaylandBufferDirectly = windowRedraw ||
+      ((lockSize.width*3 > lockedScreenRect.width &&
+       lockSize.height*3 > lockedScreenRect.height));
+  } else {
+    mDrawToWaylandBufferDirectly = true;
+  }
+ 
+   if (mDrawToWaylandBufferDirectly) {
+     LOGWAYLAND(("   Direct drawing\n"));
--- a/firefox-wayland.desktop
+++ b/firefox-wayland.desktop
@ -11,7 +11,7 @@ MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xm
 StartupNotify=true
 Categories=Network;WebBrowser;
 Keywords=web;browser;internet;
-Actions=new-window;new-private-window;profile-manager-window;
+Actions=new-window;new-private-window;

 [Desktop Action new-window]
 Name=Open a New Window
@ -24,8 +24,8 @@ Name[ast]=Ventana nueva
 Name[az]=Yeni Pəncərə
 Name[be]=Новае акно
 Name[bg]=Нов прозорец
-Name[bn_BD]=নতুন উইন্ডো (N)
-Name[bn_IN]=নতুন উইন্ডো
+Name[bn-BD]=নতুন উইন্ডো (N)
+Name[bn-IN]=নতুন উইন্ডো
 Name[br]=Prenestr nevez
 Name[brx]=गोदान उइन्ड'(N)
 Name[bs]=Novi prozor
@ -37,37 +37,37 @@ 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[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[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[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[gu-IN]=નવી વિન્ડો
 Name[he]=חלון חדש
-Name[hi_IN]=नया विंडो
+Name[hi-IN]=नया विंडो
 Name[hr]=Novi prozor
 Name[hsb]=Nowe wokno
 Name[hu]=Új ablak
-Name[hy_AM]=Նոր Պատուհան
+Name[hy-AM]=Նոր Պատուհան
 Name[id]=Jendela Baru
 Name[is]=Nýr gluggi
 Name[it]=Nuova finestra
 Name[ja]=新しいウィンドウ
-Name[ja_JP-mac]=新規ウインドウ
+Name[ja-JP-mac]=新規ウインドウ
 Name[ka]=ახალი ფანჯარა
 Name[kk]=Жаңа терезе
 Name[km]=បង្អួចថ្មី
@ -86,15 +86,15 @@ Name[ml]=പുതിയ ജാലകം
 Name[mr]=नवीन पटल
 Name[ms]=Tetingkap Baru
 Name[my]=ဝင်းဒိုးအသစ်
-Name[nb_NO]=Nytt vindu
-Name[ne_NP]=नयाँ सञ्झ्याल
+Name[nb-NO]=Nytt vindu
+Name[ne-NP]=नयाँ सञ्झ्याल
 Name[nl]=Nieuw venster
-Name[nn_NO]=Nytt vindauge
+Name[nn-NO]=Nytt vindauge
 Name[or]=ନୂତନ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ
+Name[pa-IN]=ਨਵੀਂ ਵਿੰਡੋ
 Name[pl]=Nowe okno
-Name[pt_BR]=Nova janela
-Name[pt_PT]=Nova janela
+Name[pt-BR]=Nova janela
+Name[pt-PT]=Nova janela
 Name[rm]=Nova fanestra
 Name[ro]=Fereastră nouă
 Name[ru]=Новое окно
@ -105,7 +105,7 @@ Name[sl]=Novo okno
 Name[son]=Zanfun taaga
 Name[sq]=Dritare e Re
 Name[sr]=Нови прозор
-Name[sv_SE]=Nytt fönster
+Name[sv-SE]=Nytt fönster
 Name[ta]=புதிய சாளரம்
 Name[te]=కొత్త విండో
 Name[th]=หน้าต่างใหม่
@ -117,8 +117,8 @@ 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]=開新視窗
+Name[zh-CN]=新建窗口
+Name[zh-TW]=開新視窗
 Exec=firefox-wayland --name firefox-wayland --new-window %u

 [Desktop Action new-private-window]
@ -132,8 +132,8 @@ Name[ast]=Ventana privada nueva
 Name[az]=Yeni Məxfi Pəncərə
 Name[be]=Новае акно адасаблення
 Name[bg]=Нов прозорец за поверително сърфиране
-Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
-Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো
+Name[bn-BD]=নতুন ব্যক্তিগত উইন্ডো
+Name[bn-IN]=নতুন ব্যক্তিগত উইন্ডো
 Name[br]=Prenestr merdeiñ prevez nevez
 Name[brx]=गोदान प्राइभेट उइन्ड'
 Name[bs]=Novi privatni prozor
@ -145,37 +145,37 @@ 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[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[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[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[gu-IN]=નવી ખાનગી વિન્ડો
 Name[he]=חלון פרטי חדש
-Name[hi_IN]=नयी निजी विंडो
+Name[hi-IN]=नयी निजी विंडो
 Name[hr]=Novi privatni prozor
 Name[hsb]=Nowe priwatne wokno
 Name[hu]=Új privát ablak
-Name[hy_AM]=Սկսել Գաղտնի դիտարկում
+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[ja-JP-mac]=新規プライベートウインドウ
 Name[ka]=ახალი პირადი ფანჯარა
 Name[kk]=Жаңа жекелік терезе
 Name[km]=បង្អួចឯកជនថ្មី
@ -194,15 +194,15 @@ Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
 Name[mr]=नवीन वैयक्तिक पटल
 Name[ms]=Tetingkap Persendirian Baharu
 Name[my]=New Private Window
-Name[nb_NO]=Nytt privat vindu
-Name[ne_NP]=नयाँ निजी सञ्झ्याल
+Name[nb-NO]=Nytt privat vindu
+Name[ne-NP]=नयाँ निजी सञ्झ्याल
 Name[nl]=Nieuw privévenster
-Name[nn_NO]=Nytt privat vindauge
+Name[nn-NO]=Nytt privat vindauge
 Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
+Name[pa-IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
 Name[pl]=Nowe okno prywatne
-Name[pt_BR]=Nova janela privativa
-Name[pt_PT]=Nova janela privada
+Name[pt-BR]=Nova janela privativa
+Name[pt-PT]=Nova janela privada
 Name[rm]=Nova fanestra privata
 Name[ro]=Fereastră privată nouă
 Name[ru]=Новое приватное окно
@ -213,7 +213,7 @@ 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[sv-SE]=Nytt privat fönster
 Name[ta]=புதிய தனிப்பட்ட சாளரம்
 Name[te]=కొత్త ఆంతరంగిక విండో
 Name[th]=หน้าต่างส่วนตัวใหม่
@ -225,11 +225,7 @@ 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]=新增隱私視窗
+Name[zh-CN]=新建隐私浏览窗口
+Name[zh-TW]=新增隱私視窗
 Exec=firefox-wayland --private-window --name firefox-wayland %u

-[Desktop Action profile-manager-window]
-Name=Open the Profile Manager
-Name[cs]=Správa profilů
-Exec=firefox-wayland  --name firefox-wayland --ProfileManager
--- a/firefox-wayland.sh.in
+++ b/firefox-wayland.sh.in
@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
 #
 # Run Firefox under Wayland
 #
--- a/firefox-x11.desktop
+++ b/firefox-x11.desktop
@ -11,7 +11,7 @@ MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xm
 StartupNotify=true
 Categories=Network;WebBrowser;
 Keywords=web;browser;internet;
-Actions=new-window;new-private-window;profile-manager-window;
+Actions=new-window;new-private-window;

 [Desktop Action new-window]
 Name=Open a New Window
@ -24,8 +24,8 @@ Name[ast]=Ventana nueva
 Name[az]=Yeni Pəncərə
 Name[be]=Новае акно
 Name[bg]=Нов прозорец
-Name[bn_BD]=নতুন উইন্ডো (N)
-Name[bn_IN]=নতুন উইন্ডো
+Name[bn-BD]=নতুন উইন্ডো (N)
+Name[bn-IN]=নতুন উইন্ডো
 Name[br]=Prenestr nevez
 Name[brx]=गोदान उइन्ड'(N)
 Name[bs]=Novi prozor
@ -37,37 +37,37 @@ 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[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[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[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[gu-IN]=નવી વિન્ડો
 Name[he]=חלון חדש
-Name[hi_IN]=नया विंडो
+Name[hi-IN]=नया विंडो
 Name[hr]=Novi prozor
 Name[hsb]=Nowe wokno
 Name[hu]=Új ablak
-Name[hy_AM]=Նոր Պատուհան
+Name[hy-AM]=Նոր Պատուհան
 Name[id]=Jendela Baru
 Name[is]=Nýr gluggi
 Name[it]=Nuova finestra
 Name[ja]=新しいウィンドウ
-Name[ja_JP-mac]=新規ウインドウ
+Name[ja-JP-mac]=新規ウインドウ
 Name[ka]=ახალი ფანჯარა
 Name[kk]=Жаңа терезе
 Name[km]=បង្អួចថ្មី
@ -86,15 +86,15 @@ Name[ml]=പുതിയ ജാലകം
 Name[mr]=नवीन पटल
 Name[ms]=Tetingkap Baru
 Name[my]=ဝင်းဒိုးအသစ်
-Name[nb_NO]=Nytt vindu
-Name[ne_NP]=नयाँ सञ्झ्याल
+Name[nb-NO]=Nytt vindu
+Name[ne-NP]=नयाँ सञ्झ्याल
 Name[nl]=Nieuw venster
-Name[nn_NO]=Nytt vindauge
+Name[nn-NO]=Nytt vindauge
 Name[or]=ନୂତନ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ
+Name[pa-IN]=ਨਵੀਂ ਵਿੰਡੋ
 Name[pl]=Nowe okno
-Name[pt_BR]=Nova janela
-Name[pt_PT]=Nova janela
+Name[pt-BR]=Nova janela
+Name[pt-PT]=Nova janela
 Name[rm]=Nova fanestra
 Name[ro]=Fereastră nouă
 Name[ru]=Новое окно
@ -105,7 +105,7 @@ Name[sl]=Novo okno
 Name[son]=Zanfun taaga
 Name[sq]=Dritare e Re
 Name[sr]=Нови прозор
-Name[sv_SE]=Nytt fönster
+Name[sv-SE]=Nytt fönster
 Name[ta]=புதிய சாளரம்
 Name[te]=కొత్త విండో
 Name[th]=หน้าต่างใหม่
@ -117,8 +117,8 @@ 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]=開新視窗
+Name[zh-CN]=新建窗口
+Name[zh-TW]=開新視窗
 Exec=firefox-x11 --name firefox-x11 --new-window %u

 [Desktop Action new-private-window]
@ -132,8 +132,8 @@ Name[ast]=Ventana privada nueva
 Name[az]=Yeni Məxfi Pəncərə
 Name[be]=Новае акно адасаблення
 Name[bg]=Нов прозорец за поверително сърфиране
-Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
-Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো
+Name[bn-BD]=নতুন ব্যক্তিগত উইন্ডো
+Name[bn-IN]=নতুন ব্যক্তিগত উইন্ডো
 Name[br]=Prenestr merdeiñ prevez nevez
 Name[brx]=गोदान प्राइभेट उइन्ड'
 Name[bs]=Novi privatni prozor
@ -145,37 +145,37 @@ 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[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[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[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[gu-IN]=નવી ખાનગી વિન્ડો
 Name[he]=חלון פרטי חדש
-Name[hi_IN]=नयी निजी विंडो
+Name[hi-IN]=नयी निजी विंडो
 Name[hr]=Novi privatni prozor
 Name[hsb]=Nowe priwatne wokno
 Name[hu]=Új privát ablak
-Name[hy_AM]=Սկսել Գաղտնի դիտարկում
+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[ja-JP-mac]=新規プライベートウインドウ
 Name[ka]=ახალი პირადი ფანჯარა
 Name[kk]=Жаңа жекелік терезе
 Name[km]=បង្អួចឯកជនថ្មី
@ -194,15 +194,15 @@ Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
 Name[mr]=नवीन वैयक्तिक पटल
 Name[ms]=Tetingkap Persendirian Baharu
 Name[my]=New Private Window
-Name[nb_NO]=Nytt privat vindu
-Name[ne_NP]=नयाँ निजी सञ्झ्याल
+Name[nb-NO]=Nytt privat vindu
+Name[ne-NP]=नयाँ निजी सञ्झ्याल
 Name[nl]=Nieuw privévenster
-Name[nn_NO]=Nytt privat vindauge
+Name[nn-NO]=Nytt privat vindauge
 Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
+Name[pa-IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
 Name[pl]=Nowe okno prywatne
-Name[pt_BR]=Nova janela privativa
-Name[pt_PT]=Nova janela privada
+Name[pt-BR]=Nova janela privativa
+Name[pt-PT]=Nova janela privada
 Name[rm]=Nova fanestra privata
 Name[ro]=Fereastră privată nouă
 Name[ru]=Новое приватное окно
@ -213,7 +213,7 @@ 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[sv-SE]=Nytt privat fönster
 Name[ta]=புதிய தனிப்பட்ட சாளரம்
 Name[te]=కొత్త ఆంతరంగిక విండో
 Name[th]=หน้าต่างส่วนตัวใหม่
@ -225,11 +225,7 @@ 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]=新增隱私視窗
+Name[zh-CN]=新建隐私浏览窗口
+Name[zh-TW]=新增隱私視窗
 Exec=firefox-x11 --private-window --name firefox-x11 %u

-[Desktop Action profile-manager-window]
-Name=Open the Profile Manager
-Name[cs]=Správa profilů
-Exec=firefox-x11  --name firefox-x11 --ProfileManager
--- a/firefox-x11.sh.in
+++ b/firefox-x11.sh.in
@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
 #
 # Run Firefox on X11 backend
 #
--- 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.appdata.xml.in
+++ b/firefox.appdata.xml.in
@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2019 Firefox contributors -->
-<component type="desktop">
-  <id>firefox.desktop</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>
-  <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>
-  <releases>
-    <release version="__VERSION__" date="__DATE__"/>
-  </releases>
-</component>
--- a/firefox.desktop
+++ b/firefox.desktop
--- a/firefox.metainfo.appdata.xml
+++ b/firefox.metainfo.appdata.xml
@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019 Firefox contributors -->
+<component type="desktop">
+  <id>org.mozilla.Firefox.desktop</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>Browse the Web</p>
+    <p xml:lang="ca">Navegueu per el web</p>
+    <p xml:lang="cs">Prohlížení stránek World Wide Webu</p>
+    <p xml:lang="de">Im Internet surfen</p>
+    <p xml:lang="es">Navegue por la web</p>
+    <p xml:lang="fa">صفحات شبکه جهانی اینترنت را مرور نمایید</p>
+    <p xml:lang="fi">Selaa Internetin WWW-sivuja</p>
+    <p xml:lang="fr">Navigue sur Internet</p>
+    <p xml:lang="hu">A világháló böngészése</p>
+    <p xml:lang="it">Esplora il web</p>
+    <p xml:lang="ja">ウェブを閲覧します</p>
+    <p xml:lang="ko">웹을 돌아 다닙니다</p>
+    <p xml:lang="nb">Surf på nettet</p>
+    <p xml:lang="nl">Verken het internet</p>
+    <p xml:lang="nn">Surf på nettet</p>
+    <p xml:lang="no">Surf på nettet</p>
+    <p xml:lang="pl">Przeglądanie stron WWW</p>
+    <p xml:lang="pt">Navegue na Internet</p>
+    <p xml:lang="pt_BR">Navegue na Internet</p>
+    <p xml:lang="sk">Prehliadanie internetu</p>
+    <p xml:lang="sv">Surfa på webben</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=bu"help">https://support.mozilla.org/</url>
+  <translation type="gettext">firefox</translation>
+  <provides>
+    <id>firefox.desktop</id>
+  </provides>
+  <releases>
+    <release date="2019-11-13" version="3.34.0"/>
+  </releases>
+</component>
--- a/firefox.sh.in
+++ b/firefox.sh.in
@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@ -64,13 +64,15 @@ 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"
-GETENFORCE_FILE="/usr/sbin/getenforce"
+MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"

 ##
-## Use D-Bus remote exclusively when there's Wayland display.
+## Enable Wayland backend?
 ##
-if [ "$WAYLAND_DISPLAY" ]; then
-  export MOZ_DBUS_REMOTE=1
+if __DEFAULT_WAYLAND__ && ! [ $MOZ_DISABLE_WAYLAND ]; then
+  if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
+    export MOZ_ENABLE_WAYLAND=1
+  fi
 fi

 ##
@ -108,14 +110,10 @@ export MOZ_PLUGIN_PATH
 export MOZ_APP_LAUNCHER="/__PREFIX__/bin/firefox"

 ##
-## We want Firefox to use Openh264 provided by Fedora.
-##
-## 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.
-##
-## export MOZ_GMP_PATH=$MOZ_LIB_DIR/mozilla/plugins/gmp-gmpopenh264/system-installed
+## Set FONTCONFIG_PATH for Xft/fontconfig
 ##
+FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+export FONTCONFIG_PATH

 ##
 ## In order to better support certain scripts (such as Indic and some CJK
@ -130,10 +128,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

@ -158,19 +167,11 @@ MOZILLA_DOWN=0
 if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
    if [ -x $MOZ_DIST_BIN/$MOZ_FIREFOX_FILE ]; then
        # Is firefox running?
-        /__PREFIX__/bin/pidof $MOZ_PROGRAM > /dev/null 2>&1
+        /__PREFIX__/bin/pidof firefox > /dev/null 2>&1
        MOZILLA_DOWN=$?
    fi
 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/* &)
-  fi
-fi
-
 # Modify language pack configuration only when firefox is not running
 # and language packs are not disabled
 if [ $MOZILLA_DOWN -ne 0 ]; then
@ -203,17 +204,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 +219,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 +258,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.9.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/1
+++ b/1
@ -1 +0,0 @@
-AIzaSyB2h2OuRcUgy5N-5hsZqiPW6sH3n_rptiQ
--- a/mozilla-1170092.patch
+++ b/mozilla-1170092.patch
@ -0,0 +1,99 @@
+diff -up firefox-71.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-71.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
+--- firefox-71.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2019-11-26 01:02:21.000000000 +0100
+++ firefox-71.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2019-11-26 10:47:04.316154398 +0100
+@@ -246,8 +246,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(NS_LITERAL_CSTRING("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-71.0/modules/libpref/Preferences.cpp.1170092 firefox-71.0/modules/libpref/Preferences.cpp
+--- firefox-71.0/modules/libpref/Preferences.cpp.1170092	2019-11-26 01:02:25.000000000 +0100
+++ firefox-71.0/modules/libpref/Preferences.cpp	2019-11-26 10:47:04.316154398 +0100
+@@ -4472,6 +4472,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;
+   nsZipFind* findPtr;
+diff -up firefox-71.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-71.0/toolkit/xre/nsXREDirProvider.cpp
+--- firefox-71.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2019-11-26 01:02:29.000000000 +0100
+++ firefox-71.0/toolkit/xre/nsXREDirProvider.cpp	2019-11-26 10:49:40.076095714 +0100
+@@ -61,6 +61,7 @@
+ #endif
+ #ifdef XP_UNIX
+ #  include <ctype.h>
+#  include "nsIXULAppInfo.h"
+ #endif
+ #ifdef XP_IOS
+ #  include "UIKitDirProvider.h"
+@@ -526,6 +527,21 @@ nsXREDirProvider::GetFile(const char* aP
+       }
+     }
+   }
+
+#if defined(XP_UNIX)
+  if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
+    nsCString sysConfigDir = NS_LITERAL_CSTRING("/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) {
+@@ -842,6 +858,16 @@ nsresult nsXREDirProvider::GetFilesInter
+ 
+     LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
+ 
+    // 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(NS_LITERAL_CSTRING("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-71.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-71.0/xpcom/io/nsAppDirectoryServiceDefs.h
+--- firefox-71.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2019-11-26 01:02:30.000000000 +0100
+++ firefox-71.0/xpcom/io/nsAppDirectoryServiceDefs.h	2019-11-26 10:47:04.317154398 +0100
+@@ -60,6 +60,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-68.0/widget/gtk/nsWindow.cpp.1196777 firefox-68.0/widget/gtk/nsWindow.cpp
+--- firefox-68.0/widget/gtk/nsWindow.cpp.1196777	2019-07-02 11:47:06.864726826 +0200
+++ firefox-68.0/widget/gtk/nsWindow.cpp	2019-07-02 11:48:09.896544339 +0200
+@@ -156,7 +156,8 @@ const gint kEvents =
+ #if GTK_CHECK_VERSION(3, 4, 0)
+     GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK |
+ #endif
+-    GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
+    GDK_SCROLL_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-1337988.patch
+++ b/mozilla-1337988.patch
@ -0,0 +1,496 @@
+diff -up firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988 firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp
+--- firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp.1337988	2017-09-14 22:15:56.000000000 +0200
+++ firefox-56.0/dom/plugins/base/nsJSNPRuntime.cpp	2017-09-25 10:34:11.205611698 +0200
+@@ -1719,7 +1719,7 @@ NPObjWrapper_ObjectMoved(JSObject *obj,
+   auto entry =
+     static_cast<NPObjWrapperHashEntry*>(sNPObjWrappers->Search(npobj));
+   MOZ_ASSERT(entry && entry->mJSObj);
+-  MOZ_ASSERT(entry->mJSObj == old);
+  MOZ_ASSERT(entry->mJSObj.unbarrieredGetPtr() == old);
+   entry->mJSObj = obj;
+ }
+ 
+diff -up firefox-56.0/js/ipc/JavaScriptShared.cpp.1337988 firefox-56.0/js/ipc/JavaScriptShared.cpp
+--- firefox-56.0/js/ipc/JavaScriptShared.cpp.1337988	2017-07-31 18:20:47.000000000 +0200
+++ firefox-56.0/js/ipc/JavaScriptShared.cpp	2017-09-25 10:34:11.205611698 +0200
+@@ -101,7 +101,7 @@ IdToObjectMap::has(const ObjectId& id, c
+     auto p = table_.lookup(id);
+     if (!p)
+         return false;
+-    return p->value() == obj;
+    return p->value().unbarrieredGet() == obj;
+ }
+ #endif
+ 
+diff -up firefox-56.0/js/public/RootingAPI.h.1337988 firefox-56.0/js/public/RootingAPI.h
+--- firefox-56.0/js/public/RootingAPI.h.1337988	2017-07-31 18:20:47.000000000 +0200
+++ firefox-56.0/js/public/RootingAPI.h	2017-09-25 10:34:11.206611695 +0200
+@@ -148,6 +148,10 @@ template<typename T>
+ struct PersistentRootedMarker;
+ } /* namespace gc */
+ 
+#define DECLARE_POINTER_COMPARISON_OPS(T)                                                         \
+    bool operator==(const T& other) const { return get() == other; }                              \
+    bool operator!=(const T& other) const { return get() != other; }
+
+ // Important: Return a reference so passing a Rooted<T>, etc. to
+ // something that takes a |const T&| is not a GC hazard.
+ #define DECLARE_POINTER_CONSTREF_OPS(T)                                                           \
+@@ -237,8 +241,6 @@ class Heap : public js::HeapBase<T, Heap
+     static_assert(js::IsHeapConstructibleType<T>::value,
+                   "Type T must be a public GC pointer type");
+   public:
+-    using ElementType = T;
+-
+     Heap() {
+         static_assert(sizeof(T) == sizeof(Heap<T>),
+                       "Heap<T> must be binary compatible with T.");
+@@ -385,8 +387,6 @@ template <typename T>
+ class TenuredHeap : public js::HeapBase<T, TenuredHeap<T>>
+ {
+   public:
+-    using ElementType = T;
+-
+     TenuredHeap() : bits(0) {
+         static_assert(sizeof(T) == sizeof(TenuredHeap<T>),
+                       "TenuredHeap<T> must be binary compatible with T.");
+@@ -394,6 +394,9 @@ class TenuredHeap : public js::HeapBase<
+     explicit TenuredHeap(T p) : bits(0) { setPtr(p); }
+     explicit TenuredHeap(const TenuredHeap<T>& p) : bits(0) { setPtr(p.getPtr()); }
+ 
+    bool operator==(const TenuredHeap<T>& other) { return bits == other.bits; }
+    bool operator!=(const TenuredHeap<T>& other) { return bits != other.bits; }
+
+     void setPtr(T newPtr) {
+         MOZ_ASSERT((reinterpret_cast<uintptr_t>(newPtr) & flagsMask) == 0);
+         if (newPtr)
+@@ -470,8 +473,6 @@ class MOZ_NONHEAP_CLASS Handle : public
+     friend class JS::MutableHandle<T>;
+ 
+   public:
+-    using ElementType = T;
+-
+     /* Creates a handle from a handle of a type convertible to T. */
+     template <typename S>
+     MOZ_IMPLICIT Handle(Handle<S> handle,
+@@ -533,6 +534,7 @@ class MOZ_NONHEAP_CLASS Handle : public
+     MOZ_IMPLICIT Handle(MutableHandle<S>& root,
+                         typename mozilla::EnableIf<mozilla::IsConvertible<S, T>::value, int>::Type dummy = 0);
+ 
+    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(*ptr);
+ 
+@@ -559,8 +561,6 @@ template <typename T>
+ class MOZ_STACK_CLASS MutableHandle : public js::MutableHandleBase<T, MutableHandle<T>>
+ {
+   public:
+-    using ElementType = T;
+-
+     inline MOZ_IMPLICIT MutableHandle(Rooted<T>* root);
+     inline MOZ_IMPLICIT MutableHandle(PersistentRooted<T>* root);
+ 
+@@ -589,6 +589,7 @@ class MOZ_STACK_CLASS MutableHandle : pu
+         return h;
+     }
+ 
+    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(*ptr);
+     DECLARE_NONPOINTER_MUTABLE_ACCESSOR_METHODS(*ptr);
+@@ -805,8 +806,6 @@ class MOZ_RAII Rooted : public js::Roote
+     }
+ 
+   public:
+-    using ElementType = T;
+-
+     template <typename RootingContext>
+     explicit Rooted(const RootingContext& cx)
+       : ptr(GCPolicy<T>::initial())
+@@ -839,6 +838,7 @@ class MOZ_RAII Rooted : public js::Roote
+         ptr = mozilla::Move(value);
+     }
+ 
+    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_POINTER_ASSIGN_OPS(Rooted, T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(ptr);
+@@ -903,14 +903,13 @@ template <typename T>
+ class MOZ_RAII FakeRooted : public RootedBase<T, FakeRooted<T>>
+ {
+   public:
+-    using ElementType = T;
+-
+     template <typename CX>
+     explicit FakeRooted(CX* cx) : ptr(JS::GCPolicy<T>::initial()) {}
+ 
+     template <typename CX>
+     FakeRooted(CX* cx, T initial) : ptr(initial) {}
+ 
+    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_POINTER_ASSIGN_OPS(FakeRooted, T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(ptr);
+@@ -931,8 +930,6 @@ template <typename T>
+ class FakeMutableHandle : public js::MutableHandleBase<T, FakeMutableHandle<T>>
+ {
+   public:
+-    using ElementType = T;
+-
+     MOZ_IMPLICIT FakeMutableHandle(T* t) {
+         ptr = t;
+     }
+@@ -1124,8 +1121,6 @@ class PersistentRooted : public js::Root
+     }
+ 
+   public:
+-    using ElementType = T;
+-
+     PersistentRooted() : ptr(GCPolicy<T>::initial()) {}
+ 
+     explicit PersistentRooted(RootingContext* cx)
+@@ -1203,6 +1198,7 @@ class PersistentRooted : public js::Root
+         }
+     }
+ 
+    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+     DECLARE_POINTER_ASSIGN_OPS(PersistentRooted, T);
+     DECLARE_NONPOINTER_ACCESSOR_METHODS(ptr);
+@@ -1234,8 +1230,6 @@ class JS_PUBLIC_API(ObjectPtr)
+     Heap<JSObject*> value;
+ 
+   public:
+-    using ElementType = JSObject*;
+-
+     ObjectPtr() : value(nullptr) {}
+ 
+     explicit ObjectPtr(JSObject* obj) : value(obj) {}
+@@ -1342,177 +1336,6 @@ Swap(JS::TenuredHeap<T>& aX, JS::Tenured
+ 
+ } /* namespace mozilla */
+ 
+-namespace js {
+-namespace detail {
+-
+-// DefineComparisonOps is a trait which selects which wrapper classes to define
+-// operator== and operator!= for. It supplies a getter function to extract the
+-// value to compare. This is used to avoid triggering the automatic read
+-// barriers where appropriate.
+-//
+-// If DefineComparisonOps is not specialized for a particular wrapper you may
+-// get errors such as 'invalid operands to binary expression' or 'no match for
+-// operator==' when trying to compare against instances of the wrapper.
+-
+-template <typename T>
+-struct DefineComparisonOps : mozilla::FalseType {};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::Heap<T>> : mozilla::TrueType {
+-    static const T& get(const JS::Heap<T>& v) { return v.unbarrieredGet(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::TenuredHeap<T>> : mozilla::TrueType {
+-    static const T get(const JS::TenuredHeap<T>& v) { return v.unbarrieredGetPtr(); }
+-};
+-
+-template <>
+-struct DefineComparisonOps<JS::ObjectPtr> : mozilla::TrueType {
+-    static const JSObject* get(const JS::ObjectPtr& v) { return v.unbarrieredGet(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::Rooted<T>> : mozilla::TrueType {
+-    static const T& get(const JS::Rooted<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::Handle<T>> : mozilla::TrueType {
+-    static const T& get(const JS::Handle<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::MutableHandle<T>> : mozilla::TrueType {
+-    static const T& get(const JS::MutableHandle<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<JS::PersistentRooted<T>> : mozilla::TrueType {
+-    static const T& get(const JS::PersistentRooted<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<js::FakeRooted<T>> : mozilla::TrueType {
+-    static const T& get(const js::FakeRooted<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<js::FakeMutableHandle<T>> : mozilla::TrueType {
+-    static const T& get(const js::FakeMutableHandle<T>& v) { return v.get(); }
+-};
+-
+-} /* namespace detail */
+-} /* namespace js */
+-
+-// Overload operator== and operator!= for all types with the DefineComparisonOps
+-// trait using the supplied getter.
+-//
+-// There are four cases:
+-
+-// Case 1: comparison between two wrapper objects.
+-
+-template <typename T, typename U>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           js::detail::DefineComparisonOps<U>::value, bool>::Type
+-operator==(const T& a, const U& b) {
+-    return js::detail::DefineComparisonOps<T>::get(a) == js::detail::DefineComparisonOps<U>::get(b);
+-}
+-
+-template <typename T, typename U>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           js::detail::DefineComparisonOps<U>::value, bool>::Type
+-operator!=(const T& a, const U& b) {
+-    return !(a == b);
+-}
+-
+-// Case 2: comparison between a wrapper object and its unwrapped element type.
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
+-operator==(const T& a, const typename T::ElementType& b) {
+-    return js::detail::DefineComparisonOps<T>::get(a) == b;
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
+-operator!=(const T& a, const typename T::ElementType& b) {
+-    return !(a == b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
+-operator==(const typename T::ElementType& a, const T& b) {
+-    return a == js::detail::DefineComparisonOps<T>::get(b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value, bool>::Type
+-operator!=(const typename T::ElementType& a, const T& b) {
+-    return !(a == b);
+-}
+-
+-// Case 3: For pointer wrappers, comparison between the wrapper and a const
+-// element pointer.
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator==(const typename mozilla::RemovePointer<typename T::ElementType>::Type* a, const T& b) {
+-    return a == js::detail::DefineComparisonOps<T>::get(b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator!=(const typename mozilla::RemovePointer<typename T::ElementType>::Type* a, const T& b) {
+-    return !(a == b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator==(const T& a, const typename mozilla::RemovePointer<typename T::ElementType>::Type* b) {
+-    return js::detail::DefineComparisonOps<T>::get(a) == b;
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator!=(const T& a, const typename mozilla::RemovePointer<typename T::ElementType>::Type* b) {
+-    return !(a == b);
+-}
+-
+-// Case 4: For pointer wrappers, comparison between the wrapper and nullptr.
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator==(std::nullptr_t a, const T& b) {
+-    return a == js::detail::DefineComparisonOps<T>::get(b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator!=(std::nullptr_t a, const T& b) {
+-    return !(a == b);
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator==(const T& a, std::nullptr_t b) {
+-    return js::detail::DefineComparisonOps<T>::get(a) == b;
+-}
+-
+-template <typename T>
+-typename mozilla::EnableIf<js::detail::DefineComparisonOps<T>::value &&
+-                           mozilla::IsPointer<typename T::ElementType>::value, bool>::Type
+-operator!=(const T& a, std::nullptr_t b) {
+-    return !(a == b);
+-}
+-
+ #undef DELETE_ASSIGNMENT_OPS
+ 
+ #endif  /* js_RootingAPI_h */
+diff -up firefox-56.0/js/src/gc/Barrier.h.1337988 firefox-56.0/js/src/gc/Barrier.h
+--- firefox-56.0/js/src/gc/Barrier.h.1337988	2017-09-14 22:16:01.000000000 +0200
+++ firefox-56.0/js/src/gc/Barrier.h	2017-09-25 10:34:11.206611695 +0200
+@@ -353,8 +353,8 @@ class WriteBarrieredBase : public Barrie
+     explicit WriteBarrieredBase(const T& v) : BarrieredBase<T>(v) {}
+ 
+   public:
+-    using ElementType = T;
+ 
+    DECLARE_POINTER_COMPARISON_OPS(T);
+     DECLARE_POINTER_CONSTREF_OPS(T);
+ 
+     // Use this if the automatic coercion to T isn't working.
+@@ -612,13 +612,14 @@ class ReadBarriered : public ReadBarrier
+         return *this;
+     }
+ 
+-    const T& get() const {
+-        if (InternalBarrierMethods<T>::isMarkable(this->value))
+-            this->read();
+    const T get() const {
+        if (!InternalBarrierMethods<T>::isMarkable(this->value))
+            return JS::GCPolicy<T>::initial();
+        this->read();
+         return this->value;
+     }
+ 
+-    const T& unbarrieredGet() const {
+    const T unbarrieredGet() const {
+         return this->value;
+     }
+ 
+@@ -626,9 +627,9 @@ class ReadBarriered : public ReadBarrier
+         return bool(this->value);
+     }
+ 
+-    operator const T&() const { return get(); }
+    operator const T() const { return get(); }
+ 
+-    const T& operator->() const { return get(); }
+    const T operator->() const { return get(); }
+ 
+     T* unsafeGet() { return &this->value; }
+     T const* unsafeGet() const { return &this->value; }
+@@ -955,35 +956,6 @@ typedef ReadBarriered<WasmTableObject*>
+ 
+ typedef ReadBarriered<Value> ReadBarrieredValue;
+ 
+-namespace detail {
+-
+-template <typename T>
+-struct DefineComparisonOps<PreBarriered<T>> : mozilla::TrueType {
+-    static const T& get(const PreBarriered<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<GCPtr<T>> : mozilla::TrueType {
+-    static const T& get(const GCPtr<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<HeapPtr<T>> : mozilla::TrueType {
+-    static const T& get(const HeapPtr<T>& v) { return v.get(); }
+-};
+-
+-template <typename T>
+-struct DefineComparisonOps<ReadBarriered<T>> : mozilla::TrueType {
+-    static const T& get(const ReadBarriered<T>& v) { return v.unbarrieredGet(); }
+-};
+-
+-template <>
+-struct DefineComparisonOps<HeapSlot> : mozilla::TrueType {
+-    static const Value& get(const HeapSlot& v) { return v.get(); }
+-};
+-
+-} /* namespace detail */
+-
+ } /* namespace js */
+ 
+ #endif /* gc_Barrier_h */
+diff -up firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988 firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp
+--- firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp.1337988	2017-09-14 22:16:02.000000000 +0200
+++ firefox-56.0/js/src/jsapi-tests/testGCHeapPostBarriers.cpp	2017-09-25 10:34:11.206611695 +0200
+@@ -5,7 +5,6 @@
+  * 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/TypeTraits.h"
+ #include "mozilla/UniquePtr.h"
+ 
+ #include "js/RootingAPI.h"
+diff -up firefox-56.0/js/src/vm/SharedMem.h.1337988 firefox-56.0/js/src/vm/SharedMem.h
+--- firefox-56.0/js/src/vm/SharedMem.h.1337988	2017-06-15 22:52:29.000000000 +0200
+++ firefox-56.0/js/src/vm/SharedMem.h	2017-09-25 10:34:11.206611695 +0200
+@@ -12,8 +12,8 @@
+ template<typename T>
+ class SharedMem
+ {
+-    // static_assert(mozilla::IsPointer<T>::value,
+-    //               "SharedMem encapsulates pointer types");
+    static_assert(mozilla::IsPointer<T>::value,
+                  "SharedMem encapsulates pointer types");
+ 
+     enum Sharedness {
+         IsUnshared,
+diff -up firefox-56.0/js/xpconnect/src/XPCInlines.h.1337988 firefox-56.0/js/xpconnect/src/XPCInlines.h
+--- firefox-56.0/js/xpconnect/src/XPCInlines.h.1337988	2017-09-14 22:16:03.000000000 +0200
+++ firefox-56.0/js/xpconnect/src/XPCInlines.h	2017-09-25 10:34:11.206611695 +0200
+@@ -465,7 +465,7 @@ inline
+ void XPCWrappedNativeTearOff::JSObjectMoved(JSObject* obj, const JSObject* old)
+ {
+     MOZ_ASSERT(!IsMarked());
+-    MOZ_ASSERT(mJSObject == old);
+    MOZ_ASSERT(mJSObject.unbarrieredGetPtr() == old);
+     mJSObject = obj;
+ }
+ 
+diff -up firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988 firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp
+--- firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp.1337988	2017-09-14 22:16:03.000000000 +0200
+++ firefox-56.0/js/xpconnect/src/XPCWrappedNative.cpp	2017-09-25 10:34:11.207611692 +0200
+@@ -874,7 +874,7 @@ void
+ XPCWrappedNative::FlatJSObjectMoved(JSObject* obj, const JSObject* old)
+ {
+     JS::AutoAssertGCCallback inCallback;
+-    MOZ_ASSERT(mFlatJSObject == old);
+    MOZ_ASSERT(mFlatJSObject.unbarrieredGetPtr() == old);
+ 
+     nsWrapperCache* cache = nullptr;
+     CallQueryInterface(mIdentity, &cache);
+diff -up firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988 firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp
+--- firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp.1337988	2017-07-31 18:20:47.000000000 +0200
+++ firefox-56.0/js/xpconnect/src/XPCWrappedNativeProto.cpp	2017-09-25 10:34:11.207611692 +0200
+@@ -101,7 +101,7 @@ XPCWrappedNativeProto::CallPostCreatePro
+ void
+ XPCWrappedNativeProto::JSProtoObjectFinalized(js::FreeOp* fop, JSObject* obj)
+ {
+-    MOZ_ASSERT(obj == mJSProtoObject, "huh?");
+    MOZ_ASSERT(obj == mJSProtoObject.unbarrieredGet(), "huh?");
+ 
+ #ifdef DEBUG
+     // Check that this object has already been swept from the map.
+@@ -117,7 +117,7 @@ XPCWrappedNativeProto::JSProtoObjectFina
+ void
+ XPCWrappedNativeProto::JSProtoObjectMoved(JSObject* obj, const JSObject* old)
+ {
+-    MOZ_ASSERT(mJSProtoObject == old);
+    MOZ_ASSERT(mJSProtoObject.unbarrieredGet() == old);
+     mJSProtoObject.init(obj); // Update without triggering barriers.
+ }
+ 
--- a/mozilla-1516081.patch
+++ b/mozilla-1516081.patch
@ -0,0 +1,21 @@
+diff -up firefox-71.0/build/moz.configure/lto-pgo.configure.1516081 firefox-71.0/build/moz.configure/lto-pgo.configure
+--- firefox-71.0/build/moz.configure/lto-pgo.configure.1516081	2019-11-26 01:02:19.000000000 +0100
+++ firefox-71.0/build/moz.configure/lto-pgo.configure	2019-11-26 11:04:10.993077232 +0100
+@@ -71,7 +71,7 @@ set_config('PGO_PROFILE_PATH', pgo_profi
+ def pgo_flags(compiler, target, profdata):
+     if compiler.type == 'gcc':
+         return namespace(
+-            gen_cflags=['-fprofile-generate'],
+            gen_cflags=['-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'],
+             gen_ldflags=['-fprofile-generate'],
+             use_cflags=['-fprofile-use', '-fprofile-correction',
+                         '-Wcoverage-mismatch'],
+@@ -92,7 +92,7 @@ def pgo_flags(compiler, target, profdata
+             gen_ldflags = ['-fprofile-generate']
+ 
+         return namespace(
+-            gen_cflags=[prefix + '-fprofile-generate'],
+            gen_cflags=[prefix + '-fprofile-generate', '-DMOZ_PROFILE_INSTRUMENTATION'],
+             gen_ldflags=gen_ldflags,
+             use_cflags=[prefix + '-fprofile-use=%s' % profdata,
+                         # Some error messages about mismatched profile data
--- a/mozilla-1516803.patch
+++ b/mozilla-1516803.patch
@ -1,15 +1,16 @@
-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
-@@ -114,9 +114,8 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc")
+diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
+--- a/security/sandbox/linux/moz.build
+++ b/security/sandbox/linux/moz.build
+@@ -99,9 +99,8 @@
 # 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
 # forcing there to be only one partition.
-for f in CONFIG["OS_CXXFLAGS"]:
-    if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang":
-        LDFLAGS += ["--param lto-partitions=1"]
+-for f in CONFIG['OS_CXXFLAGS']:
+-    if f.startswith('-flto') and CONFIG['CC_TYPE'] != 'clang':
+-        LDFLAGS += ['--param lto-partitions=1']
 +if CONFIG['CC_TYPE'] != 'clang':
 +    LDFLAGS += ['--param', 'lto-partitions=1']
 
- DEFINES["NS_NO_XPCOM"] = True
+ DEFINES['NS_NO_XPCOM'] = True
 DisableStlWrapping()
+
--- a/mozilla-1568569.patch
+++ b/mozilla-1568569.patch
@ -0,0 +1,43 @@
+diff -up firefox-71.0/widget/gtk/nsWindow.cpp.1568569 firefox-71.0/widget/gtk/nsWindow.cpp
+--- firefox-71.0/widget/gtk/nsWindow.cpp.1568569	2019-11-26 10:51:08.303063138 +0100
+++ firefox-71.0/widget/gtk/nsWindow.cpp	2019-11-26 10:54:28.428994823 +0100
+@@ -3348,6 +3348,8 @@ void nsWindow::OnWindowStateEvent(GtkWid
+     return;
+   }
+ 
+  nsSizeMode lastSizeState = mSizeState;
+
+   if (aEvent->new_window_state & GDK_WINDOW_STATE_ICONIFIED) {
+     LOG(("\tIconified\n"));
+     mSizeState = nsSizeMode_Minimized;
+@@ -3379,6 +3381,18 @@ void nsWindow::OnWindowStateEvent(GtkWid
+     mIsTiled = false;
+   }
+ 
+  // Fullscreen video playback may generate bogus alpha values which blends
+  // with desktop background in fullscreen video playback (Bug 1568569).
+  // As a workaround enable to draw mShell background in fullscreen mode
+  // if we draw to mContainer.
+  if (gtk_widget_get_has_window(GTK_WIDGET(mContainer))) {
+    if (mSizeState == nsSizeMode_Fullscreen) {
+      gtk_widget_set_app_paintable(mShell, FALSE);
+    } else if (lastSizeState == nsSizeMode_Fullscreen) {
+      gtk_widget_set_app_paintable(mShell, TRUE);
+    }
+  }
+
+   if (mWidgetListener) {
+     mWidgetListener->SizeModeChanged(mSizeState);
+     if (aEvent->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
+@@ -3930,6 +3944,11 @@ nsresult nsWindow::Create(nsIWidget* aPa
+       gtk_widget_add_events(eventWidget, kEvents);
+       if (drawToContainer) {
+         gtk_widget_add_events(mShell, GDK_PROPERTY_CHANGE_MASK);
+        // Don't paint mShell background when we draw to mContainer.
+        // Otherwise we see mShell backround to shine through
+        // mContainer (Bug 1507608).
+        // But it may also lead to various bugs where mContainer has unintended
+        // transparent parts which blend with underlying desktop (Bug 1516224).
+         gtk_widget_set_app_paintable(mShell, TRUE);
+       }
+       if (mTransparencyBitmapForTitlebar) {
--- a/mozilla-1580174-webrtc-popup.patch
+++ b/mozilla-1580174-webrtc-popup.patch
@ -0,0 +1,51 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
+@@ -1155,6 +1155,28 @@
+   }
+ }
+ 
+bool IsPopupWithoutToplevelParent(nsMenuPopupFrame* aMenuPopupFrame) {
+  // Check if the popup is autocomplete (like tags autocomplete
+  // in the bookmark edit popup).
+  nsAtom* popupId = aMenuPopupFrame->GetContent()->GetID();
+  if (popupId && popupId->Equals(NS_LITERAL_STRING("PopupAutoComplete"))) {
+    return true;
+  }
+
+  // Check if the popup is in popupnotificationcontent (like choosing capture
+  // device when starting webrtc session).
+  nsIFrame* parentFrame = aMenuPopupFrame->GetParent();
+  if (!parentFrame) {
+    return false;
+  }
+  parentFrame = parentFrame->GetParent();
+  if (parentFrame && parentFrame->GetContent()->NodeName().EqualsLiteral(
+                         "popupnotificationcontent")) {
+    return true;
+  }
+  return false;
+}
+
+ // Wayland keeps strong popup window hierarchy. We need to track active
+ // (visible) popup windows and make sure we hide popup on the same level
+ // before we open another one on that level. It means that every open
+@@ -1211,10 +1233,14 @@
+       LOG(("...[%p] GetParentMenuWidget() = %p\n", (void*)this, parentWindow));
+ 
+       // If the popup is a regular menu but GetParentMenuWidget() returns
+-      // nullptr which means it's connected non-menu parent
+-      // (bookmark toolbar for instance).
+      // nullptr which means is not a submenu of any other menu.
+       // In this case use a parent given at nsWindow::Create().
+-      if (!parentWindow && !menuPopupFrame->IsContextMenu()) {
+      // But we have to avoid using mToplevelParentWindow in case the popup
+      // is in 'popupnotificationcontent' element or autocomplete popup,
+      //  otherwise the popupnotification would disappear when for
+      // example opening a popup with microphone selection.
+      if (!parentWindow && !menuPopupFrame->IsContextMenu() &&
+          !IsPopupWithoutToplevelParent(menuPopupFrame)) {
+         parentWindow =
+             get_window_for_gtk_widget(GTK_WIDGET(mToplevelParentWindow));
+       }
+
--- a/mozilla-1583466.patch
+++ b/mozilla-1583466.patch
@ -0,0 +1,156 @@
+changeset:   496943:24592798daf4
+tag:         tip
+parent:      496931:ca257801d86f
+user:        Martin Stransky <stransky@redhat.com>
+date:        Tue Sep 24 12:54:11 2019 +0200
+files:       toolkit/components/enterprisepolicies/EnterprisePolicies.js toolkit/xre/nsXREDirProvider.cpp xpcom/build/nsXULAppAPI.h
+description:
+Bug 1583466 - [Linux] Allow to Load policies per user from system on Linux/Gtk, r=mkaply
+
+When browser.policies.perUserPath is set, load browser policy per user
+from /run/user/$UID/appname/ directory instead of the default firefox/distribution
+dir.
+
+Differential Revision: https://phabricator.services.mozilla.com/D46921
+
+
+diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js
+--- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js
+++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js
+@@ -18,16 +18,19 @@ XPCOMUtils.defineLazyModuleGetters(this,
+   JsonSchemaValidator:
+     "resource://gre/modules/components-utils/JsonSchemaValidator.jsm",
+ });
+ 
+ // This is the file that will be searched for in the
+ // ${InstallDir}/distribution folder.
+ const POLICIES_FILENAME = "policies.json";
+ 
+// When true browser policy is loaded per-user from
+// /run/usr/$UID/appname
+const PREF_PER_USER_DIR = "browser.policies.perUserDir";
+ // For easy testing, modify the helpers/sample.json file,
+ // and set PREF_ALTERNATE_PATH in firefox.js as:
+ // /your/repo/browser/components/enterprisepolicies/helpers/sample.json
+ const PREF_ALTERNATE_PATH = "browser.policies.alternatePath";
+ // For testing, we may want to set PREF_ALTERNATE_PATH to point to a file
+ // relative to the test root directory. In order to enable this, the string
+ // below may be placed at the beginning of that preference value and it will
+ // be replaced with the path to the test root directory.
+@@ -450,17 +453,22 @@ class JSONPoliciesProvider {
+ 
+   get failed() {
+     return this._failed;
+   }
+ 
+   _getConfigurationFile() {
+     let configFile = null;
+     try {
+-      configFile = Services.dirsvc.get("XREAppDist", Ci.nsIFile);
+      let perUserPath = Services.prefs.getBoolPref(PREF_PER_USER_DIR, false);
+      if (perUserPath) {
+        configFile = Services.dirsvc.get("XREAppDistUser", Ci.nsIFile);
+      } else {
+        configFile = Services.dirsvc.get("XREAppDist", Ci.nsIFile);
+      }
+       configFile.append(POLICIES_FILENAME);
+     } catch (ex) {
+       // Getting the correct directory will fail in xpcshell tests. This should
+       // be handled the same way as if the configFile simply does not exist.
+     }
+ 
+     let alternatePath = Services.prefs.getStringPref(PREF_ALTERNATE_PATH, "");
+ 
+diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
+--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -40,16 +40,17 @@
+ #include "mozilla/dom/ScriptSettings.h"
+ 
+ #include "mozilla/AutoRestore.h"
+ #include "mozilla/Components.h"
+ #include "mozilla/Services.h"
+ #include "mozilla/Omnijar.h"
+ #include "mozilla/Preferences.h"
+ #include "mozilla/Telemetry.h"
+#include "nsPrintfCString.h"
+ 
+ #include <stdlib.h>
+ 
+ #ifdef XP_WIN
+ #  include <windows.h>
+ #  include <shlobj.h>
+ #  include "WinUtils.h"
+ #endif
+@@ -98,17 +99,17 @@ static already_AddRefed<nsIFile> CreateP
+ nsXREDirProvider* gDirServiceProvider = nullptr;
+ nsIFile* gDataDirHomeLocal = nullptr;
+ nsIFile* gDataDirHome = nullptr;
+ nsCOMPtr<nsIFile> gDataDirProfileLocal = nullptr;
+ nsCOMPtr<nsIFile> gDataDirProfile = nullptr;
+ 
+ // These are required to allow nsXREDirProvider to be usable in xpcshell tests.
+ // where gAppData is null.
+-#if defined(XP_MACOSX) || defined(XP_WIN)
+#if defined(XP_MACOSX) || defined(XP_WIN) || defined(XP_UNIX)
+ static const char* GetAppName() {
+   if (gAppData) {
+     return gAppData->name;
+   }
+   return nullptr;
+ }
+ #endif
+ 
+@@ -456,16 +457,24 @@ nsXREDirProvider::GetFile(const char* aP
+   else if (!strcmp(aProperty, XRE_USER_SYS_EXTENSION_DIR)) {
+ #ifdef ENABLE_SYSTEM_EXTENSION_DIRS
+     return GetSysUserExtensionsDirectory(aFile);
+ #else
+     return NS_ERROR_FAILURE;
+ #endif
+   } else if (!strcmp(aProperty, XRE_USER_SYS_EXTENSION_DEV_DIR)) {
+     return GetSysUserExtensionsDevDirectory(aFile);
+  } else if (!strcmp(aProperty, XRE_APP_DISTRIBUTION_USER_DIR)) {
+#ifdef MOZ_WIDGET_GTK
+    nsPrintfCString path("/run/user/%d/%s/", getuid(), GetAppName());
+    ToLowerCase(path);
+    return NS_NewNativeLocalFile(path, false, aFile);
+#else
+    return NS_ERROR_FAILURE;
+#endif
+   } else if (!strcmp(aProperty, XRE_APP_DISTRIBUTION_DIR)) {
+     bool persistent = false;
+     rv = GetFile(NS_GRE_DIR, &persistent, getter_AddRefs(file));
+     if (NS_SUCCEEDED(rv))
+       rv = file->AppendNative(NS_LITERAL_CSTRING("distribution"));
+   } else if (!strcmp(aProperty, XRE_APP_FEATURES_DIR)) {
+     rv = GetAppDir()->Clone(getter_AddRefs(file));
+     if (NS_SUCCEEDED(rv))
+diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h
+--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
+@@ -137,16 +137,23 @@
+ 
+ /**
+  * A directory service key which specifies the location for app dir add-ons.
+  * Should be a synonym for XCurProcD everywhere except in tests.
+  */
+ #define XRE_ADDON_APP_DIR "XREAddonAppDir"
+ 
+ /**
+ * A directory service key which specifies the distribution specific files for
+ * the application unique for each user.
+ * It's located at /run/user/$PID/<product name>/
+ */
+#define XRE_APP_DISTRIBUTION_USER_DIR "XREAppDistUser"
+
+/**
+  * A directory service key which provides the update directory. Callers should
+  * fall back to appDir.
+  * Windows:    If vendor name exists:
+  *             ProgramData\<vendor name>\updates\
+  *             <hash of the path to XRE_EXECUTABLE_FILE's parent directory>
+  *
+  *             If vendor name doesn't exist, but product name exists:
+  *             ProgramData\<product name>\updates\
+
--- a/mozilla-1593408.patch
+++ b/mozilla-1593408.patch
@ -0,0 +1,76 @@
+diff -up firefox-71.0/widget/gtk/mozcontainer.cpp.mozilla-1593408 firefox-71.0/widget/gtk/mozcontainer.cpp
+--- firefox-71.0/widget/gtk/mozcontainer.cpp.mozilla-1593408	2019-11-26 01:02:30.000000000 +0100
+++ firefox-71.0/widget/gtk/mozcontainer.cpp	2019-11-27 11:41:20.539447954 +0100
+@@ -76,6 +76,10 @@ static void moz_container_allocate_child
+                                          MozContainerChild* child);
+ static MozContainerChild* moz_container_get_child(MozContainer* container,
+                                                   GtkWidget* child);
+#ifdef MOZ_WAYLAND
+static wl_surface* moz_container_get_gtk_container_surface(
+    MozContainer* container);
+#endif
+ 
+ /* public methods */
+ 
+@@ -158,6 +162,22 @@ void moz_container_move(MozContainer* co
+   container->subsurface_dx = dx;
+   container->subsurface_dy = dy;
+   container->surface_position_update = true;
+
+  // Wayland subsurface is not created yet.
+  if (!container->subsurface) {
+    return;
+  }
+
+  // wl_subsurface_set_position is actually property of parent surface
+  // which is effective when parent surface is commited.
+  wl_surface* parent_surface =
+      moz_container_get_gtk_container_surface(container);
+  if (parent_surface) {
+    wl_subsurface_set_position(container->subsurface, container->subsurface_dx,
+                               container->subsurface_dy);
+    wl_surface_commit(parent_surface);
+    container->surface_position_needs_update = false;
+  }
+ }
+ 
+ void moz_container_scale_update(MozContainer* container) {
+@@ -620,18 +640,9 @@ struct wl_surface* moz_container_get_wl_
+                 (void*)container->surface));
+   }
+ 
+-  // wl_subsurface_set_position is actually property of parent surface
+-  // which is effective when parent surface is commited.
+   if (container->surface_position_update) {
+-    wl_surface* parent_surface =
+-        moz_container_get_gtk_container_surface(container);
+-    if (parent_surface) {
+-      wl_subsurface_set_position(container->subsurface,
+-                                 container->subsurface_dx,
+-                                 container->subsurface_dy);
+-      wl_surface_commit(parent_surface);
+-      container->surface_position_update = true;
+-    }
+    moz_container_move(container, container->subsurface_dx,
+                       container->subsurface_dy);
+   }
+ 
+   return container->surface;
+@@ -641,12 +652,12 @@ struct wl_egl_window* moz_container_get_
+   LOGWAYLAND(("%s [%p] eglwindow %p\n", __FUNCTION__, (void*)container,
+               (void*)container->eglwindow));
+ 
+-  if (!container->eglwindow) {
+-    wl_surface* surface = moz_container_get_wl_surface(container);
+-    if (!surface) {
+-      return nullptr;
+-    }
+  wl_surface* surface = moz_container_get_wl_surface(container);
+  if (!surface) {
+    return nullptr;
+  }
+ 
+  if (!container->eglwindow) {
+     GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(container));
+     gint scale = moz_container_get_scale(container);
+     container->eglwindow =
--- a/mozilla-1667096.patch
+++ b/mozilla-1667096.patch
@ -1,550 +0,0 @@
-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[
- #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 @@
-+/*
-+ * AAC decoder wrapper
-+ * Copyright (c) 2012 Martin Storsjo
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <fdk-aac/aacdecoder_lib.h>
-+
-+#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"
-+
-+#ifdef AACDECODER_LIB_VL0
-+#define FDKDEC_VER_AT_LEAST(vl0, vl1) \
-+    ((AACDECODER_LIB_VL0 > vl0) || \
-+     (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1))
-+#else
-+#define FDKDEC_VER_AT_LEAST(vl0, vl1) 0
-+#endif
-+
-+#if !FDKDEC_VER_AT_LEAST(2, 5) // < 2.5.10
-+#define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
-+#endif
-+
-+enum ConcealMethod {
-+    CONCEAL_METHOD_SPECTRAL_MUTING      =  0,
-+    CONCEAL_METHOD_NOISE_SUBSTITUTION   =  1,
-+    CONCEAL_METHOD_ENERGY_INTERPOLATION =  2,
-+    CONCEAL_METHOD_NB,
-+};
-+
-+typedef struct FDKAACDecContext {
-+    const AVClass *class;
-+    HANDLE_AACDECODER handle;
-+    uint8_t *decoder_buffer;
-+    int decoder_buffer_size;
-+    uint8_t *anc_buffer;
-+    int conceal_method;
-+    int drc_level;
-+    int drc_boost;
-+    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;
-+
-+
-+#define DMX_ANC_BUFFSIZE       128
-+#define DECODER_MAX_CHANNELS     8
-+#define DECODER_BUFFSIZE      2048 * sizeof(INT_PCM)
-+
-+#define OFFSET(x) offsetof(FDKAACDecContext, x)
-+#define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM
-+static const AVOption fdk_aac_dec_options[] = {
-+    { "conceal", "Error concealment method", OFFSET(conceal_method), AV_OPT_TYPE_INT, { .i64 = CONCEAL_METHOD_NOISE_SUBSTITUTION }, CONCEAL_METHOD_SPECTRAL_MUTING, CONCEAL_METHOD_NB - 1, AD, "conceal" },
-+    { "spectral", "Spectral muting",      0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_SPECTRAL_MUTING },      INT_MIN, INT_MAX, AD, "conceal" },
-+    { "noise",    "Noise Substitution",   0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_NOISE_SUBSTITUTION },   INT_MIN, INT_MAX, AD, "conceal" },
-+    { "energy",   "Energy Interpolation", 0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_ENERGY_INTERPOLATION }, INT_MIN, INT_MAX, AD, "conceal" },
-+    { "drc_boost", "Dynamic Range Control: boost, where [0] is none and [127] is max boost",
-+                     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_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 },
-+#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 }
-+};
-+
-+static const AVClass fdk_aac_dec_class = {
-+    .class_name = "libfdk-aac decoder",
-+    .item_name  = av_default_item_name,
-+    .option     = fdk_aac_dec_options,
-+    .version    = LIBAVUTIL_VERSION_INT,
-+};
-+
-+static int get_stream_info(AVCodecContext *avctx)
-+{
-+    FDKAACDecContext *s   = avctx->priv_data;
-+    CStreamInfo *info     = aacDecoder_GetStreamInfo(s->handle);
-+    int channel_counts[0x24] = { 0 };
-+    int i, ch_error       = 0;
-+    uint64_t ch_layout    = 0;
-+
-+    if (!info) {
-+        av_log(avctx, AV_LOG_ERROR, "Unable to get stream info\n");
-+        return AVERROR_UNKNOWN;
-+    }
-+
-+    if (info->sampleRate <= 0) {
-+        av_log(avctx, AV_LOG_ERROR, "Stream info not initialized\n");
-+        return AVERROR_UNKNOWN;
-+    }
-+    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];
-+        if (ctype <= ACT_NONE || ctype >= FF_ARRAY_ELEMS(channel_counts)) {
-+            av_log(avctx, AV_LOG_WARNING, "unknown channel type\n");
-+            break;
-+        }
-+        channel_counts[ctype]++;
-+    }
-+    av_log(avctx, AV_LOG_DEBUG,
-+           "%d channels - front:%d side:%d back:%d lfe:%d top:%d\n",
-+           info->numChannels,
-+           channel_counts[ACT_FRONT], channel_counts[ACT_SIDE],
-+           channel_counts[ACT_BACK],  channel_counts[ACT_LFE],
-+           channel_counts[ACT_FRONT_TOP] + channel_counts[ACT_SIDE_TOP] +
-+           channel_counts[ACT_BACK_TOP]  + channel_counts[ACT_TOP]);
-+
-+    switch (channel_counts[ACT_FRONT]) {
-+    case 4:
-+        ch_layout |= AV_CH_LAYOUT_STEREO | AV_CH_FRONT_LEFT_OF_CENTER |
-+                     AV_CH_FRONT_RIGHT_OF_CENTER;
-+        break;
-+    case 3:
-+        ch_layout |= AV_CH_LAYOUT_STEREO | AV_CH_FRONT_CENTER;
-+        break;
-+    case 2:
-+        ch_layout |= AV_CH_LAYOUT_STEREO;
-+        break;
-+    case 1:
-+        ch_layout |= AV_CH_FRONT_CENTER;
-+        break;
-+    default:
-+        av_log(avctx, AV_LOG_WARNING,
-+               "unsupported number of front channels: %d\n",
-+               channel_counts[ACT_FRONT]);
-+        ch_error = 1;
-+        break;
-+    }
-+    if (channel_counts[ACT_SIDE] > 0) {
-+        if (channel_counts[ACT_SIDE] == 2) {
-+            ch_layout |= AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT;
-+        } else {
-+            av_log(avctx, AV_LOG_WARNING,
-+                   "unsupported number of side channels: %d\n",
-+                   channel_counts[ACT_SIDE]);
-+            ch_error = 1;
-+        }
-+    }
-+    if (channel_counts[ACT_BACK] > 0) {
-+        switch (channel_counts[ACT_BACK]) {
-+        case 3:
-+            ch_layout |= AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT | AV_CH_BACK_CENTER;
-+            break;
-+        case 2:
-+            ch_layout |= AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT;
-+            break;
-+        case 1:
-+            ch_layout |= AV_CH_BACK_CENTER;
-+            break;
-+        default:
-+            av_log(avctx, AV_LOG_WARNING,
-+                   "unsupported number of back channels: %d\n",
-+                   channel_counts[ACT_BACK]);
-+            ch_error = 1;
-+            break;
-+        }
-+    }
-+    if (channel_counts[ACT_LFE] > 0) {
-+        if (channel_counts[ACT_LFE] == 1) {
-+            ch_layout |= AV_CH_LOW_FREQUENCY;
-+        } else {
-+            av_log(avctx, AV_LOG_WARNING,
-+                   "unsupported number of LFE channels: %d\n",
-+                   channel_counts[ACT_LFE]);
-+            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) {
-+        av_log(avctx, AV_LOG_WARNING, "unsupported channel configuration\n");
-+        ch_error = 1;
-+    }
-+    if (ch_error)
-+        avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
-+
-+    return 0;
-+}
-+
-+static av_cold int fdk_aac_decode_close(AVCodecContext *avctx)
-+{
-+    FDKAACDecContext *s = avctx->priv_data;
-+
-+    if (s->handle)
-+        aacDecoder_Close(s->handle);
-+    av_freep(&s->decoder_buffer);
-+    av_freep(&s->anc_buffer);
-+
-+    return 0;
-+}
-+
-+static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
-+{
-+    FDKAACDecContext *s = avctx->priv_data;
-+    AAC_DECODER_ERROR err;
-+
-+    s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
-+    if (!s->handle) {
-+        av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
-+        return AVERROR_UNKNOWN;
-+    }
-+
-+    if (avctx->extradata_size) {
-+        if ((err = aacDecoder_ConfigRaw(s->handle, &avctx->extradata,
-+                                        &avctx->extradata_size)) != AAC_DEC_OK) {
-+            av_log(avctx, AV_LOG_ERROR, "Unable to set extradata\n");
-+            return AVERROR_INVALIDDATA;
-+        }
-+    }
-+
-+    if ((err = aacDecoder_SetParam(s->handle, AAC_CONCEAL_METHOD,
-+                                   s->conceal_method)) != AAC_DEC_OK) {
-+        av_log(avctx, AV_LOG_ERROR, "Unable to set error concealment method\n");
-+        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) {
-+        int downmix_channels = -1;
-+
-+        switch (s->downmix_layout.u.mask) {
-+        case AV_CH_LAYOUT_STEREO:
-+        case AV_CH_LAYOUT_STEREO_DOWNMIX:
-+            downmix_channels = 2;
-+            break;
-+        case AV_CH_LAYOUT_MONO:
-+            downmix_channels = 1;
-+            break;
-+        default:
-+            av_log(avctx, AV_LOG_WARNING, "Invalid downmix option\n");
-+            break;
-+        }
-+
-+        if (downmix_channels != -1) {
-+            if (aacDecoder_SetParam(s->handle, AAC_PCM_MAX_OUTPUT_CHANNELS,
-+                                    downmix_channels) != AAC_DEC_OK) {
-+               av_log(avctx, AV_LOG_WARNING, "Unable to set output channels in the decoder\n");
-+            } else {
-+               s->anc_buffer = av_malloc(DMX_ANC_BUFFSIZE);
-+               if (!s->anc_buffer) {
-+                   av_log(avctx, AV_LOG_ERROR, "Unable to allocate ancillary buffer for the decoder\n");
-+                   return AVERROR(ENOMEM);
-+               }
-+               if (aacDecoder_AncDataInit(s->handle, s->anc_buffer, DMX_ANC_BUFFSIZE)) {
-+                   av_log(avctx, AV_LOG_ERROR, "Unable to register downmix ancillary buffer in the decoder\n");
-+                   return AVERROR_UNKNOWN;
-+               }
-+            }
-+        }
-+    }
-+
-+    if (s->drc_boost != -1) {
-+        if (aacDecoder_SetParam(s->handle, AAC_DRC_BOOST_FACTOR, s->drc_boost) != AAC_DEC_OK) {
-+            av_log(avctx, AV_LOG_ERROR, "Unable to set DRC boost factor in the decoder\n");
-+            return AVERROR_UNKNOWN;
-+        }
-+    }
-+
-+    if (s->drc_cut != -1) {
-+        if (aacDecoder_SetParam(s->handle, AAC_DRC_ATTENUATION_FACTOR, s->drc_cut) != AAC_DEC_OK) {
-+            av_log(avctx, AV_LOG_ERROR, "Unable to set DRC attenuation factor in the decoder\n");
-+            return AVERROR_UNKNOWN;
-+        }
-+    }
-+
-+    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;
-+        }
-+    }
-+
-+    if (s->drc_heavy != -1) {
-+        if (aacDecoder_SetParam(s->handle, AAC_DRC_HEAVY_COMPRESSION, s->drc_heavy) != AAC_DEC_OK) {
-+            av_log(avctx, AV_LOG_ERROR, "Unable to set DRC heavy compression in the decoder\n");
-+            return AVERROR_UNKNOWN;
-+        }
-+    }
-+
-+#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;
-+    }
-+#endif
-+
-+#if FDKDEC_VER_AT_LEAST(3, 0) // 3.0.0
-+    if (s->drc_effect != -1) {
-+        if (aacDecoder_SetParam(s->handle, AAC_UNIDRC_SET_EFFECT, s->drc_effect) != AAC_DEC_OK) {
-+            av_log(avctx, AV_LOG_ERROR, "Unable to set DRC effect type in the decoder\n");
-+            return AVERROR_UNKNOWN;
-+        }
-+    }
-+#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;
-+    s->decoder_buffer = av_malloc(s->decoder_buffer_size);
-+    if (!s->decoder_buffer)
-+        return AVERROR(ENOMEM);
-+
-+    return 0;
-+}
-+
-+static int fdk_aac_decode_frame(AVCodecContext *avctx, AVFrame *frame,
-+                                int *got_frame_ptr, AVPacket *avpkt)
-+{
-+    FDKAACDecContext *s = avctx->priv_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_DecodeFrame(s->handle, (INT_PCM *) s->decoder_buffer,
-+                                 s->decoder_buffer_size / sizeof(INT_PCM),
-+                                 flags);
-+    if (err == AAC_DEC_NOT_ENOUGH_BITS) {
-+        ret = avpkt->size - valid;
-+        goto end;
-+    }
-+    if (err != AAC_DEC_OK) {
-+        av_log(avctx, AV_LOG_ERROR,
-+               "aacDecoder_DecodeFrame() failed: %x\n", err);
-+        ret = AVERROR_UNKNOWN;
-+        goto end;
-+    }
-+
-+    if ((ret = get_stream_info(avctx)) < 0)
-+        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 *
-+           av_get_bytes_per_sample(avctx->sample_fmt));
-+
-+    *got_frame_ptr = 1;
-+    ret = avpkt->size - valid;
-+
-+end:
-+    return ret;
-+}
-+
-+static av_cold void fdk_aac_decode_flush(AVCodecContext *avctx)
-+{
-+    FDKAACDecContext *s = avctx->priv_data;
-+    AAC_DECODER_ERROR err;
-+
-+    if (!s->handle)
-+        return;
-+
-+    if ((err = aacDecoder_SetParam(s->handle,
-+                                   AAC_TPDEC_CLEAR_BUFFER, 1)) != AAC_DEC_OK)
-+        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,
-+    .priv_data_size = sizeof(FDKAACDecContext),
-+    .init           = fdk_aac_decode_init,
-+    FF_CODEC_DECODE_CB(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",
-+};
-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"]
- 
-+if CONFIG['MOZ_FDK_AAC']:
-+    SOURCES += [
-+        'libfdk-aacdec.c',
-+    ]
-+    OS_LIBS += CONFIG['MOZ_FDK_AAC_LIBS']
-+
- SYMBOLS_FILE = 'avcodec.symbols'
- NoVisibilityFlags()
- 
-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
-+# ==============================================================
-+option('--with-system-fdk-aac',
-+       help='Use system libfdk-aac (located with pkgconfig)')
-+
-+system_fdk_aac = pkg_check_modules('MOZ_FDK_AAC', 'fdk-aac',
-+                                   when='--with-system-fdk-aac')
-+
-+set_config('MOZ_FDK_AAC', depends(when=system_fdk_aac)(lambda: True))
- 
- # FFmpeg's ffvpx configuration
- # ==============================================================
--- 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/mozilla-gnome-shell-search-provider.patch
+++ b/mozilla-gnome-shell-search-provider.patch
@ -0,0 +1,780 @@
+diff -up firefox-71.0/browser/components/shell/moz.build.gnome-shell-search-provider firefox-71.0/browser/components/shell/moz.build
+--- firefox-71.0/browser/components/shell/moz.build.gnome-shell-search-provider	2019-11-26 01:02:19.000000000 +0100
+++ firefox-71.0/browser/components/shell/moz.build	2019-11-26 12:35:50.033210214 +0100
+@@ -34,6 +34,11 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gt
+     SOURCES += [
+         'nsGNOMEShellService.cpp',
+     ]
+    if CONFIG['MOZ_ENABLE_DBUS']:
+        SOURCES += [
+            'nsGNOMEShellSearchProvider.cpp',
+        ]
+
+ elif CONFIG['OS_ARCH'] == 'WINNT':
+     SOURCES += [
+         'nsWindowsShellService.cpp',
+@@ -57,6 +62,8 @@ for var in ('MOZ_APP_NAME', 'MOZ_APP_VER
+     DEFINES[var] = '"%s"' % CONFIG[var]
+ 
+ CXXFLAGS += CONFIG['TK_CFLAGS']
+if CONFIG['MOZ_ENABLE_DBUS']:
+    CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+ 
+ with Files('**'):
+     BUG_COMPONENT = ('Firefox', 'Shell Integration')
+diff -up firefox-71.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gnome-shell-search-provider firefox-71.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp
+--- firefox-71.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp.gnome-shell-search-provider	2019-11-26 12:35:50.033210214 +0100
+++ firefox-71.0/browser/components/shell/nsGNOMEShellSearchProvider.cpp	2019-11-26 12:35:50.033210214 +0100
+@@ -0,0 +1,607 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=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 "nsGNOMEShellSearchProvider.h"
+
+#include "nsIBaseWindow.h"
+#include "nsIDocShell.h"
+#include "nsPIDOMWindow.h"
+#include "mozilla/ModuleUtils.h"
+#include "mozilla/Base64.h"
+#include "nsIServiceManager.h"
+#include "nsIWidget.h"
+#include "nsIAppShellService.h"
+#include "nsAppShellCID.h"
+#include "nsPrintfCString.h"
+#include "nsCOMPtr.h"
+#include "nsGTKToolkit.h"
+#include "nsINavHistoryService.h"
+#include "nsToolkitCompsCID.h"
+#include "nsIFaviconService.h"
+#include "RemoteUtils.h"
+#include "nsIStringBundle.h"
+
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#define MAX_SEARCH_RESULTS_NUM 9
+#define KEYWORD_SEARCH_STRING "special:search"
+#define KEYWORD_SEARCH_STRING_LEN 14
+
+#define DBUS_BUS_NAME "org.mozilla.Firefox.SearchProvider"
+#define DBUS_OBJECT_PATH "/org/mozilla/Firefox/SearchProvider"
+
+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"
+    "<node>\n"
+    " <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
+    "   <method name=\"Introspect\">\n"
+    "     <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
+    "   </method>\n"
+    " </interface>\n"
+    " <interface name=\"org.gnome.Shell.SearchProvider2\">\n"
+    "   <method name=\"GetInitialResultSet\">\n"
+    "     <arg type=\"as\" name=\"terms\" direction=\"in\" />\n"
+    "     <arg type=\"as\" name=\"results\" direction=\"out\" />\n"
+    "   </method>\n"
+    "   <method name=\"GetSubsearchResultSet\">\n"
+    "     <arg type=\"as\" name=\"previous_results\" direction=\"in\" />\n"
+    "     <arg type=\"as\" name=\"terms\" direction=\"in\" />\n"
+    "     <arg type=\"as\" name=\"results\" direction=\"out\" />\n"
+    "   </method>\n"
+    "   <method name=\"GetResultMetas\">\n"
+    "     <arg type=\"as\" name=\"identifiers\" direction=\"in\" />\n"
+    "     <arg type=\"aa{sv}\" name=\"metas\" direction=\"out\" />\n"
+    "   </method>\n"
+    "   <method name=\"ActivateResult\">\n"
+    "     <arg type=\"s\" name=\"identifier\" direction=\"in\" />\n"
+    "     <arg type=\"as\" name=\"terms\" direction=\"in\" />\n"
+    "     <arg type=\"u\" name=\"timestamp\" direction=\"in\" />\n"
+    "   </method>\n"
+    "   <method name=\"LaunchSearch\">\n"
+    "     <arg type=\"as\" name=\"terms\" direction=\"in\" />\n"
+    "     <arg type=\"u\" name=\"timestamp\" direction=\"in\" />\n"
+    "   </method>\n"
+    "</interface>\n"
+    "</node>\n";
+
+DBusHandlerResult nsGNOMEShellSearchProvider::Introspect(DBusMessage* aMsg) {
+  DBusMessage* reply;
+
+  reply = dbus_message_new_method_return(aMsg);
+  if (!reply) return DBUS_HANDLER_RESULT_NEED_MEMORY;
+
+  dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspect_template,
+                           DBUS_TYPE_INVALID);
+
+  dbus_connection_send(mConnection, reply, nullptr);
+  dbus_message_unref(reply);
+
+  return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+nsresult nsGNOMEShellSearchProvider::QueryHistory(const char* aSearchTerm) {
+  nsresult rv;
+  nsCOMPtr<nsINavHistoryQuery> histQuery;
+  rv = mHistoryService->GetNewQuery(getter_AddRefs(histQuery));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoCString searchTerm(aSearchTerm);
+  rv = histQuery->SetSearchTerms(NS_ConvertUTF8toUTF16(searchTerm));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsINavHistoryQueryOptions> histQueryOpts;
+  rv = mHistoryService->GetNewQueryOptions(getter_AddRefs(histQueryOpts));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // We want to get the URIs for every item in the user's history with the
+  // given host
+  rv = histQueryOpts->SetResultType(nsINavHistoryQueryOptions::RESULTS_AS_URI);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = histQueryOpts->SetSortingMode(
+      nsINavHistoryQueryOptions::SORT_BY_VISITCOUNT_DESCENDING);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = histQueryOpts->SetMaxResults(10);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // We only search history, because searching both bookmarks and history
+  // is not supported, and history tends to be more comprehensive.
+  rv = histQueryOpts->SetQueryType(
+      nsINavHistoryQueryOptions::QUERY_TYPE_HISTORY);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsINavHistoryResult> histResult;
+  rv = mHistoryService->ExecuteQuery(histQuery, histQueryOpts,
+                                     getter_AddRefs(histResult));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Delete former search results
+  mHistResultContainer = nullptr;
+
+  rv = histResult->GetRoot(getter_AddRefs(mHistResultContainer));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mHistResultContainer->SetContainerOpen(true);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  uint32_t childCount = 0;
+  rv = mHistResultContainer->GetChildCount(&childCount);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return childCount != 0 ? NS_OK : NS_ERROR_FAILURE;
+}
+
+bool nsGNOMEShellSearchProvider::IsHistoryResultNodeURI(
+    nsINavHistoryResultNode* aHistoryNode) {
+  uint32_t type;
+  nsresult rv = aHistoryNode->GetType(&type);
+  if (NS_FAILED(rv) || type != nsINavHistoryResultNode::RESULT_TYPE_URI)
+    return false;
+
+  nsAutoCString title;
+  rv = aHistoryNode->GetTitle(title);
+  if (NS_SUCCEEDED(rv) && !title.IsEmpty()) {
+    return true;
+  }
+
+  rv = aHistoryNode->GetUri(title);
+  return NS_SUCCEEDED(rv) && !title.IsEmpty();
+}
+
+void nsGNOMEShellSearchProvider::ComposeSearchResultReply(
+    DBusMessage* reply, const char* aSearchTerm) {
+  uint32_t childCount = 0;
+  nsresult rv = mHistResultContainer->GetChildCount(&childCount);
+  if (NS_FAILED(rv) || childCount == 0) {
+    return;
+  }
+
+  if (childCount > MAX_SEARCH_RESULTS_NUM) {
+    childCount = MAX_SEARCH_RESULTS_NUM;
+  }
+
+  DBusMessageIter iter;
+  dbus_message_iter_init_append(reply, &iter);
+  DBusMessageIter iterArray;
+  dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &iterArray);
+
+  for (uint32_t i = 0; i < childCount; i++) {
+    nsCOMPtr<nsINavHistoryResultNode> child;
+    mHistResultContainer->GetChild(i, getter_AddRefs(child));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      continue;
+    }
+    if (!IsHistoryResultNodeURI(child)) {
+      continue;
+    }
+
+    nsAutoCString uri;
+    child->GetUri(uri);
+
+    nsPrintfCString idString("%d", i);
+    const char* id = idString.get();
+    dbus_message_iter_append_basic(&iterArray, DBUS_TYPE_STRING, &id);
+  }
+
+  nsPrintfCString searchString("%s:%s", KEYWORD_SEARCH_STRING, aSearchTerm);
+  const char* search = searchString.get();
+  dbus_message_iter_append_basic(&iterArray, DBUS_TYPE_STRING, &search);
+
+  dbus_message_iter_close_container(&iter, &iterArray);
+}
+
+DBusHandlerResult nsGNOMEShellSearchProvider::GetInitialResultSet(
+    DBusMessage* aMsg) {
+  DBusMessage* reply;
+  char** stringArray;
+  int elements;
+
+  if (!dbus_message_get_args(aMsg, nullptr, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+                             &stringArray, &elements, DBUS_TYPE_INVALID) ||
+      elements == 0) {
+    reply = dbus_message_new_error(aMsg, DBUS_BUS_NAME, "Wrong argument");
+  } else {
+    reply = dbus_message_new_method_return(aMsg);
+    nsresult rv = QueryHistory(stringArray[0]);
+    if (NS_SUCCEEDED(rv)) {
+      ComposeSearchResultReply(reply, stringArray[0]);
+    }
+    dbus_free_string_array(stringArray);
+  }
+
+  dbus_connection_send(mConnection, reply, nullptr);
+  dbus_message_unref(reply);
+
+  return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+DBusHandlerResult nsGNOMEShellSearchProvider::GetSubsearchResultSet(
+    DBusMessage* aMsg) {
+  DBusMessage* reply;
+
+  char **unusedArray = nullptr, **stringArray = nullptr;
+  int unusedNum, elements;
+
+  if (!dbus_message_get_args(aMsg, nullptr, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+                             &unusedArray, &unusedNum, DBUS_TYPE_ARRAY,
+                             DBUS_TYPE_STRING, &stringArray, &elements,
+                             DBUS_TYPE_INVALID) ||
+      elements == 0) {
+    reply = dbus_message_new_error(aMsg, DBUS_BUS_NAME, "Wrong argument");
+  } else {
+    reply = dbus_message_new_method_return(aMsg);
+    nsresult rv = QueryHistory(stringArray[0]);
+    if (NS_SUCCEEDED(rv)) {
+      ComposeSearchResultReply(reply, stringArray[0]);
+    }
+  }
+
+  if (unusedArray) {
+    dbus_free_string_array(unusedArray);
+  }
+  if (stringArray) {
+    dbus_free_string_array(stringArray);
+  }
+
+  dbus_connection_send(mConnection, reply, nullptr);
+  dbus_message_unref(reply);
+
+  return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static void appendStringDictionary(DBusMessageIter* aIter, const char* aKey,
+                                   const char* aValue) {
+  DBusMessageIter iterDict, iterVar;
+  dbus_message_iter_open_container(aIter, DBUS_TYPE_DICT_ENTRY, nullptr,
+                                   &iterDict);
+  dbus_message_iter_append_basic(&iterDict, DBUS_TYPE_STRING, &aKey);
+  dbus_message_iter_open_container(&iterDict, DBUS_TYPE_VARIANT, "s", &iterVar);
+  dbus_message_iter_append_basic(&iterVar, DBUS_TYPE_STRING, &aValue);
+  dbus_message_iter_close_container(&iterDict, &iterVar);
+  dbus_message_iter_close_container(aIter, &iterDict);
+}
+
+/* We can return those fields at GetResultMetas:
+  "id": the result ID
+  "name": the display name for the result
+  "icon": a serialized GIcon (see g_icon_serialize()), or alternatively,
+  "gicon": a textual representation of a GIcon (see g_icon_to_string()),
+           or alternativly,
+  "icon-data": a tuple of type (iiibiiay) describing a pixbuf with width,
+              height, rowstride, has-alpha, bits-per-sample, and image data
+  "description": an optional short description (1-2 lines)
+*/
+void nsGNOMEShellSearchProvider::AppendResultID(DBusMessageIter* aIter,
+                                                const char* aID) {
+  int keyIndex = atoi(aID);
+  nsCOMPtr<nsINavHistoryResultNode> child;
+  mHistResultContainer->GetChild(keyIndex, getter_AddRefs(child));
+
+  nsAutoCString title;
+  if (NS_FAILED(child->GetTitle(title))) {
+    return;
+  }
+
+  if (title.IsEmpty()) {
+    if (NS_FAILED(child->GetUri(title)) || title.IsEmpty()) {
+      return;
+    }
+  }
+
+  const char* titleStr = title.get();
+  appendStringDictionary(aIter, "id", aID);
+  appendStringDictionary(aIter, "name", titleStr);
+  appendStringDictionary(aIter, "gicon", "text-html");
+}
+
+void nsGNOMEShellSearchProvider::AppendSearchID(DBusMessageIter* aIter,
+                                                const char* aID) {
+  if (strlen(aID) < KEYWORD_SEARCH_STRING_LEN + 2) {
+    return;
+  }
+  appendStringDictionary(aIter, "id", KEYWORD_SEARCH_STRING);
+  mSearchTerm = nsAutoCStringN<32>(aID + KEYWORD_SEARCH_STRING_LEN + 1);
+  nsPrintfCString searchString(mGnomeSearchTitle.get(), mSearchTerm.get());
+  appendStringDictionary(aIter, "name", searchString.get());
+  appendStringDictionary(aIter, "gicon", "org.mozilla.Firefox");
+}
+
+DBusHandlerResult nsGNOMEShellSearchProvider::GetResultMetas(
+    DBusMessage* aMsg) {
+  DBusMessage* reply;
+  char** stringArray;
+  int elements;
+
+  if (!dbus_message_get_args(aMsg, nullptr, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+                             &stringArray, &elements, DBUS_TYPE_INVALID) ||
+      elements == 0) {
+    reply = dbus_message_new_error(aMsg, DBUS_BUS_NAME, "Wrong argument");
+  } else {
+    reply = dbus_message_new_method_return(aMsg);
+
+    DBusMessageIter iter;
+    dbus_message_iter_init_append(reply, &iter);
+    DBusMessageIter iterArray;
+    dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "a{sv}",
+                                     &iterArray);
+
+    DBusMessageIter iterArray2;
+    for (int i = 0; i < elements; i++) {
+      dbus_message_iter_open_container(&iterArray, DBUS_TYPE_ARRAY, "{sv}",
+                                       &iterArray2);
+      if (strncmp(stringArray[i], KEYWORD_SEARCH_STRING,
+                  KEYWORD_SEARCH_STRING_LEN) == 0) {
+        AppendSearchID(&iterArray2, stringArray[i]);
+      } else {
+        AppendResultID(&iterArray2, stringArray[i]);
+      }
+      dbus_message_iter_close_container(&iterArray, &iterArray2);
+    }
+
+    dbus_message_iter_close_container(&iter, &iterArray);
+    dbus_free_string_array(stringArray);
+  }
+
+  dbus_connection_send(mConnection, reply, nullptr);
+  dbus_message_unref(reply);
+
+  return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+void nsGNOMEShellSearchProvider::LaunchWithID(const char* aID,
+                                              uint32_t aTimeStamp) {
+  int keyIndex = atoi(aID);
+  nsCOMPtr<nsINavHistoryResultNode> child;
+  mHistResultContainer->GetChild(keyIndex, getter_AddRefs(child));
+
+  nsAutoCString uri;
+  nsresult rv = child->GetUri(uri);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  char* commandLine = nullptr;
+  int tmp;
+
+  if (strncmp(aID, KEYWORD_SEARCH_STRING, KEYWORD_SEARCH_STRING_LEN) == 0) {
+    nsPrintfCString searchString("search:%s", mSearchTerm.get());
+    const char* urlList[2] = {"unused", searchString.get()};
+    commandLine = ConstructCommandLine(2, (char**)urlList, 0, &tmp);
+  } else {
+    const char* urlList[2] = {"unused", uri.get()};
+    commandLine = ConstructCommandLine(2, (char**)urlList, 0, &tmp);
+  }
+
+  if (commandLine) {
+    HandleCommandLine(commandLine, aTimeStamp);
+    free(commandLine);
+  }
+}
+
+void nsGNOMEShellSearchProvider::LaunchWithAllResults(uint32_t aTimeStamp) {
+  uint32_t childCount = 0;
+  nsresult rv = mHistResultContainer->GetChildCount(&childCount);
+  if (NS_FAILED(rv) || childCount == 0) {
+    return;
+  }
+
+  if (childCount > MAX_SEARCH_RESULTS_NUM) {
+    childCount = MAX_SEARCH_RESULTS_NUM;
+  }
+
+  char** urlList = (char**)moz_xmalloc(sizeof(char*) * (childCount + 2));
+  int urlListElements = 0;
+
+  urlList[urlListElements++] = strdup("unused");
+
+  for (uint32_t i = 0; i < childCount; i++) {
+    nsCOMPtr<nsINavHistoryResultNode> child;
+    mHistResultContainer->GetChild(i, getter_AddRefs(child));
+
+    if (!IsHistoryResultNodeURI(child)) {
+      continue;
+    }
+
+    nsAutoCString uri;
+    nsresult rv = child->GetUri(uri);
+    if (NS_FAILED(rv)) {
+      continue;
+    }
+    urlList[urlListElements++] = strdup(uri.get());
+  }
+
+  nsPrintfCString searchString("search:%s", mSearchTerm.get());
+  urlList[urlListElements++] = strdup(searchString.get());
+
+  int tmp;
+  char* commandLine = ConstructCommandLine(urlListElements, urlList, 0, &tmp);
+  if (commandLine) {
+    HandleCommandLine(commandLine, aTimeStamp);
+    free(commandLine);
+  }
+
+  for (int i = 0; i < urlListElements; i++) {
+    free(urlList[i]);
+  }
+  free(urlList);
+}
+
+DBusHandlerResult nsGNOMEShellSearchProvider::ActivateResult(
+    DBusMessage* aMsg) {
+  DBusMessage* reply;
+  char* resultID;
+  char** stringArray;
+  int elements;
+  uint32_t timestamp;
+
+  if (!dbus_message_get_args(aMsg, nullptr, DBUS_TYPE_STRING, &resultID,
+                             DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &stringArray,
+                             &elements, DBUS_TYPE_UINT32, &timestamp,
+                             DBUS_TYPE_INVALID) ||
+      resultID == nullptr) {
+    reply = dbus_message_new_error(aMsg, DBUS_BUS_NAME, "Wrong argument");
+  } else {
+    reply = dbus_message_new_method_return(aMsg);
+    LaunchWithID(resultID, timestamp);
+    dbus_free_string_array(stringArray);
+  }
+
+  dbus_connection_send(mConnection, reply, nullptr);
+  dbus_message_unref(reply);
+
+  return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+DBusHandlerResult nsGNOMEShellSearchProvider::LaunchSearch(DBusMessage* aMsg) {
+  DBusMessage* reply;
+  char** stringArray;
+  int elements;
+  uint32_t timestamp;
+
+  if (!dbus_message_get_args(aMsg, nullptr, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
+                             &stringArray, &elements, DBUS_TYPE_UINT32,
+                             &timestamp, DBUS_TYPE_INVALID) ||
+      elements == 0) {
+    reply = dbus_message_new_error(aMsg, DBUS_BUS_NAME, "Wrong argument");
+  } else {
+    reply = dbus_message_new_method_return(aMsg);
+    LaunchWithAllResults(timestamp);
+    dbus_free_string_array(stringArray);
+  }
+
+  dbus_connection_send(mConnection, reply, nullptr);
+  dbus_message_unref(reply);
+
+  return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+DBusHandlerResult nsGNOMEShellSearchProvider::HandleDBusMessage(
+    DBusConnection* aConnection, DBusMessage* aMsg) {
+  NS_ASSERTION(mConnection == aConnection, "Wrong D-Bus connection.");
+
+  const char* method = dbus_message_get_member(aMsg);
+  const char* iface = dbus_message_get_interface(aMsg);
+
+  if ((strcmp("Introspect", method) == 0) &&
+      (strcmp("org.freedesktop.DBus.Introspectable", iface) == 0)) {
+    return Introspect(aMsg);
+  }
+
+  if (strcmp("org.gnome.Shell.SearchProvider2", iface) == 0) {
+    if (strcmp("GetInitialResultSet", method) == 0) {
+      return GetInitialResultSet(aMsg);
+    }
+    if (strcmp("GetSubsearchResultSet", method) == 0) {
+      return GetSubsearchResultSet(aMsg);
+    }
+    if (strcmp("GetResultMetas", method) == 0) {
+      return GetResultMetas(aMsg);
+    }
+    if (strcmp("ActivateResult", method) == 0) {
+      return ActivateResult(aMsg);
+    }
+    if (strcmp("LaunchSearch", method) == 0) {
+      return LaunchSearch(aMsg);
+    }
+  }
+
+  return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+void nsGNOMEShellSearchProvider::UnregisterDBusInterface(
+    DBusConnection* aConnection) {
+  NS_ASSERTION(mConnection == aConnection, "Wrong D-Bus connection.");
+  // Not implemented
+}
+
+static DBusHandlerResult message_handler(DBusConnection* conn,
+                                         DBusMessage* aMsg, void* user_data) {
+  auto interface = static_cast<nsGNOMEShellSearchProvider*>(user_data);
+  return interface->HandleDBusMessage(conn, aMsg);
+}
+
+static void unregister(DBusConnection* conn, void* user_data) {
+  auto interface = static_cast<nsGNOMEShellSearchProvider*>(user_data);
+  interface->UnregisterDBusInterface(conn);
+}
+
+static DBusObjectPathVTable remoteHandlersTable = {
+    .unregister_function = unregister,
+    .message_function = message_handler,
+};
+
+nsresult nsGNOMEShellSearchProvider::Startup() {
+  if (mConnection && dbus_connection_get_is_connected(mConnection)) {
+    // We're already connected so we don't need to reconnect
+    return NS_ERROR_ALREADY_INITIALIZED;
+  }
+
+  nsCOMPtr<nsIStringBundleService> sbs =
+      do_GetService(NS_STRINGBUNDLE_CONTRACTID);
+  if (NS_WARN_IF(!sbs)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsCOMPtr<nsIStringBundle> bundle;
+  sbs->CreateBundle("chrome://browser/locale/browser.properties",
+                    getter_AddRefs(bundle));
+  if (NS_WARN_IF(!bundle)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsAutoString searchTitle;
+  bundle->GetStringFromName("gnomeSearchProviderSearch", searchTitle);
+  mGnomeSearchTitle = NS_ConvertUTF16toUTF8(searchTitle);
+
+  mHistoryService = do_GetService(NS_NAVHISTORYSERVICE_CONTRACTID);
+  if (!mHistoryService) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mConnection =
+      already_AddRefed<DBusConnection>(dbus_bus_get(DBUS_BUS_SESSION, nullptr));
+  if (!mConnection) {
+    return NS_ERROR_FAILURE;
+  }
+  dbus_connection_set_exit_on_disconnect(mConnection, false);
+  dbus_connection_setup_with_g_main(mConnection, nullptr);
+
+  DBusError err;
+  dbus_error_init(&err);
+  dbus_bus_request_name(mConnection, DBUS_BUS_NAME, DBUS_NAME_FLAG_DO_NOT_QUEUE,
+                        &err);
+  // The interface is already owned - there is another application/profile
+  // instance already running.
+  if (dbus_error_is_set(&err)) {
+    dbus_error_free(&err);
+    mConnection = nullptr;
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!dbus_connection_register_object_path(mConnection, DBUS_OBJECT_PATH,
+                                            &remoteHandlersTable, this)) {
+    mConnection = nullptr;
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+void nsGNOMEShellSearchProvider::Shutdown() {
+  if (!mConnection) {
+    return;
+  }
+
+  dbus_connection_unregister_object_path(mConnection, DBUS_OBJECT_PATH);
+
+  // dbus_connection_unref() will be called by RefPtr here.
+  mConnection = nullptr;
+}
+diff -up firefox-71.0/browser/components/shell/nsGNOMEShellSearchProvider.h.gnome-shell-search-provider firefox-71.0/browser/components/shell/nsGNOMEShellSearchProvider.h
+--- firefox-71.0/browser/components/shell/nsGNOMEShellSearchProvider.h.gnome-shell-search-provider	2019-11-26 12:35:50.033210214 +0100
+++ firefox-71.0/browser/components/shell/nsGNOMEShellSearchProvider.h	2019-11-26 12:35:50.033210214 +0100
+@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=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 __nsGNOMEShellSearchProvider_h__
+#define __nsGNOMEShellSearchProvider_h__
+
+#include "mozilla/DBusHelpers.h"
+#include "nsINavHistoryService.h"
+#include "nsUnixRemoteServer.h"
+#include "nsCOMPtr.h"
+
+class nsGNOMEShellSearchProvider : public nsUnixRemoteServer {
+ public:
+  nsGNOMEShellSearchProvider() : mConnection(nullptr) {}
+  ~nsGNOMEShellSearchProvider() { Shutdown(); }
+
+  nsresult Startup();
+  void Shutdown();
+
+  DBusHandlerResult HandleDBusMessage(DBusConnection* aConnection,
+                                      DBusMessage* msg);
+  void UnregisterDBusInterface(DBusConnection* aConnection);
+
+ private:
+  DBusHandlerResult Introspect(DBusMessage* msg);
+
+  DBusHandlerResult GetInitialResultSet(DBusMessage* msg);
+  DBusHandlerResult GetSubsearchResultSet(DBusMessage* msg);
+  DBusHandlerResult GetResultMetas(DBusMessage* msg);
+  DBusHandlerResult ActivateResult(DBusMessage* msg);
+  DBusHandlerResult LaunchSearch(DBusMessage* msg);
+
+  nsresult QueryHistory(const char* aSearchTerm);
+  bool IsHistoryResultNodeURI(nsINavHistoryResultNode* aHistoryNode);
+  void AppendResultID(DBusMessageIter* aIter, const char* aID);
+  void AppendSearchID(DBusMessageIter* aIter, const char* aID);
+  void ComposeSearchResultReply(DBusMessage* aReply, const char* aSearchTerm);
+  void LaunchWithID(const char* aID, uint32_t aTimeStamp);
+  void LaunchWithAllResults(uint32_t aTimeStamp);
+
+  // The connection is owned by DBus library
+  RefPtr<DBusConnection> mConnection;
+  nsCOMPtr<nsINavHistoryContainerResultNode> mHistResultContainer;
+  nsCOMPtr<nsINavHistoryService> mHistoryService;
+  nsAutoCStringN<32> mSearchTerm;
+  nsAutoCString mGnomeSearchTitle;
+};
+
+#endif  // __nsGNOMEShellSearchProvider_h__
+diff -up firefox-71.0/browser/components/shell/nsGNOMEShellService.cpp.gnome-shell-search-provider firefox-71.0/browser/components/shell/nsGNOMEShellService.cpp
+--- firefox-71.0/browser/components/shell/nsGNOMEShellService.cpp.gnome-shell-search-provider	2019-11-26 01:02:19.000000000 +0100
+++ firefox-71.0/browser/components/shell/nsGNOMEShellService.cpp	2019-11-27 08:44:18.204710354 +0100
+@@ -92,6 +92,12 @@ nsresult nsGNOMEShellService::Init() {
+ 
+   if (!giovfs && !gsettings) return NS_ERROR_NOT_AVAILABLE;
+ 
+#ifdef MOZ_ENABLE_DBUS
+  if (Preferences::GetBool("widget.gnome-search-provider.enabled", false)) {
+    mSearchProvider.Startup();
+  }
+#endif
+
+   // Check G_BROKEN_FILENAMES.  If it's set, then filenames in glib use
+   // the locale encoding.  If it's not set, they use UTF-8.
+   mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nullptr;
+@@ -107,7 +113,10 @@ nsresult nsGNOMEShellService::Init() {
+                    getter_AddRefs(appPath));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+-  return appPath->GetNativePath(mAppPath);
+  rv = appPath->GetNativePath(mAppPath);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+ }
+ 
+ NS_IMPL_ISUPPORTS(nsGNOMEShellService, nsIGNOMEShellService, nsIShellService,
+diff -up firefox-71.0/browser/components/shell/nsGNOMEShellService.h.gnome-shell-search-provider firefox-71.0/browser/components/shell/nsGNOMEShellService.h
+--- firefox-71.0/browser/components/shell/nsGNOMEShellService.h.gnome-shell-search-provider	2019-11-26 01:02:19.000000000 +0100
+++ firefox-71.0/browser/components/shell/nsGNOMEShellService.h	2019-11-26 12:35:50.033210214 +0100
+@@ -10,6 +10,9 @@
+ #include "nsToolkitShellService.h"
+ #include "nsString.h"
+ #include "mozilla/Attributes.h"
+#ifdef MOZ_ENABLE_DBUS
+#  include "nsGNOMEShellSearchProvider.h"
+#endif
+ 
+ class nsGNOMEShellService final : public nsIGNOMEShellService,
+                                   public nsToolkitShellService {
+@@ -28,6 +31,9 @@ class nsGNOMEShellService final : public
+   bool KeyMatchesAppName(const char* aKeyValue) const;
+   bool CheckHandlerMatchesAppName(const nsACString& handler) const;
+ 
+#ifdef MOZ_ENABLE_DBUS
+  nsGNOMEShellSearchProvider mSearchProvider;
+#endif
+   bool GetAppPathFromLauncher();
+   bool mUseLocaleFilenames;
+   nsCString mAppPath;
+diff -up firefox-71.0/browser/locales/en-US/chrome/browser/browser.properties.gnome-shell-search-provider firefox-71.0/browser/locales/en-US/chrome/browser/browser.properties
+--- firefox-71.0/browser/locales/en-US/chrome/browser/browser.properties.gnome-shell-search-provider	2019-11-26 01:02:19.000000000 +0100
+++ firefox-71.0/browser/locales/en-US/chrome/browser/browser.properties	2019-11-26 12:35:50.034210214 +0100
+@@ -1025,3 +1025,7 @@ confirmationHint.passwordSaved.label = P
+ # Used by the export of user's live bookmarks to an OPML file as a title for the file.
+ # %S will be replaced with brandShortName
+ livebookmarkMigration.title                      = %S Live Bookmarks
+
+# LOCALIZATION NOTE (gnomeSearchProviderSearch):
+# Used for search by Gnome Shell activity screen, %s is a searched string.
+gnomeSearchProviderSearch=Search the web for “%s”
+diff -up firefox-71.0/toolkit/components/remote/moz.build.gnome-shell-search-provider firefox-71.0/toolkit/components/remote/moz.build
+--- firefox-71.0/toolkit/components/remote/moz.build.gnome-shell-search-provider	2019-11-26 01:02:29.000000000 +0100
+++ firefox-71.0/toolkit/components/remote/moz.build	2019-11-26 12:35:50.034210214 +0100
+@@ -25,6 +25,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk'
+             'nsDBusRemoteServer.cpp',
+         ]
+         CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+        EXPORTS += [
+            'nsUnixRemoteServer.h',
+            'RemoteUtils.h',
+        ]
+     CXXFLAGS += CONFIG['TK_CFLAGS']
+ 
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+diff -up firefox-71.0/toolkit/components/remote/nsDBusRemoteServer.cpp.gnome-shell-search-provider firefox-71.0/toolkit/components/remote/nsDBusRemoteServer.cpp
+--- firefox-71.0/toolkit/components/remote/nsDBusRemoteServer.cpp.gnome-shell-search-provider	2019-11-26 01:02:29.000000000 +0100
+++ firefox-71.0/toolkit/components/remote/nsDBusRemoteServer.cpp	2019-11-26 12:35:50.034210214 +0100
+@@ -27,7 +27,7 @@
+ 
+ #include <dlfcn.h>
+ 
+-const char* introspect_template =
+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"
--- 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,128 +1,30 @@
-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
+diff -up firefox-70.0/build/mozconfig.pgo firefox-70.0/build/mozconfig
+diff -up firefox-70.0/build/unix/mozconfig.unix.pgo firefox-70.0/build/unix/mozconfig.unix
+--- firefox-70.0/build/unix/mozconfig.unix.pgo	2019-10-18 18:05:36.461701704 +0200
+++ firefox-70.0/build/unix/mozconfig.unix	2019-10-18 20:25:48.036037912 +0200
+@@ -6,6 +6,15 @@ if [ -n "$FORCE_GCC" ]; then
+     CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
+     CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
 
- @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 [ -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
 +
-     if not profile_use:
-         return None
+     # 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-70.0/extensions/spellcheck/src/moz.build.pgo firefox-70.0/extensions/spellcheck/src/moz.build
+--- firefox-70.0/extensions/spellcheck/src/moz.build.pgo	2019-10-16 23:20:18.000000000 +0200
+++ firefox-70.0/extensions/spellcheck/src/moz.build	2019-10-18 18:05:36.461701704 +0200
+@@ -31,3 +31,5 @@ EXPORTS.mozilla += [
 
-@@ -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
- 
- import mozcrash
-from mozbuild.base import BinaryNotFoundException, MozbuildObject
-+from mozbuild.base import BinaryNotFoundException, MozbuildObject, BuildEnvironmentNotFoundException
- from mozfile import TemporaryDirectory, json
- from mozhttpd import MozHttpd
- from mozprofile import FirefoxProfile, Preferences
-@@ -96,9 +96,22 @@ if __name__ == "__main__":
-     locations = ServerLocations()
-     locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
- 
-    old_profraw_files = glob.glob("*.profraw")
-    for f in old_profraw_files:
-        os.remove(f)
-+    using_gcc = False
-+    try:
-+        if build.config_environment.substs.get('CC_TYPE') == 'gcc':
-+            using_gcc = True
-+    except BuildEnvironmentNotFoundException:
-+        pass
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+     CXXFLAGS += ['-Wno-error=shadow']
 +
-+    if using_gcc:
-+        for dirpath, _, filenames in os.walk('.'):
-+            for f in filenames:
-+                if f.endswith('.gcda'):
-+                    os.remove(os.path.join(dirpath, f))
-+    else:
-+        old_profraw_files = glob.glob('*.profraw')
-+        for f in old_profraw_files:
-+            os.remove(f)
- 
-     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"]
- 
-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() {
-   }
- #endif
- 
-+  // Disable watchdog for PGO train builds - writting profile information at
-+  // exit may take time and it is better to make build hang rather than
-+  // silently produce poorly performing binary.
-+  crashAfterMS = INT32_MAX;
-+
-   UniquePtr<Options> options(new Options());
-   // crashAfterTicks is guaranteed to be > 0 as
-   // crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
+CXXFLAGS += ['-fno-devirtualize']
+\ No newline at end of file
--- a/13
+++ b/13
@ -1,13 +0,0 @@
-#!/usr/bin/bash
-# Print reftest failures and compose them to html
-
-TEST_DIR="$1"
-TEST_FLAVOUR="$2"
-OUTPUT_FILE="failures-reftest$TEST_FLAVOUR.html"
-
-grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" -e "IMAGE 1 (TEST):" -e "IMAGE 2 (REFERENCE):" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > $OUTPUT_FILE
-sed -i '/REFTEST   IMAGE 1/a ">' $OUTPUT_FILE
-sed -i '/REFTEST   IMAGE 2/a "><BR><BR>' $OUTPUT_FILE
-sed -i '/REFTEST TEST/a <BR>' $OUTPUT_FILE
-sed -i -e 's/^REFTEST   IMAGE 1 (TEST): /<img border=2 src="/' $OUTPUT_FILE
-sed -i -e 's/^REFTEST   IMAGE 2 (REFERENCE): /<img border=2 src="/' $OUTPUT_FILE
--- a/9
+++ b/9
@ -1,9 +0,0 @@
-#!/usr/bin/bash
-# Print failed tests
-
-TEST_DIR=$1
-TEST_FLAVOUR=$2
-
-grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR 2>&1 > failures-mochitest$TEST_FLAVOUR.txt
-grep --text -e "  FAIL " -e "  TIMEOUT " $TEST_DIR/xpcshell$TEST_FLAVOUR 2>&1 > failures-xpcshell$TEST_FLAVOUR.txt
-grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > failures-reftest$TEST_FLAVOUR.txt
--- a/9
+++ b/9
@ -1,9 +0,0 @@
-#!/usr/bin/bash
-# Analyze and print test failures
-
-export TEST_DIR="test_results"
-
-#./print-errors $TEST_DIR ""
-./print-errors $TEST_DIR "-wr"
-#./print-error-reftest $TEST_DIR ""
-./print-error-reftest $TEST_DIR "-wr"
--- a/10
+++ b/10
@ -1,10 +0,0 @@
-#!/usr/bin/bash
-# Analyze and print general test results
-
-export TEST_DIR="test_results"
-
-echo "Test results"
-#echo "Basic compositor"
-#./psummary $TEST_DIR ""
-echo "WebRender"
-./psummary $TEST_DIR "-wr"
--- a/23
+++ b/23
@ -1,23 +0,0 @@
-#!/usr/bin/bash
-# Analyze and print specialized (basic/webrender) test results
-
-TEST_DIR=$1
-TEST_FLAVOUR=$2
-
-MPASS=`grep "TEST_END: Test OK" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
-MERR=`grep "TEST_END: Test ERROR" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
-MUNEX=`grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR | wc  -l`
-echo "Mochitest   PASSED: $MPASS FAILED: $MERR UNEXPECTED-FAILURES: $MUNEX"
-
-XPCPASS=`grep --text "Expected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
-XPCFAIL=`grep --text "Unexpected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
-echo "XPCShell:   PASSED: $XPCPASS FAILED: $XPCFAIL"
-
-CRPASS=`grep "REFTEST INFO | Successful:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
-CRFAIL=`grep "^REFTEST INFO | Unexpected:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
-echo "Crashtest:  PASSED: $CRPASS FAILED: $CRFAIL"
-
-RFPASS=`grep --text "REFTEST INFO | Successful:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
-RFUN=`grep --text "^REFTEST INFO | Unexpected:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
-RFKNOWN=`grep --text "REFTEST INFO | Known problems:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 6`
-echo "Reftest:    PASSED: $RFPASS FAILED: $RFUN Known issues: $RFKNOWN"
--- 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/80
+++ b/80
@ -1,80 +0,0 @@
-#!/usr/bin/bash
-# usage: run-tests-wayland [test flavour]
-
-set -x
-
-RUN_XPCSHELL_TEST=1
-RUN_REFTEST=1
-RUN_MOCHITEST=1
-RUN_CRASHTEST=1
-
-while (( "$#" )); do
-  SELECTED_TEST=$1
-  if [ "$SELECTED_TEST" = "xpcshell" ] ; then
-    RUN_XPCSHELL_TEST=1
-  elif [ "$SELECTED_TEST" = "reftest" ] ; then
-    RUN_REFTEST=1
-  elif [ "$SELECTED_TEST" = "mochitest" ] ; then
-    RUN_MOCHITEST=1
-  elif [ "$SELECTED_TEST" = "crashtest" ] ; then
-    RUN_CRASHTEST=1
-  fi
-  shift
-done
-
-export MACH_USE_SYSTEM_PYTHON=1
-export MOZ_NODE_PATH=/usr/bin/node
-
-MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
-TEST_DIR="test_results"
-mkdir $TEST_DIR
-
-env | grep "DISPLAY"
-
-# Fix for system nss
-ln -s /usr/bin/certutil objdir/dist/bin/certutil
-ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
-
-NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-
-export MOZ_ENABLE_WAYLAND=1
-
-if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then
-#  ./mach xpcshell-test 2>&1 | cat - | tee $TEST_DIR/xpcshell
-  ./mach xpcshell-test --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
-  sleep 60
-fi
-
-# Basic render testing
-export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.wayland.test-workarounds.enabled=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
-#fi
-#if [ $RUN_CRASHTEST -ne 0 ] ; then
-#  ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-#fi
-#if [ $RUN_MOCHITEST -ne 0 ] ; then
-#  ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
-#fi
-
-# 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
-fi
-if [ $RUN_CRASHTEST -ne 0 ] ; then
-  ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-  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
-  sleep 60
-fi
-
-rm -f  objdir/dist/bin/certutil
-rm -f  objdir/dist/bin/pk12util
--- a/39
+++ b/39
@ -1,39 +0,0 @@
-#!/usr/bin/bash
-set -x
-
-export MACH_USE_SYSTEM_PYTHON=1
-export MOZ_NODE_PATH=/usr/bin/node
-export X_PARAMS="-screen 0 1600x1200x24"
-export MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
-export TEST_DIR="test_results"
-
-# Fix for system nss
-ln -s /usr/bin/certutil objdir/dist/bin/certutil
-ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
-
-NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-
-# Basic render testing
-export TEST_PARAMS=""
-export TEST_FLAVOUR=""
-#xvfb-run -s "$X_PARAMS" -n 91 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
-#xvfb-run -s "$X_PARAMS" -n 92 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-#xvfb-run -s "$X_PARAMS" -n 93 ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-#xvfb-run -s "$X_PARAMS" -n 94 ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
-
-# WebRender testing
-export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
-export TEST_FLAVOUR="-wr"
-#xvfb-run -s "$X_PARAMS" -n 95 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
-#sleep 60
-#xvfb-run -s "$X_PARAMS" -n 96 ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-#sleep 60
-#xvfb-run -s "$X_PARAMS" -n 97 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-#sleep 60
-#export DISPLAY=:0
-#./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
-export DISPLAY=:98
-xvfb-run -s "$X_PARAMS" -n 98 ./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
-
-rm -f  objdir/dist/bin/certutil
-rm -f  objdir/dist/bin/pk12util
--- a/59
+++ b/59
@ -1,59 +0,0 @@
-#!/usr/bin/bash
-# Run wayland compositor and set WAYLAND_DISPLAY env variable
-
-set -x
-
-echo export DESKTOP_SESSION=gnome > $HOME/.xsessionrc
-echo export XDG_CURRENT_DESKTOP=GNOME > $HOME/.xsessionrc
-echo export XDG_SESSION_TYPE=wayland >> $HOME/.xsessionrc
-
-# Turn off the screen saver and screen locking
-gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-gsettings set org.gnome.desktop.screensaver lock-delay 3600
-
-# Disable the screen saver
-# This starts the gnome-keyring-daemon with an unlocked login keyring. libsecret uses this to
-# store secrets. Firefox uses libsecret to store a key that protects sensitive information like
-# credit card numbers.
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-    # if not found, launch a new one
-    eval `dbus-launch --sh-syntax`
-fi
-
-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
-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
-retry_count=0
-max_retries=5
-until [ $retry_count -gt $max_retries ]; do
-  if [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
-    retry_count=$(($max_retries + 1))
-  else
-    retry_count=$(($retry_count + 1))
-    echo "Waiting for Mutter, retry: $retry_count"
-    sleep 2
-  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."
-
--- a/10
+++ b/10
@ -1,7 +1,3 @@
-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 (cbindgen-vendor.tar.xz) = 88afa0bc6af525cbb46bc75578b90419b28b95b396d5002fbf299a78a173681b840096ff83ef6e48553d1a5e0aa04e79383ab4d09bf431f3b864fcbacc7de46d
+SHA512 (firefox-71.0.source.tar.xz) = 2559bf4703a79a258c6c257d8a2c6b1bc05bb062c13004dc5d5352020fbdd68448bc1d7a2fae34e51f9a9bda576ae2f3118fd99cdad910dd29ef56739c1b8244
+SHA512 (firefox-langpacks-71.0-20191126.tar.xz) = d3f465a988951dcf8b80766934f140b4e8f12c168702d2badea1fdaab36a7d67fcddb2b9d413ce50d28b25ec8fce7b237e308d5f675cd4254766e628f988460c
--- 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	4dca1be716	Merge branch 'master' into f29	2019-11-27 19:21:58 +01:00
Martin Stransky	dfbc812204	Merge branch 'master' into f29	2019-11-27 11:53:48 +01:00
Martin Stransky	2ef41708ac	Merge branch 'master' into f29	2019-11-27 11:49:10 +01:00
Martin Stransky	1c725c3010	Merge branch 'master' into f29	2019-11-27 10:37:45 +01:00
Martin Stransky	727c290342	Merge branch 'master' into f29	2019-11-27 09:57:22 +01:00
Martin Stransky	117a404f44	Merge branch 'master' into f29	2019-11-26 14:24:10 +01:00
Martin Stransky	a051ad99ff	erge branch 'master' into f29	2019-11-26 12:34:05 +01:00
Martin Stransky	fdda70c448	Merge branch 'master' into f29	2019-11-26 11:08:21 +01:00
Martin Stransky	fc7e16c02d	Merge branch 'master' into f29	2019-11-19 15:27:35 +01:00
Martin Stransky	2b2e347e41	Merge branch 'master' into f29	2019-11-19 13:18:23 +01:00
Jan Horak	03d0820f98	Merge branch 'master' into f29	2019-11-14 10:50:43 +01:00
Jan Horak	28e9ab6d3e	Merge branch 'master' into f29	2019-11-14 10:33:36 +01:00
Martin Stransky	732aecf5e5	Merge branch 'master' into f29	2019-11-07 13:59:42 +01:00
Jan Horak	24b8360bae	Merge branch 'master' into f29	2019-11-04 21:25:41 +01:00
Martin Stransky	46cf9f40a6	Merge branch 'master' into f29	2019-11-01 11:56:32 +01:00
Martin Stransky	7338a798cb	Merge branch 'master' into f29	2019-10-31 23:43:20 +01:00
Martin Stransky	44125d9f36	Merge branch 'master' into f29	2019-10-31 23:40:41 +01:00
Jan Horak	43205131dc	Merge branch 'master' into f29	2019-10-22 12:39:02 +02:00
Jan Horak	962e5986fd	Merge branch 'master' into f29	2019-10-22 12:05:11 +02:00
Martin Stransky	851515eec7	Merge branch 'master' into f29	2019-10-21 15:16:13 +02:00
Martin Stransky	58d07b2c39	Merge branch 'master' into f29	2019-10-18 20:43:40 +02:00
Martin Stransky	5de2627778	Merge branch 'master' into f29	2019-10-15 11:07:40 +02:00
Martin Stransky	dd699678e0	Merge branch 'master' into f29	2019-10-14 21:23:16 +02:00
Martin Stransky	f9863fb224	Merge branch 'master' into f29	2019-10-10 21:56:33 +02:00
Martin Stransky	7fed35fe2b	Merge branch 'master' into f29	2019-10-09 14:38:58 +02:00
Martin Stransky	d9e57ff70e	Merge branch 'master' into f29	2019-10-08 14:25:23 +02:00
Martin Stransky	cf22113306	Merge branch 'master' into f29	2019-10-03 16:10:08 +02:00
Jan Horak	dc104a292f	Merge branch 'master' into f29	2019-10-03 10:16:43 +02:00
Jan Horak	852d8ae50c	Merge branch 'master' into f29	2019-10-02 17:14:04 +02:00
Martin Stransky	0c90e3cb5f	Merge branch 'master' into f29	2019-09-30 10:04:50 +02:00
Martin Stransky	eb9d8e6c5e	Merge branch 'master' into f29	2019-09-24 12:38:03 +02:00
Martin Stransky	31072ad6fb	Merge branch 'master' into f29	2019-09-19 15:14:29 +02:00
Martin Stransky	bfc94d0dcb	Merge branch 'master' into f29	2019-09-19 10:44:08 +02:00
Martin Stransky	5362a14052	Merge branch 'master' into f29	2019-09-18 12:35:20 +02:00
Martin Stransky	fbb2f48659	Merge branch 'master' into f29	2019-09-18 10:05:11 +02:00
Martin Stransky	6a29ddfcb1	Merge branch 'master' into f29	2019-09-18 09:14:17 +02:00
Martin Stransky	c8d0d49302	Merge branch 'master' into f29	2019-09-18 08:38:18 +02:00
Martin Stransky	2ff6eb0209	Merge branch 'master' into f29	2019-09-18 08:36:22 +02:00
Martin Stransky	0ba9cbd62e	Merge branch 'master' into f29	2019-09-17 21:17:02 +02:00
Martin Stransky	61a936619f	Merge branch 'master' into f29	2019-09-17 14:10:26 +02:00
Martin Stransky	5bee457d41	Merge branch 'master' into f29	2019-09-17 13:22:59 +02:00
Martin Stransky	0849240891	Merge branch 'master' into f29	2019-09-16 11:59:49 +02:00
Martin Stransky	c3f36fa5e0	Merge branch 'master' into f29	2019-09-16 11:13:31 +02:00
Martin Stransky	afeef23b49	Merge branch 'master' into f29	2019-09-11 14:47:38 +02:00
Martin Stransky	054ce71606	Merge branch 'master' into f29	2019-09-11 08:35:38 +02:00
Martin Stransky	187f3dfc62	Merge branch 'master' into f29	2019-09-10 10:42:46 +02:00
Martin Stransky	dd72de3260	Merge branch 'master' into f29	2019-09-06 12:28:59 +02:00
Martin Stransky	3153ccfe2b	Merge branch 'master' into f29	2019-09-04 14:53:05 +02:00
Martin Stransky	b0ec64c5e2	Merge branch 'master' into f29	2019-09-04 14:17:16 +02:00
Martin Stransky	12bb49b5c8	Merge branch 'master' into f29	2019-09-02 17:06:41 +02:00
Martin Stransky	a3d8cad062	Merge branch 'master' into f29	2019-09-02 17:04:57 +02:00
Jan Horak	d2290f6bec	Merge branch 'master' into f29	2019-08-29 10:44:56 +02:00
Jan Horak	542974f307	Merge branch 'master' into f29	2019-08-14 20:15:30 +02:00
Jan Horak	e112e3f742	Merge branch 'master' into f29	2019-08-14 16:06:16 +02:00
Jan Horak	11061d73bf	Merge branch 'master' into f29	2019-08-05 13:50:32 +02:00
Martin Stransky	2118c27ba5	Merge branch 'master' into f29	2019-08-05 09:29:18 +02:00
Martin Stransky	2b613bb663	Merge branch 'master' into f29	2019-07-25 10:48:47 +02:00
Martin Stransky	520547dcb2	Merge branch 'master' into f29	2019-07-25 08:11:42 +02:00
Martin Stransky	492bc9669f	Merge branch 'master' into f29	2019-07-25 08:05:19 +02:00
Martin Stransky	1b7098cd0f	Merge branch 'master' into f29	2019-07-24 18:33:18 +02:00
Martin Stransky	3645c1021a	Merge branch 'master' into f29	2019-07-24 18:31:36 +02:00
Martin Stransky	f5a301343e	Merge branch 'master' into f29	2019-07-24 16:28:38 +02:00
Martin Stransky	beb6a88774	Merge branch 'master' into f29	2019-07-24 16:03:42 +02:00
Martin Stransky	f19e58caf9	Merge branch 'master' into f29	2019-07-23 15:22:51 +02:00
Martin Stransky	dc6a67166d	Merge branch 'master' into f29	2019-07-23 08:08:04 +02:00
Martin Stransky	b25d7970af	Merge branch 'master' into f29	2019-07-23 08:03:23 +02:00
Martin Stransky	30b5f712e9	Merge branch 'master' into f29	2019-07-22 14:14:19 +02:00
Martin Stransky	6fed3c1b50	Merge branch 'master' into f29	2019-07-11 12:42:56 +02:00
Martin Stransky	7d1b556c2a	Merge branch 'master' into f29	2019-07-11 08:26:17 +02:00
Martin Stransky	f6ea796d45	Merge branch 'master' into f29	2019-07-10 20:16:48 +02:00
Martin Stransky	df65ded7be	Merge branch 'master' into f29	2019-07-10 17:11:35 +02:00
Martin Stransky	c8da84eea5	Merge branch 'master' into f29	2019-07-10 17:07:08 +02:00
Martin Stransky	8f9f0bf661	Merge branch 'master' into f29	2019-07-09 14:22:44 +02:00
Martin Stransky	909559e51e	Merge branch 'master' into f29	2019-07-08 23:03:40 +02:00
Martin Stransky	55b0563b4d	Merge branch 'master' into f29	2019-07-08 22:46:51 +02:00
Martin Stransky	583a5e6671	Merge branch 'master' into f29	2019-07-08 21:50:07 +02:00
Martin Stransky	a8383bdf78	Merge branch 'master' into f29	2019-07-08 21:48:47 +02:00