.gitignore

@@ -1,11 +1,6 @@
-SOURCES/Python-2.7.13.tar.xz
-SOURCES/cbindgen-vendor-0.14.3.tar.xz
-SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
-SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-SOURCES/nodejs-10.21.0-5.fc32.src.rpm
-SOURCES/nspr-4.25.0-1.el8_0.src.rpm
-SOURCES/nss-3.53.1-3.fc32.src.rpm
-SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-SOURCES/thunderbird-78.7.0.source.tar.xz
-SOURCES/thunderbird-langpacks-78.7.0-20210126.tar.xz
-SOURCES/yasm-1.2.0-3.el5.src.rpm
+SOURCES/cbindgen-vendor.tar.xz
+SOURCES/nspr-4.35.0-1.el8_1.src.rpm
+SOURCES/nss-3.90.0-2.el8_1.src.rpm
+SOURCES/nss-3.90.0-3.el9_0.src.rpm
+SOURCES/thunderbird-115.9.0.processed-source.tar.xz
+SOURCES/thunderbird-langpacks-115.9.0-20240318.tar.xz

.thunderbird.metadata

@@ -1,11 +1,6 @@
-18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
-a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz
-0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
-e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
-5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.src.rpm
-07d67c90367c3ec0d6cebc1a5793c21076d34b78 SOURCES/nspr-4.25.0-1.el8_0.src.rpm
-223c02166b1cb9863b9f453ef687d7805a93e7af SOURCES/nss-3.53.1-3.fc32.src.rpm
-a379070abf5000cde61411c97af7e733b267a4d3 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-88e36ea3ae7cb0e18da49edc103e2d3451c9fdec SOURCES/thunderbird-78.7.0.source.tar.xz
-efcdcfab6824ba8f416cf5d1ac7434df7a8d80ac SOURCES/thunderbird-langpacks-78.7.0-20210126.tar.xz
-77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
+b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
+d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
+39d1004f8948186cdaa33bbb90423f6f994bdf6c SOURCES/nss-3.90.0-2.el8_1.src.rpm
+df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm
+cb287fa47bd8bdff66aacb2143a3c244250bae88 SOURCES/thunderbird-115.9.0.processed-source.tar.xz
+12f6297fbc364c63712e13e30d289b37840a865f SOURCES/thunderbird-langpacks-115.9.0-20240318.tar.xz

SOURCES/CVE-2023-44488-libvpx.patch

@@ -0,0 +1,127 @@
+From 263682c9a29395055f3b3afe2d97be1828a6223f Mon Sep 17 00:00:00 2001
+From: Jerome Jiang <jianj@google.com>
+Date: Thu, 30 Jun 2022 13:48:56 -0400
+Subject: [PATCH] Fix bug with smaller width bigger size
+
+Fixed previous patch that clusterfuzz failed on.
+
+Bug: webm:1642
+Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9
+---
+ test/resize_test.cc          | 11 +++--------
+ vp9/common/vp9_alloccommon.c | 13 ++++++-------
+ vp9/encoder/vp9_encoder.c    | 27 +++++++++++++++++++++++++--
+ 3 files changed, 34 insertions(+), 17 deletions(-)
+
+diff --git a/test/resize_test.cc b/test/resize_test.cc
+index fd1c2a92de6..20ad2229b46 100644
+--- a/test/resize_test.cc
++++ b/test/resize_test.cc
+@@ -102,11 +102,8 @@ void ScaleForFrameNumber(unsigned int frame, unsigned int initial_w,
+     if (frame < 30) {
+       return;
+     }
+-    if (frame < 100) {
+-      *w = initial_w * 7 / 10;
+-      *h = initial_h * 16 / 10;
+-      return;
+-    }
++    *w = initial_w * 7 / 10;
++    *h = initial_h * 16 / 10;
+     return;
+   }
+   if (frame < 10) {
+@@ -559,9 +556,7 @@ TEST_P(ResizeRealtimeTest, TestExternalResizeWorks) {
+   }
+ }
+ 
+-// TODO(https://crbug.com/webm/1642): This causes a segfault in
+-// init_encode_frame_mb_context().
+-TEST_P(ResizeRealtimeTest, DISABLED_TestExternalResizeSmallerWidthBiggerSize) {
++TEST_P(ResizeRealtimeTest, TestExternalResizeSmallerWidthBiggerSize) {
+   ResizingVideoSource video;
+   video.flag_codec_ = true;
+   video.smaller_width_larger_size_ = true;
+diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c
+index e53883f621d..9e73e40ea09 100644
+--- a/vp9/common/vp9_alloccommon.c
++++ b/vp9/common/vp9_alloccommon.c
+@@ -135,13 +135,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
+     cm->free_mi(cm);
+     if (cm->alloc_mi(cm, new_mi_size)) goto fail;
+   }
+-
+-  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
+-    // Create the segmentation map structure and set to 0.
+-    free_seg_map(cm);
+-    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
+-  }
+-
+   if (cm->above_context_alloc_cols < cm->mi_cols) {
+     vpx_free(cm->above_context);
+     cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc(
+@@ -156,6 +149,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
+     cm->above_context_alloc_cols = cm->mi_cols;
+   }
+ 
++  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
++    // Create the segmentation map structure and set to 0.
++    free_seg_map(cm);
++    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
++  }
++
+   if (vp9_alloc_loop_filter(cm)) goto fail;
+ 
+   return 0;
+diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
+index 69a4e3c314f..e3ba294c32f 100644
+--- a/vp9/encoder/vp9_encoder.c
++++ b/vp9/encoder/vp9_encoder.c
+@@ -2047,6 +2047,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) {
+   }
+ }
+ 
++static void free_copy_partition_data(VP9_COMP *cpi) {
++  vpx_free(cpi->prev_partition);
++  cpi->prev_partition = NULL;
++  vpx_free(cpi->prev_segment_id);
++  cpi->prev_segment_id = NULL;
++  vpx_free(cpi->prev_variance_low);
++  cpi->prev_variance_low = NULL;
++  vpx_free(cpi->copied_frame_cnt);
++  cpi->copied_frame_cnt = NULL;
++}
++
+ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
+   VP9_COMMON *const cm = &cpi->common;
+   RATE_CONTROL *const rc = &cpi->rc;
+@@ -2126,6 +2137,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
+     new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows);
+     if (cm->mi_alloc_size < new_mi_size) {
+       vp9_free_context_buffers(cm);
++      vp9_free_pc_tree(&cpi->td);
++      vpx_free(cpi->mbmi_ext_base);
+       alloc_compressor_data(cpi);
+       realloc_segmentation_maps(cpi);
+       cpi->initial_width = cpi->initial_height = 0;
+@@ -2144,8 +2157,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
+     update_frame_size(cpi);
+ 
+   if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) {
+-    memset(cpi->consec_zero_mv, 0,
+-           cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv));
++    vpx_free(cpi->consec_zero_mv);
++    CHECK_MEM_ERROR(
++        &cm->error, cpi->consec_zero_mv,
++        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv)));
++
++    vpx_free(cpi->skin_map);
++    CHECK_MEM_ERROR(
++        &cm->error, cpi->skin_map,
++        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0])));
++
++    free_copy_partition_data(cpi);
++    alloc_copy_partition_data(cpi);
+     if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ)
+       vp9_cyclic_refresh_reset_resize(cpi);
+     rc->rc_1_frame = 0;

SOURCES/D87019-thin-vec-big-endian.diff

@@ -1,767 +0,0 @@
-diff -up firefox-78.1.0/Cargo.lock.D87019-thin-vec-big-endian.diff firefox-78.1.0/Cargo.lock
---- firefox-78.1.0/Cargo.lock.D87019-thin-vec-big-endian.diff	2020-07-22 19:56:54.000000000 +0200
-+++ firefox-78.1.0/Cargo.lock	2020-08-17 17:04:24.133598583 +0200
-@@ -4792,12 +4792,9 @@ checksum = "8eaa81235c7058867fa8c0e7314f
- 
- [[package]]
- name = "thin-vec"
--version = "0.1.0"
-+version = "0.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "73fdf4b84c65a85168477b7fb6c498e0716bc9487fba24623389ea7f51708044"
--dependencies = [
-- "libc",
--]
-+checksum = "dcc760ada4a9f56fc6d0e81bd143984ebc7bb1b875a6891aa2fa613ca7394fc0"
- 
- [[package]]
- name = "thiserror"
-diff -up firefox-78.1.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/gfx/webrender_bindings/Cargo.toml
---- firefox-78.1.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-08-17 17:04:24.133598583 +0200
-+++ firefox-78.1.0/gfx/webrender_bindings/Cargo.toml	2020-08-17 17:05:26.984805590 +0200
-@@ -20,7 +20,7 @@ nsstring = { path = "../../xpcom/rust/ns
- bincode = "1.0"
- uuid = { version = "0.8", features = ["v4"] }
- fxhash = "0.2.1"
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
- swgl = { path = "../wr/swgl" }
- 
- [dependencies.webrender]
-diff -up firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml
---- firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:20.000000000 +0200
-+++ firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml	2020-08-17 17:04:24.134598587 +0200
-@@ -10,4 +10,4 @@ fluent-pseudo = "0.2"
- intl-memoizer = "0.4"
- unic-langid = "0.8"
- nsstring = { path = "../../../../xpcom/rust/nsstring" }
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
-diff -up firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml
---- firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:20.000000000 +0200
-+++ firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml	2020-08-17 17:04:24.134598587 +0200
-@@ -9,7 +9,7 @@ edition = "2018"
- nserror = { path = "../../../../xpcom/rust/nserror" }
- nsstring = { path = "../../../../xpcom/rust/nsstring" }
- xpcom = { path = "../../../../xpcom/rust/xpcom" }
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
- fluent-langneg = { version = "0.12.1", features = ["cldr"] }
- unic-langid = "0.8"
- unic-langid-ffi = { path = "../unic-langid-ffi" }
-diff -up firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml
---- firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:20.000000000 +0200
-+++ firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml	2020-08-17 17:04:24.134598587 +0200
-@@ -9,5 +9,5 @@ edition = "2018"
- nserror = { path = "../../../../xpcom/rust/nserror" }
- nsstring = { path = "../../../../xpcom/rust/nsstring" }
- xpcom = { path = "../../../../xpcom/rust/xpcom" }
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
- unic-langid = { version = "0.8", features = ["likelysubtags"] }
-diff -up firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml
---- firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-08-17 17:04:24.134598587 +0200
-+++ firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml	2020-08-17 17:05:10.352750807 +0200
-@@ -14,7 +14,7 @@ neqo-common = { tag = "v0.2.4", git = "h
- nserror = { path = "../../../xpcom/rust/nserror" }
- nsstring = { path = "../../../xpcom/rust/nsstring" }
- xpcom = { path = "../../../xpcom/rust/xpcom" }
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
- 
- [dependencies.neqo-crypto]
- tag = "v0.2.4"
-diff -up firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml
---- firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 19:56:55.000000000 +0200
-+++ firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml	2020-08-17 17:04:24.134598587 +0200
-@@ -18,6 +18,6 @@ rust_cascade = "0.6.0"
- sha2 = "^0.8"
- storage_variant = { path = "../../../../storage/variant" }
- tempfile = "3"
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
- time = "0.1"
- xpcom = { path = "../../../../xpcom/rust/xpcom" }
-diff -up firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml
---- firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-08-17 17:04:24.134598587 +0200
-+++ firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml	2020-08-17 17:04:52.432691786 +0200
-@@ -20,5 +20,5 @@ nserror = { path = "../../../../xpcom/ru
- nsstring = { path = "../../../../xpcom/rust/nsstring" }
- xpcom = { path = "../../../../xpcom/rust/xpcom" }
- storage_variant = { path = "../../../../storage/variant" }
--thin-vec = { version = "0.1", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
- fxa-client = { git = "https://github.com/mozilla/application-services", rev = "61dcc364ac0d6d0816ab88a494bbf20d824b009b", features = ["gecko"] }
-diff -up firefox-78.1.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/services/sync/golden_gate/Cargo.toml
---- firefox-78.1.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:24.000000000 +0200
-+++ firefox-78.1.0/services/sync/golden_gate/Cargo.toml	2020-08-17 17:04:24.134598587 +0200
-@@ -19,5 +19,5 @@ sync15-traits = { git = "https://github.
- xpcom = { path = "../../../xpcom/rust/xpcom" }
- 
- [dependencies.thin-vec]
--version = "0.1.0"
-+version = "0.2.1"
- features = ["gecko-ffi"]
-diff -up firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json
---- firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:29.000000000 +0200
-+++ firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json	2020-08-17 17:04:24.134598587 +0200
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"fb96cad605ae48215811808c1cc1b9a50248f2b14542058094b23983e2f8d8a0","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/heap.rs":"fe84a4ff433568d5713685456d87597ac5dcdb9d5190061a3da8074240ba1bc3","src/lib.rs":"ce36db8e3464dddade7c1ddbe3ee1f5e525af5be492ea51a0d8a0776c1adfc28","src/range.rs":"bac59bcb6230367a39c7e28ac15263e4526f966cd8c72015873017f17c115aaa"},"package":"73fdf4b84c65a85168477b7fb6c498e0716bc9487fba24623389ea7f51708044"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"754c05523d17eb7591c3ea2c9294e47c05fbb257fed04b78546fb2ec7cafa8b4","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/lib.rs":"627c6094c3f0286dba25bc73f5672c06c5061c25b01c513d213cbdda100673a2"},"package":"dcc760ada4a9f56fc6d0e81bd143984ebc7bb1b875a6891aa2fa613ca7394fc0"}
-\ No newline at end of file
-diff -up firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml
---- firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:29.000000000 +0200
-+++ firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml	2020-08-17 17:04:24.135598590 +0200
-@@ -3,7 +3,7 @@
- # When uploading crates to the registry Cargo will automatically
- # "normalize" Cargo.toml files for maximal compatibility
- # with all versions of Cargo and also rewrite `path` dependencies
--# to registry (e.g. crates.io) dependencies
-+# to registry (e.g., crates.io) dependencies
- #
- # If you believe there's an error in this file please file an
- # issue against the rust-lang/cargo repository. If you're
-@@ -11,16 +11,17 @@
- # will likely look very different (and much more reasonable)
- 
- [package]
-+edition = "2018"
- name = "thin-vec"
--version = "0.1.0"
-+version = "0.2.1"
- authors = ["Alexis Beingessner <a.beingessner@gmail.com>"]
- description = "a vec that takes up less space on the stack"
- homepage = "https://github.com/gankro/thin-vec"
- readme = "README.md"
- license = "MIT/Apache-2.0"
- repository = "https://github.com/gankro/thin-vec"
--[dependencies.libc]
--version = "0.2"
-+
-+[dependencies]
- 
- [features]
- default = []
-diff -up firefox-78.1.0/third_party/rust/thin-vec/src/heap.rs.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/src/heap.rs
-diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs
---- firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:28.000000000 +0200
-+++ firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs	2020-08-17 17:04:24.135598590 +0200
-@@ -1,50 +1,252 @@
--mod range;
-+//! ThinVec is exactly the same as Vec, except that it stores its `len` and `capacity` in the buffer
-+//! it allocates.
-+//!
-+//! This makes the memory footprint of ThinVecs lower; notably in cases where space is reserved for
-+//! a non-existence ThinVec<T>. So `Vec<ThinVec<T>>` and `Option<ThinVec<T>>::None` will waste less
-+//! space. Being pointer-sized also means it can be passed/stored in registers.
-+//!
-+//! Of course, any actually constructed ThinVec will theoretically have a bigger allocation, but
-+//! the fuzzy nature of allocators means that might not actually be the case.
-+//!
-+//! Properties of Vec that are preserved:
-+//! * `ThinVec::new()` doesn't allocate (it points to a statically allocated singleton)
-+//! * reallocation can be done in place
-+//! * `size_of::<ThinVec<T>>()` == `size_of::<Option<ThinVec<T>>>()`
-+//!
-+//! Properties of Vec that aren't preserved:
-+//! * `ThinVec<T>` can't ever be zero-cost roundtripped to a `Box<[T]>`, `String`, or `*mut T`
-+//! * `from_raw_parts` doesn't exist
-+//! * ThinVec currently doesn't bother to not-allocate for Zero Sized Types (e.g. `ThinVec<()>`),
-+//!   but it could be done if someone cared enough to implement it.
-+//!
-+//!
-+//!
-+//! # Gecko FFI
-+//!
-+//! If you enable the gecko-ffi feature, ThinVec will verbatim bridge with the nsTArray type in
-+//! Gecko (Firefox). That is, ThinVec and nsTArray have identical layouts *but not ABIs*, 
-+//! so nsTArrays/ThinVecs an be natively manipulated by C++ and Rust, and ownership can be 
-+//! transferred across the FFI boundary (**IF YOU ARE CAREFUL, SEE BELOW!!**).
-+//!
-+//! While this feature is handy, it is also inherently dangerous to use because Rust and C++ do not
-+//! know about eachother. Specifically, this can be an issue with non-POD types (types which
-+//! have destructors, move constructors, or are `!Copy`).
-+//!
-+//! ## Do Not Pass By Value
-+//!
-+//! The biggest thing to keep in mind is that **FFI functions cannot pass ThinVec/nsTArray 
-+//! by-value**. That is, these are busted APIs:
-+//!
-+//! ```rust,ignore
-+//! // BAD WRONG
-+//! extern fn process_data(data: ThinVec<u32>) { ... }
-+//! // BAD WRONG
-+//! extern fn get_data() -> ThinVec<u32> { ... }
-+//! ```
-+//!
-+//! You must instead pass by-reference:
-+//!
-+//! ```rust
-+//! # use thin_vec::*;
-+//! # use std::mem;
-+//!
-+//! // Read-only access, ok!
-+//! extern fn process_data(data: &ThinVec<u32>) {
-+//!     for val in data {
-+//!         println!("{}", val);
-+//!     }
-+//! }
-+//! 
-+//! // Replace with empty instance to take ownership, ok!
-+//! extern fn consume_data(data: &mut ThinVec<u32>) {
-+//!     let owned = mem::replace(data, ThinVec::new());
-+//!     mem::drop(owned);
-+//! }
-+//! 
-+//! // Mutate input, ok!
-+//! extern fn add_data(dataset: &mut ThinVec<u32>) {
-+//!     dataset.push(37);
-+//!     dataset.push(12);
-+//! }
-+//! 
-+//! // Return via out-param, usually ok!
-+//! //
-+//! // WARNING: output must be initialized! (Empty nsTArrays are free, so just do it!)
-+//! extern fn get_data(output: &mut ThinVec<u32>) {
-+//!     *output = thin_vec![1, 2, 3, 4, 5];
-+//! }
-+//! ```
-+//!
-+//! Ignorable Explanation For Those Who Really Want To Know Why:
-+//!
-+//! > The fundamental issue is that Rust and C++ can't currently communicate about destructors, and
-+//! > the semantics of C++ require destructors of function arguments to be run when the function
-+//! > returns. Whether the callee or caller is responsible for this is also platform-specific, so
-+//! > trying to hack around it manually would be messy. 
-+//! >
-+//! > Also a type having a destructor changes its C++ ABI, because that type must actually exist 
-+//! > in memory (unlike a trivial struct, which is often passed in registers). We don't currently
-+//! > have a way to communicate to Rust that this is happening, so even if we worked out the
-+//! > destructor issue with say, MaybeUninit, it would still be a non-starter without some RFCs
-+//! > to add explicit rustc support.
-+//! >
-+//! > Realistically, the best answer here is to have a "heavier" bindgen that can secretly
-+//! > generate FFI glue so we can pass things "by value" and have it generate by-reference code
-+//! > behind our back (like the cxx crate does). This would muddy up debugging/searchfox though.
-+//!
-+//! ## Types Should Be Trivially Relocatable
-+//!
-+//! Types in Rust are always trivially relocatable (unless suitably borrowed/[pinned][]/hidden).
-+//! This means all Rust types are legal to relocate with a bitwise copy, you cannot provide
-+//! copy or move constructors to execute when this happens, and the old location won't have its
-+//! destructor run. This will cause problems for types which have a significant location
-+//! (types that intrusively point into themselves or have their location registered with a service).
-+//!
-+//! While relocations are generally predictable if you're very careful, **you should avoid using
-+//! types with significant locations with Rust FFI**.
-+//!
-+//! Specifically, ThinVec will trivially relocate its contents whenever it needs to reallocate its
-+//! buffer to change its capacity. This is the default reallocation strategy for nsTArray, and is
-+//! suitable for the vast majority of types. Just be aware of this limitation!
-+//!
-+//! ## Auto Arrays Are Dangerous
-+//!
-+//! ThinVec has *some* support for handling auto arrays which store their buffer on the stack, 
-+//! but this isn't well tested.
-+//!
-+//! Regardless of how much support we provide, Rust won't be aware of the buffer's limited lifetime,
-+//! so standard auto array safety caveats apply about returning/storing them! ThinVec won't ever
-+//! produce an auto array on its own, so this is only an issue for transferring an nsTArray into
-+//! Rust.
-+//!
-+//! ## Other Issues
-+//!
-+//! Standard FFI caveats also apply: 
-+//!
-+//!  * Rust is more strict about POD types being initialized (use MaybeUninit if you must)
-+//!  * `ThinVec<T>` has no idea if the C++ version of `T` has move/copy/assign/delete overloads
-+//!  * `nsTArray<T>` has no idea if the Rust version of `T` has a Drop/Clone impl
-+//!  * C++ can do all sorts of unsound things that Rust can't catch
-+//!  * C++ and Rust don't agree on how zero-sized/empty types should be handled
-+//!
-+//! The gecko-ffi feature will not work if you aren't linking with code that has nsTArray
-+//! defined. Specifically, we must share the symbol for nsTArray's empty singleton. You will get
-+//! linking errors if that isn't defined.
-+//!
-+//! The gecko-ffi feature also limits ThinVec to the legacy behaviors of nsTArray. Most notably,
-+//! nsTArray has a maximum capacity of i32::MAX (~2.1 billion items). Probably not an issue.
-+//! Probably.
-+//!
-+//! [pinned]: https://doc.rust-lang.org/std/pin/index.html
- 
- use std::{fmt, io, ptr, mem, slice};
- use std::collections::Bound;
- use std::iter::FromIterator;
- use std::slice::IterMut;
--use std::ops::{Deref, DerefMut};
-+use std::ops::{Deref, DerefMut, RangeBounds};
- use std::marker::PhantomData;
-+use std::alloc::*;
- use std::cmp::*;
- use std::hash::*;
- use std::borrow::*;
--use range::RangeArgument;
- use std::ptr::NonNull;
- 
--// Heap shimming because reasons. This doesn't unfortunately match the heap api
--// right now because reasons.
--mod heap;
-+use impl_details::*;
- 
--#[cfg(not(feature = "gecko-ffi"))]
--type SizeType = usize;
--#[cfg(feature = "gecko-ffi")]
--type SizeType = u32;
--
--#[cfg(feature = "gecko-ffi")]
--const AUTO_MASK: u32 = 1 << 31;
--#[cfg(feature = "gecko-ffi")]
--const CAP_MASK: u32 = !AUTO_MASK;
-+// modules: a simple way to cfg a whole bunch of impl details at once
- 
- #[cfg(not(feature = "gecko-ffi"))]
--const MAX_CAP: usize = !0;
--#[cfg(feature = "gecko-ffi")]
--const MAX_CAP: usize = i32::max_value() as usize;
-+mod impl_details {
-+    pub type SizeType = usize;
-+    pub const MAX_CAP: usize = !0;
- 
--#[cfg(not(feature = "gecko-ffi"))]
--#[inline(always)]
--fn assert_size(x: usize) -> SizeType { x }
-+    #[inline(always)]
-+    pub fn assert_size(x: usize) -> SizeType { x }
-+}
- 
- #[cfg(feature = "gecko-ffi")]
--#[inline]
--fn assert_size(x: usize) -> SizeType {
--    if x > MAX_CAP as usize {
--        panic!("nsTArray size may not exceed the capacity of a 32-bit sized int");
-+mod impl_details {
-+    // Support for briding a gecko nsTArray verbatim into a ThinVec.
-+    //
-+    // ThinVec can't see copy/move/delete implementations
-+    // from C++
-+    //
-+    // The actual layout of an nsTArray is:
-+    //
-+    // ```cpp
-+    // struct {
-+    //   uint32_t mLength;
-+    //   uint32_t mCapacity: 31;
-+    //   uint32_t mIsAutoArray: 1;
-+    // }
-+    // ```
-+    //
-+    // Rust doesn't natively support bit-fields, so we manually mask
-+    // and shift the bit. When the "auto" bit is set, the header and buffer
-+    // are actually on the stack, meaning the ThinVec pointer-to-header
-+    // is essentially an "owned borrow", and therefore dangerous to handle.
-+    // There are no safety guards for this situation.
-+    //
-+    // On little-endian platforms, the auto bit will be the high-bit of
-+    // our capacity u32. On big-endian platforms, it will be the low bit.
-+    // Hence we need some platform-specific CFGs for the necessary masking/shifting.
-+    // 
-+    // ThinVec won't ever construct an auto array. They only happen when
-+    // bridging from C++. This means we don't need to ever set/preserve the bit.
-+    // We just need to be able to read and handle it if it happens to be there.
-+    //
-+    // Handling the auto bit mostly just means not freeing/reallocating the buffer.
-+
-+    pub type SizeType = u32;
-+
-+    pub const MAX_CAP: usize = i32::max_value() as usize;
-+
-+    // Little endian: the auto bit is the high bit, and the capacity is
-+    // verbatim. So we just need to mask off the high bit. Note that
-+    // this masking is unnecessary when packing, because assert_size
-+    // guards against the high bit being set.
-+    #[cfg(target_endian = "little")]
-+    pub fn pack_capacity(cap: SizeType) -> SizeType {
-+        cap as SizeType
-+    }
-+    #[cfg(target_endian = "little")]
-+    pub fn unpack_capacity(cap: SizeType) -> usize {
-+        (cap as usize) & !(1 << 31)
-+    }
-+    #[cfg(target_endian = "little")]
-+    pub fn is_auto(cap: SizeType) -> bool {
-+        (cap & (1 << 31)) != 0
-+    }
-+
-+    // Big endian: the auto bit is the low bit, and the capacity is
-+    // shifted up one bit. Masking out the auto bit is unnecessary,
-+    // as rust shifts always shift in 0's for unsigned integers.
-+    #[cfg(target_endian = "big")]
-+    pub fn pack_capacity(cap: SizeType) -> SizeType {
-+        (cap as SizeType) << 1
-+    }
-+    #[cfg(target_endian = "big")]
-+    pub fn unpack_capacity(cap: SizeType) -> usize {
-+        (cap >> 1) as usize
-+    }
-+    #[cfg(target_endian = "big")]
-+    pub fn is_auto(cap: SizeType) -> bool {
-+        (cap & 1) != 0
-+    }
-+
-+    #[inline]
-+    pub fn assert_size(x: usize) -> SizeType {
-+        if x > MAX_CAP as usize {
-+            panic!("nsTArray size may not exceed the capacity of a 32-bit sized int");
-+        }
-+        x as SizeType
-     }
--    x as SizeType
-+
- }
- 
--/// The header of a ThinVec
-+/// The header of a ThinVec.
-+///
-+/// The _cap can be a bitfield, so use accessors to avoid trouble.
- #[repr(C)]
- struct Header {
-     _len: SizeType,
-@@ -56,38 +258,10 @@ impl Header {
-         self._len as usize
-     }
- 
--    #[cfg(feature = "gecko-ffi")]
--    fn cap(&self) -> usize {
--        (self._cap & CAP_MASK) as usize
--    }
--
--    #[cfg(not(feature = "gecko-ffi"))]
--    fn cap(&self) -> usize {
--        self._cap as usize
--    }
--
-     fn set_len(&mut self, len: usize) {
-         self._len = assert_size(len);
-     }
- 
--    #[cfg(feature = "gecko-ffi")]
--    fn set_cap(&mut self, cap: usize) {
--        debug_assert!(cap & (CAP_MASK as usize) == cap);
--        // FIXME: this is busted because it reads uninit memory
--        // debug_assert!(!self.uses_stack_allocated_buffer());
--        self._cap = assert_size(cap) & CAP_MASK;
--    }
--
--    #[cfg(feature = "gecko-ffi")]
--    fn uses_stack_allocated_buffer(&self) -> bool {
--        self._cap & AUTO_MASK != 0
--    }
--
--    #[cfg(not(feature = "gecko-ffi"))]
--    fn set_cap(&mut self, cap: usize) {
--        self._cap = assert_size(cap);
--    }
--
-     fn data<T>(&self) -> *mut T {
-         let header_size = mem::size_of::<Header>();
-         let padding = padding::<T>();
-@@ -105,6 +279,41 @@ impl Header {
-     }
- }
- 
-+
-+#[cfg(feature = "gecko-ffi")]
-+impl Header {
-+    fn cap(&self) -> usize {
-+        unpack_capacity(self._cap)
-+    }
-+
-+    fn set_cap(&mut self, cap: usize) {
-+        // debug check that our packing is working
-+        debug_assert_eq!(unpack_capacity(pack_capacity(cap as SizeType)), cap);
-+        // FIXME: this assert is busted because it reads uninit memory
-+        // debug_assert!(!self.uses_stack_allocated_buffer());
-+
-+        // NOTE: this always stores a cleared auto bit, because set_cap
-+        // is only invoked by Rust, and Rust doesn't create auto arrays.
-+        self._cap = pack_capacity(assert_size(cap));
-+    }
-+
-+    fn uses_stack_allocated_buffer(&self) -> bool {
-+        is_auto(self._cap)
-+    }
-+}
-+
-+#[cfg(not(feature = "gecko-ffi"))]
-+impl Header {
-+    fn cap(&self) -> usize {
-+        self._cap as usize
-+    }
-+
-+    fn set_cap(&mut self, cap: usize) {
-+        self._cap = assert_size(cap);
-+    }
-+}
-+
-+
- /// Singleton that all empty collections share.
- /// Note: can't store non-zero ZSTs, we allocate in that case. We could
- /// optimize everything to not do that (basically, make ptr == len and branch
-@@ -121,9 +330,7 @@ extern {
- 
- // TODO: overflow checks everywhere
- 
--// Utils
--
--fn oom() -> ! { std::process::abort() }
-+// Utils for computing layouts of allocations
- 
- fn alloc_size<T>(cap: usize) -> usize {
-     // Compute "real" header size with pointer math
-@@ -156,15 +363,22 @@ fn alloc_align<T>() -> usize {
-     max(mem::align_of::<T>(), mem::align_of::<Header>())
- }
- 
--fn header_with_capacity<T>(cap: usize) -> NonNull<Header> {
--    debug_assert!(cap > 0);
-+fn layout<T>(cap: usize) -> Layout {
-     unsafe {
--        let header = heap::allocate(
-+        Layout::from_size_align_unchecked(
-             alloc_size::<T>(cap),
-             alloc_align::<T>(),
--        ) as *mut Header;
-+        )
-+    }
-+}
- 
--        if header.is_null() { oom() }
-+fn header_with_capacity<T>(cap: usize) -> NonNull<Header> {
-+    debug_assert!(cap > 0);
-+    unsafe {
-+        let layout = layout::<T>(cap);
-+        let header = alloc(layout) as *mut Header;
-+
-+        if header.is_null() { handle_alloc_error(layout) }
- 
-         // "Infinite" capacity for zero-sized types:
-         (*header).set_cap(if mem::size_of::<T>() == 0 { MAX_CAP } else { cap });
-@@ -176,28 +390,8 @@ fn header_with_capacity<T>(cap: usize) -
- 
- 
- 
--/// ThinVec is exactly the same as Vec, except that it stores its `len` and `capacity` in the buffer
--/// it allocates.
--///
--/// This makes the memory footprint of ThinVecs lower; notably in cases where space is reserved for
--/// a non-existence ThinVec<T>. So `Vec<ThinVec<T>>` and `Option<ThinVec<T>>::None` will waste less
--/// space. Being pointer-sized also means it can be passed/stored in registers.
--///
--/// Of course, any actually constructed ThinVec will theoretically have a bigger allocation, but
--/// the fuzzy nature of allocators means that might not actually be the case.
--///
--/// Properties of Vec that are preserved:
--/// * `ThinVec::new()` doesn't allocate (it points to a statically allocated singleton)
--/// * reallocation can be done in place
--/// * `size_of::<ThinVec<T>>()` == `size_of::<Option<ThinVec<T>>>()`
--///   * NOTE: This is only possible when the `unstable` feature is used.
--///
--/// Properties of Vec that aren't preserved:
--/// * `ThinVec<T>` can't ever be zero-cost roundtripped to a `Box<[T]>`, `String`, or `*mut T`
--/// * `from_raw_parts` doesn't exist
--/// * ThinVec currently doesn't bother to not-allocate for Zero Sized Types (e.g. `ThinVec<()>`),
--///   but it could be done if someone cared enough to implement it.
--#[cfg_attr(feature = "gecko-ffi", repr(C))]
-+/// See the crate's top level documentation for a description of this type.
-+#[repr(C)]
- pub struct ThinVec<T> {
-     ptr: NonNull<Header>,
-     boo: PhantomData<T>,
-@@ -627,15 +821,15 @@ impl<T> ThinVec<T> {
-     }
- 
-     pub fn drain<R>(&mut self, range: R) -> Drain<T>
--        where R: RangeArgument<usize>
-+        where R: RangeBounds<usize>
-     {
-         let len = self.len();
--        let start = match range.start() {
-+        let start = match range.start_bound() {
-             Bound::Included(&n) => n,
-             Bound::Excluded(&n) => n + 1,
-             Bound::Unbounded => 0,
-         };
--        let end = match range.end() {
-+        let end = match range.end_bound() {
-             Bound::Included(&n) => n + 1,
-             Bound::Excluded(&n) => n,
-             Bound::Unbounded => len,
-@@ -666,9 +860,10 @@ impl<T> ThinVec<T> {
- 
-     unsafe fn deallocate(&mut self) {
-         if self.has_allocation() {
--            heap::deallocate(self.ptr() as *mut u8,
--                alloc_size::<T>(self.capacity()),
--                alloc_align::<T>());
-+            dealloc(
-+                self.ptr() as *mut u8,
-+                layout::<T>(self.capacity()),
-+            )
-         }
-     }
- 
-@@ -678,15 +873,36 @@ impl<T> ThinVec<T> {
-         debug_assert!(new_cap > 0);
-         if self.has_allocation() {
-             let old_cap = self.capacity();
--            let ptr = heap::reallocate(self.ptr() as *mut u8,
--                                       alloc_size::<T>(old_cap),
--                                       alloc_size::<T>(new_cap),
--                                       alloc_align::<T>()) as *mut Header;
--            if ptr.is_null() { oom() }
-+            let ptr = realloc(
-+                self.ptr() as *mut u8,
-+                layout::<T>(old_cap),
-+                alloc_size::<T>(new_cap),
-+            ) as *mut Header;
-+
-+            if ptr.is_null() { handle_alloc_error(layout::<T>(new_cap)) }
-             (*ptr).set_cap(new_cap);
-             self.ptr = NonNull::new_unchecked(ptr);
-         } else {
--            self.ptr = header_with_capacity::<T>(new_cap);
-+            let mut new_header = header_with_capacity::<T>(new_cap);
-+
-+            // If we get here and have a non-zero len, then we must be handling
-+            // a gecko auto array, and we have items in a stack buffer. We shouldn't
-+            // free it, but we should memcopy the contents out of it and mark it as empty.
-+            //
-+            // T is assumed to be trivially relocatable, as this is ~required
-+            // for Rust compatibility anyway. Furthermore, we assume C++ won't try
-+            // to unconditionally destroy the contents of the stack allocated buffer
-+            // (i.e. it's obfuscated behind a union).
-+            //
-+            // In effect, we are partially reimplementing the auto array move constructor
-+            // by leaving behind a valid empty instance.
-+            let len = self.len();
-+            if cfg!(feature = "gecko-ffi") && len > 0 {
-+                new_header.as_mut().data::<T>().copy_from_nonoverlapping(self.data_raw(), len);
-+                self.set_len(0);
-+            }
-+            
-+            self.ptr = new_header;
-         }
-     }
- 
-@@ -1087,10 +1303,7 @@ mod tests {
-         use std::mem::size_of;
-         assert_eq!(size_of::<ThinVec<u8>>(), size_of::<&u8>());
- 
--        // We don't perform the null-pointer optimization on stable rust.
--        if cfg!(feature = "unstable") {
--            assert_eq!(size_of::<Option<ThinVec<u8>>>(), size_of::<&u8>());
--        }
-+        assert_eq!(size_of::<Option<ThinVec<u8>>>(), size_of::<&u8>());
-     }
- 
-     #[test]
-@@ -1725,7 +1938,6 @@ mod std_tests {
-         assert_eq!(v, &[(), ()]);
-     }
- 
--/* TODO: support inclusive ranges
-     #[test]
-     fn test_drain_inclusive_range() {
-         let mut v = thin_vec!['a', 'b', 'c', 'd', 'e'];
-@@ -1755,6 +1967,7 @@ mod std_tests {
-     }
- 
-     #[test]
-+    #[cfg(not(feature = "gecko-ffi"))]
-     fn test_drain_max_vec_size() {
-         let mut v = ThinVec::<()>::with_capacity(usize::max_value());
-         unsafe { v.set_len(usize::max_value()); }
-@@ -1775,7 +1988,6 @@ mod std_tests {
-         let mut v = thin_vec![1, 2, 3, 4, 5];
-         v.drain(5..=5);
-     }
--*/
- 
- /* TODO: implement splice?
-     #[test]
-@@ -2181,7 +2393,7 @@ mod std_tests {
-         assert!(v.capacity() >= 33)
-     }
- 
--/* TODO: implement try_reserve 
-+/* TODO: implement try_reserve
-     #[test]
-     fn test_try_reserve() {
- 
-diff -up firefox-78.1.0/third_party/rust/thin-vec/src/range.rs.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/src/range.rs
-diff -up firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml
---- firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:29.000000000 +0200
-+++ firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml	2020-08-17 17:04:24.135598590 +0200
-@@ -8,5 +8,5 @@ nserror = { path = "../../../xpcom/rust/
- nsstring = { path = "../../../xpcom/rust/nsstring" }
- rental = "0.5.5"
- rust_cascade = "0.6.0"
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
- xpcom = { path = "../../../xpcom/rust/xpcom" }
-diff -up firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml
---- firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:30.000000000 +0200
-+++ firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml	2020-08-17 17:04:24.135598590 +0200
-@@ -13,7 +13,7 @@ moz_task = { path = "../../../../../xpco
- nserror = { path = "../../../../../xpcom/rust/nserror" }
- nsstring = { path = "../../../../../xpcom/rust/nsstring" }
- once_cell = "1"
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
- xpcom = { path = "../../../../../xpcom/rust/xpcom" }
- serde = "1"
- serde_json = "1"
-diff -up firefox-78.1.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/kvstore/Cargo.toml
---- firefox-78.1.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:30.000000000 +0200
-+++ firefox-78.1.0/toolkit/components/kvstore/Cargo.toml	2020-08-17 17:04:24.135598590 +0200
-@@ -18,7 +18,7 @@ rkv = "0.10.2"
- storage_variant = { path = "../../../storage/variant" }
- xpcom = { path = "../../../xpcom/rust/xpcom" }
- tempfile = "3"
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
- 
- # Get rid of failure's dependency on backtrace. Eventually
- # backtrace will move into Rust core, but we don't need it here.
-diff -up firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml
---- firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:30.000000000 +0200
-+++ firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml	2020-08-17 17:04:24.135598590 +0200
-@@ -19,5 +19,5 @@ url = "2.0"
- xpcom = { path = "../../../../xpcom/rust/xpcom" }
- 
- [dependencies.thin-vec]
--version = "0.1.0"
-+version = "0.2.1"
- features = ["gecko-ffi"]
-diff -up firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml
---- firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:30.000000000 +0200
-+++ firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml	2020-08-17 17:04:24.135598590 +0200
-@@ -23,7 +23,7 @@ features = ["endian_fd", "elf32", "elf64
- default-features = false
- 
- [dependencies.thin-vec]
--version = "0.1.0"
-+version = "0.2.1"
- features = ["gecko-ffi"]
- 
- [features]
-diff -up firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml
---- firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml.D87019-thin-vec-big-endian.diff	2020-07-22 17:56:30.000000000 +0200
-+++ firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml	2020-08-17 17:04:24.136598593 +0200
-@@ -9,4 +9,4 @@ nsstring = { path = "../nsstring" }
- nserror = { path = "../nserror" }
- threadbound = "0.1"
- xpcom_macros = { path = "xpcom_macros" }
--thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
-+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }

SOURCES/build-big-endian-errors.patch

@@ -0,0 +1,57 @@
+diff -up firefox-102.0/third_party/libwebrtc/common_audio/wav_file.cc.big-endian-errors firefox-102.0/third_party/libwebrtc/common_audio/wav_file.cc
+--- firefox-102.0/third_party/libwebrtc/common_audio/wav_file.cc.big-endian-errors	2022-08-17 13:19:53.056891028 +0200
++++ firefox-102.0/third_party/libwebrtc/common_audio/wav_file.cc	2022-08-17 13:19:57.251879556 +0200
+@@ -89,9 +89,6 @@ void WavReader::Reset() {
+ 
+ size_t WavReader::ReadSamples(const size_t num_samples,
+                               int16_t* const samples) {
+-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
+-#error "Need to convert samples to big-endian when reading from WAV file"
+-#endif
+ 
+   size_t num_samples_left_to_read = num_samples;
+   size_t next_chunk_start = 0;
+@@ -129,9 +126,6 @@ size_t WavReader::ReadSamples(const size
+ }
+ 
+ size_t WavReader::ReadSamples(const size_t num_samples, float* const samples) {
+-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
+-#error "Need to convert samples to big-endian when reading from WAV file"
+-#endif
+ 
+   size_t num_samples_left_to_read = num_samples;
+   size_t next_chunk_start = 0;
+@@ -213,9 +207,6 @@ WavWriter::WavWriter(FileWrapper file,
+ }
+ 
+ void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) {
+-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
+-#error "Need to convert samples to little-endian when writing to WAV file"
+-#endif
+ 
+   for (size_t i = 0; i < num_samples; i += kMaxChunksize) {
+     const size_t num_remaining_samples = num_samples - i;
+@@ -243,9 +234,6 @@ void WavWriter::WriteSamples(const int16
+ }
+ 
+ void WavWriter::WriteSamples(const float* samples, size_t num_samples) {
+-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
+-#error "Need to convert samples to little-endian when writing to WAV file"
+-#endif
+ 
+   for (size_t i = 0; i < num_samples; i += kMaxChunksize) {
+     const size_t num_remaining_samples = num_samples - i;
+diff -up firefox-102.0/third_party/libwebrtc/common_audio/wav_header.cc.big-endian-errors firefox-102.0/third_party/libwebrtc/common_audio/wav_header.cc
+--- firefox-102.0/third_party/libwebrtc/common_audio/wav_header.cc.big-endian-errors	2022-08-17 13:18:04.688187393 +0200
++++ firefox-102.0/third_party/libwebrtc/common_audio/wav_header.cc	2022-08-17 13:18:22.451138816 +0200
+@@ -26,10 +26,6 @@
+ namespace webrtc {
+ namespace {
+ 
+-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
+-#error "Code not working properly for big endian platforms."
+-#endif
+-
+ #pragma pack(2)
+ struct ChunkHeader {
+   uint32_t ID;

SOURCES/build-disable-elfhack.patch

@@ -0,0 +1,12 @@
+diff -up firefox-115.0.2/toolkit/moz.configure.disable-elfhack firefox-115.0.2/toolkit/moz.configure
+--- firefox-115.0.2/toolkit/moz.configure.disable-elfhack	2023-07-18 12:21:22.507358334 +0200
++++ firefox-115.0.2/toolkit/moz.configure	2023-07-18 12:52:55.972727498 +0200
+@@ -1520,7 +1520,7 @@ with only_when("--enable-compile-environ
+                     "Cannot enable elfhack with lld."
+                     " Use --enable-linker=bfd, --enable-linker=gold, or --disable-elf-hack"
+                 )
+-            return True
++            return False
+ 
+         set_config("USE_ELF_HACK", use_elf_hack)
+ 

SOURCES/build-icu-make.patch

@@ -1,13 +0,0 @@
-diff -up firefox-68.8.0/intl/icu_sources_data.py.icu-makefile firefox-68.8.0/intl/icu_sources_data.py
---- firefox-68.8.0/intl/icu_sources_data.py.icu-makefile	2020-05-11 17:00:03.642605718 +0200
-+++ firefox-68.8.0/intl/icu_sources_data.py	2020-05-11 17:00:37.774642749 +0200
-@@ -246,8 +246,7 @@ def update_data_file(topsrcdir):
-     if not try_run(
-             'icu-make',
-             ['make',
--             '--jobs=%d' % multiprocessing.cpu_count(),
--             '--output-sync'],
-+             '--jobs=1'],
-             cwd=objdir):
-         return False
-     print('Copying ICU data file...')

SOURCES/build-mozconfig-fix.patch

@@ -1,12 +0,0 @@
-diff -up mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/python/mozbuild/mozbuild/mozconfig.py.mozconfig-fix mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/python/mozbuild/mozbuild/mozconfig.py
---- mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/python/mozbuild/mozbuild/mozconfig.py.mozconfig-fix	2018-03-13 17:22:19.018466884 +0100
-+++ mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/python/mozbuild/mozbuild/mozconfig.py	2018-03-13 17:23:57.379559640 +0100
-@@ -446,7 +446,7 @@ class MozconfigLoader(object):
-                             value = value[1:]
- 
-                         # Lines with a quote not ending in a quote are multi-line.
--                        if has_quote and not value.endswith("'"):
-+                        if has_quote and not value.endswith(("'", ";")):
-                             in_variable = name
-                             current.append(value)
-                             continue

SOURCES/build-nss-version.patch

@@ -1,12 +0,0 @@
-diff -up firefox-68.3.0/old-configure.in.nss-version firefox-68.3.0/old-configure.in
---- firefox-68.3.0/old-configure.in.nss-version	2019-11-27 19:48:01.045677621 +0100
-+++ firefox-68.3.0/old-configure.in	2019-11-27 19:59:52.856894047 +0100
-@@ -1537,7 +1537,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
-     _USE_SYSTEM_NSS=1 )
- 
- if test -n "$_USE_SYSTEM_NSS"; then
--    AM_PATH_NSS(3.44.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
-+    AM_PATH_NSS(3.44.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"

SOURCES/build-ppc64-abiv2.patch

@@ -0,0 +1,12 @@
+diff -up firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s.ppc-abiv2 firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s
+--- firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s.ppc-abiv2	2023-07-25 09:01:42.602375809 +0200
++++ firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s	2023-07-25 09:01:48.273373924 +0200
+@@ -3,7 +3,7 @@
+ # See the full LICENSE under scripts/.
+ 
+ .machine	"any"
+-.abiversion	2
++.abiversion	1
+ .text
+ 
+ .globl	sha512_block_p8

SOURCES/build-ppc64le-inline.patch

@@ -1,27 +0,0 @@
-diff -up firefox-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp.ppc64le-inline firefox-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp
---- firefox-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp.ppc64le-inline	2019-08-26 18:52:28.000000000 +0200
-+++ firefox-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp	2019-08-29 08:49:57.695687874 +0200
-@@ -1092,7 +1092,11 @@ class MOZ_STACK_CLASS CallMethodHelper f
-   MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex,
-                                            MutableHandleValue srcp) const;
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+  bool GatherAndConvertResults();
-+#else
-   MOZ_ALWAYS_INLINE bool GatherAndConvertResults();
-+#endif
- 
-   MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath();
- 
-@@ -1139,7 +1143,11 @@ class MOZ_STACK_CLASS CallMethodHelper f
- 
-   ~CallMethodHelper();
- 
-+#if (__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN)
-+  bool Call();
-+#else
-   MOZ_ALWAYS_INLINE bool Call();
-+#endif
- 
-   // Trace implementation so we can put our CallMethodHelper in a Rooted<T>.
-   void trace(JSTracer* aTrc);

SOURCES/build-rhel7-lower-node-min-version.patch

@@ -0,0 +1,11 @@
+--- firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version	2024-02-12 21:53:56.000000000 +0200
++++ firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py	2024-02-14 16:48:12.476182627 +0200
+@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
+ from packaging.version import Version
+ from six import PY3
+ 
+-NODE_MIN_VERSION = Version("12.22.12")
++NODE_MIN_VERSION = Version("10.24.0")
+ NPM_MIN_VERSION = Version("6.14.16")
+ 
+ 

SOURCES/build-rhel7-nasm-dwarf.patch

@@ -0,0 +1,12 @@
+diff -up firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py.rhel7-nasm firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py
+--- firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py.rhel7-nasm	2021-08-31 08:02:10.814740774 +0200
++++ firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py	2021-08-31 08:04:03.967146994 +0200
+@@ -420,7 +420,7 @@ class AsmFlags(BaseCompileFlags):
+                 if self._context.config.substs.get("OS_ARCH") == "WINNT":
+                     debug_flags += ["-F", "cv8"]
+                 elif self._context.config.substs.get("OS_ARCH") != "Darwin":
+-                    debug_flags += ["-F", "dwarf"]
++                    debug_flags += ["-f", "elf32"]
+             elif (
+                 self._context.config.substs.get("OS_ARCH") == "WINNT"
+                 and self._context.config.substs.get("CPU_ARCH") == "aarch64"

SOURCES/build-tb-rnp-openssl.patch

@@ -0,0 +1,12 @@
+diff -up thunderbird-115.1.0/comm/third_party/rnp/moz.build.rnp-openssl thunderbird-115.1.0/comm/third_party/rnp/moz.build
+--- thunderbird-115.1.0/comm/third_party/rnp/moz.build.rnp-openssl	2023-08-07 16:38:39.272780256 +0200
++++ thunderbird-115.1.0/comm/third_party/rnp/moz.build	2023-08-07 16:38:42.822780087 +0200
+@@ -93,7 +93,7 @@ elif CONFIG["MZLA_LIBRNP_BACKEND"] == "o
+         # Supported, but not with RHEL's OpenSSL, disabled for now;
+         "ENABLE_BRAINPOOL": False,
+     })
+-    rnp_defines["PACKAGE_STRING"] = rnp_defines["PACKAGE_STRING"][:-1] + '-openssl"'
++    #rnp_defines["PACKAGE_STRING"] = rnp_defines["PACKAGE_STRING"][:-1] + '-openssl"'
+     if CONFIG["MZLA_LIBRNP_OPENSSL_VERSION"][0] == "3":
+         rnp_defines["CRYPTO_BACKEND_OPENSSL3"] = True
+ 

SOURCES/disable-openpgp-in-thunderbird.patch

@@ -1,28 +1,12 @@
-diff --git a/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm b/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
---- a/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
-+++ b/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
-@@ -53,20 +53,23 @@ var BondOpenPGP = {
- 
-   // if null, we haven't yet read the pref
-   // if true, pref was enabled and we already triggered init
-   _isEnabled: null,
- 
+diff -up thunderbird-102.2.1/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm.disable-openpgp-in-thunderbird thunderbird-102.2.1/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
+--- thunderbird-102.2.1/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm.disable-openpgp-in-thunderbird	2022-09-12 14:33:54.995339932 +0200
++++ thunderbird-102.2.1/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm	2022-09-12 14:39:26.784999636 +0200
+@@ -51,6 +51,8 @@ var BondOpenPGP = {
    _alreadyTriedInit: false, // if already true, we will not try again
  
-   setIsEnabledFromPref() {
--    this._isEnabled = Services.prefs.getBoolPref("mail.openpgp.enable");
-+    return false;
-+    //this._isEnabled = Services.prefs.getBoolPref("mail.openpgp.enable");
-   },
- 
    async init() {
++    // We don't have support for the opengpg in rhel ATM.
 +    return;
-+
-     if (!MailConstants.MOZ_OPENPGP) {
+     if (this._alreadyTriedInit) {
+       // We have previously attempted to init, don't try again.
        return;
-     }
- 
-     // We never shut off after pref change, disabling requires restart.
-     // If null, it means we're here for the first time, read the pref.
-     // If false, it could mean the pref was now turned on at runtime.
-     // In both scenarios, null and false, we reread the pref to check

SOURCES/expat-CVE-2023-52425.patch

@@ -0,0 +1,375 @@
+# erAck: backport of expat CVE-2023-52425 DoS fix
+# https://github.com/libexpat/libexpat/commit/34b598c5f594b015c513c73f06e7ced3323edbf1
+#
+--- thunderbird-115.9.0/parser/expat/lib/expat.h.expat-CVE-2023-52425	2024-03-11 20:36:11.000000000 +0100
++++ thunderbird-115.9.0/parser/expat/lib/expat.h	2024-03-13 20:46:45.648505015 +0100
+@@ -1045,6 +1045,10 @@ XMLPARSEAPI(const XML_Feature *)
+ XML_GetFeatureList(void);
+ 
+ 
++/* Added in Expat 2.6.0. */
++XMLPARSEAPI(XML_Bool)
++XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
++
+ /* Expat follows the semantic versioning convention.
+    See http://semver.org.
+ */
+--- thunderbird-115.9.0/parser/expat/lib/internal.h.expat-CVE-2023-52425	2024-03-11 20:36:11.000000000 +0100
++++ thunderbird-115.9.0/parser/expat/lib/internal.h	2024-03-14 00:14:39.334319725 +0100
+@@ -80,6 +80,7 @@
+ # endif
+ #endif
+ 
++#include "expat.h" // so we can use type XML_Parser below
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -90,6 +91,9 @@ void
+ align_limit_to_full_utf8_characters(const char * from, const char ** fromLimRef);
+ 
+ 
++extern XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c
++extern unsigned int g_parseAttempts;             // used for testing only
++
+ #ifdef __cplusplus
+ }
+ #endif
+--- thunderbird-115.9.0/parser/expat/lib/xmlparse.c.expat-CVE-2023-52425	2024-03-11 20:36:11.000000000 +0100
++++ thunderbird-115.9.0/parser/expat/lib/xmlparse.c	2024-03-13 22:55:14.844756009 +0100
+@@ -6,6 +6,7 @@
+ 
+ #define _GNU_SOURCE                     /* syscall prototype */
+ 
++#include <stdbool.h>
+ #include <stddef.h>
+ #include <string.h>                     /* memset(), memcpy() */
+ #include <assert.h>
+@@ -89,6 +90,9 @@ typedef char ICHAR;
+ /* Round up n to be a multiple of sz, where sz is a power of 2. */
+ #define ROUND_UP(n, sz) (((n) + ((sz) - 1)) & ~((sz) - 1))
+ 
++/* Do safe (NULL-aware) pointer arithmetic */
++#define EXPAT_SAFE_PTR_DIFF(p, q) (((p) && (q)) ? ((p) - (q)) : 0)
++
+ /* Handle the case where memmove() doesn't exist. */
+ #ifndef HAVE_MEMMOVE
+ #ifdef HAVE_BCOPY
+@@ -98,6 +102,8 @@ typedef char ICHAR;
+ #endif /* HAVE_BCOPY */
+ #endif /* HAVE_MEMMOVE */
+ 
++#define EXPAT_MIN(a, b) (((a) < (b)) ? (a) : (b))
++
+ #include "internal.h"
+ #include "xmltok.h"
+ #include "xmlrole.h"
+@@ -476,6 +482,9 @@ parserInit(XML_Parser parser, const XML_
+    ? 0 \
+    : ((*((pool)->ptr)++ = c), 1))
+ 
++XML_Bool g_reparseDeferralEnabledDefault = XML_TRUE; // write ONLY in runtests.c
++unsigned int g_parseAttempts = 0;                    // used for testing only
++
+ struct XML_ParserStruct {
+   /* The first member must be userData so that the XML_GetUserData
+      macro works. */
+@@ -491,6 +500,9 @@ struct XML_ParserStruct {
+   const char *m_bufferLim;
+   XML_Index m_parseEndByteIndex;
+   const char *m_parseEndPtr;
++  size_t m_partialTokenBytesBefore; /* used in heuristic to avoid O(n^2) */
++  XML_Bool m_reparseDeferralEnabled;
++  int m_lastBufferRequestSize;
+   XML_Char *m_dataBuf;
+   XML_Char *m_dataBufEnd;
+   XML_StartElementHandler m_startElementHandler;
+@@ -647,6 +659,9 @@ struct XML_ParserStruct {
+ #define bufferEnd (parser->m_bufferEnd)
+ #define parseEndByteIndex (parser->m_parseEndByteIndex)
+ #define parseEndPtr (parser->m_parseEndPtr)
++#define partialTokenBytesBefore (parser->m_partialTokenBytesBefore)
++#define reparseDeferralEnabled (parser->m_reparseDeferralEnabled)
++#define lastBufferRequestSize (parser->m_lastBufferRequestSize)
+ #define bufferLim (parser->m_bufferLim)
+ #define dataBuf (parser->m_dataBuf)
+ #define dataBufEnd (parser->m_dataBufEnd)
+@@ -887,6 +902,47 @@ get_hash_secret_salt(XML_Parser parser)
+   return parser->m_hash_secret_salt;
+ }
+ 
++static enum XML_Error
++callProcessor(XML_Parser parser, const char *start, const char *end,
++              const char **endPtr) {
++  const size_t have_now = EXPAT_SAFE_PTR_DIFF(end, start);
++
++  if (parser->m_reparseDeferralEnabled
++      && ! parser->m_parsingStatus.finalBuffer) {
++    // Heuristic: don't try to parse a partial token again until the amount of
++    // available data has increased significantly.
++    const size_t had_before = parser->m_partialTokenBytesBefore;
++    // ...but *do* try anyway if we're close to causing a reallocation.
++    size_t available_buffer
++        = EXPAT_SAFE_PTR_DIFF(parser->m_bufferPtr, parser->m_buffer);
++#if XML_CONTEXT_BYTES > 0
++    available_buffer -= EXPAT_MIN(available_buffer, XML_CONTEXT_BYTES);
++#endif
++    available_buffer
++        += EXPAT_SAFE_PTR_DIFF(parser->m_bufferLim, parser->m_bufferEnd);
++    // m_lastBufferRequestSize is never assigned a value < 0, so the cast is ok
++    const bool enough
++        = (have_now >= 2 * had_before)
++          || ((size_t)parser->m_lastBufferRequestSize > available_buffer);
++
++    if (! enough) {
++      *endPtr = start; // callers may expect this to be set
++      return XML_ERROR_NONE;
++    }
++  }
++  g_parseAttempts += 1;
++  const enum XML_Error ret = parser->m_processor(parser, start, end, endPtr);
++  if (ret == XML_ERROR_NONE) {
++    // if we consumed nothing, remember what we had on this parse attempt.
++    if (*endPtr == start) {
++      parser->m_partialTokenBytesBefore = have_now;
++    } else {
++      parser->m_partialTokenBytesBefore = 0;
++    }
++  }
++  return ret;
++}
++
+ static XML_Bool  /* only valid for root parser */
+ startParsing(XML_Parser parser)
+ {
+@@ -1075,6 +1131,9 @@ parserInit(XML_Parser parser, const XML_
+   bufferEnd = buffer;
+   parseEndByteIndex = 0;
+   parseEndPtr = NULL;
++  partialTokenBytesBefore = 0;
++  reparseDeferralEnabled = g_reparseDeferralEnabledDefault;
++  lastBufferRequestSize = 0;
+   declElementType = NULL;
+   declAttributeId = NULL;
+   declEntity = NULL;
+@@ -1232,6 +1291,7 @@ XML_ExternalEntityParserCreate(XML_Parse
+      to worry which hash secrets each table has.
+   */
+   unsigned long oldhash_secret_salt;
++  XML_Bool oldReparseDeferralEnabled;
+ 
+   /* Validate the oldParser parameter before we pull everything out of it */
+   if (oldParser == NULL)
+@@ -1276,6 +1336,7 @@ XML_ExternalEntityParserCreate(XML_Parse
+      to worry which hash secrets each table has.
+   */
+   oldhash_secret_salt = hash_secret_salt;
++  oldReparseDeferralEnabled = reparseDeferralEnabled;
+ 
+ #ifdef XML_DTD
+   if (!context)
+@@ -1330,6 +1391,7 @@ XML_ExternalEntityParserCreate(XML_Parse
+   defaultExpandInternalEntities = oldDefaultExpandInternalEntities;
+   ns_triplets = oldns_triplets;
+   hash_secret_salt = oldhash_secret_salt;
++  reparseDeferralEnabled = oldReparseDeferralEnabled;
+   parentParser = oldParser;
+ #ifdef XML_DTD
+   paramEntityParsing = oldParamEntityParsing;
+@@ -1850,39 +1912,8 @@ XML_Parse(XML_Parser parser, const char
+     ps_parsing = XML_PARSING;
+   }
+ 
+-  if (len == 0) {
+-    ps_finalBuffer = (XML_Bool)isFinal;
+-    if (!isFinal)
+-      return XML_STATUS_OK;
+-    positionPtr = bufferPtr;
+-    parseEndPtr = bufferEnd;
+-
+-    /* If data are left over from last buffer, and we now know that these
+-       data are the final chunk of input, then we have to check them again
+-       to detect errors based on that fact.
+-    */
+-    errorCode = processor(parser, bufferPtr, parseEndPtr, &bufferPtr);
+-
+-    if (errorCode == XML_ERROR_NONE) {
+-      switch (ps_parsing) {
+-      case XML_SUSPENDED:
+-        XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
+-        positionPtr = bufferPtr;
+-        return XML_STATUS_SUSPENDED;
+-      case XML_INITIALIZED:
+-      case XML_PARSING:
+-        ps_parsing = XML_FINISHED;
+-        /* fall through */
+-      default:
+-        return XML_STATUS_OK;
+-      }
+-    }
+-    eventEndPtr = eventPtr;
+-    processor = errorProcessor;
+-    return XML_STATUS_ERROR;
+-  }
+ #ifndef XML_CONTEXT_BYTES
+-  else if (bufferPtr == bufferEnd) {
++  if (bufferPtr == bufferEnd) {
+     const char *end;
+     int nLeftOver;
+     enum XML_Status result;
+@@ -1899,11 +1930,14 @@ XML_Parse(XML_Parser parser, const char
+        processor = errorProcessor;
+        return XML_STATUS_ERROR;
+     }
++    // though this isn't a buffer request, we assume that `len` is the app's
++    // preferred buffer fill size, and therefore save it here.
++    lastBufferRequestSize = len;
+     parseEndByteIndex += len;
+     positionPtr = s;
+     ps_finalBuffer = (XML_Bool)isFinal;
+ 
+-    errorCode = processor(parser, s, parseEndPtr = s + len, &end);
++    errorCode = callProcessor(parser, s, parseEndPtr = s + len, &end);
+ 
+     if (errorCode != XML_ERROR_NONE) {
+       eventEndPtr = eventPtr;
+@@ -1930,6 +1964,8 @@ XML_Parse(XML_Parser parser, const char
+     XmlUpdatePosition(encoding, positionPtr, end, &position);
+     nLeftOver = s + len - end;
+     if (nLeftOver) {
++#if 0
++// erAck: replace with XML_GetBuffer() below.
+       if (buffer == NULL || nLeftOver > bufferLim - buffer) {
+         /* avoid _signed_ integer overflow */
+         char *temp = NULL;
+@@ -1939,6 +1975,28 @@ XML_Parse(XML_Parser parser, const char
+                 ? (char *)MALLOC(bytesToAllocate)
+                 : (char *)REALLOC(buffer, bytesToAllocate));
+         }
++#endif
++#if 1
++// erAck: the original patch context had a call to XML_GetBuffer() instead:
++      // Back up and restore the parsing status to avoid XML_ERROR_SUSPENDED
++      // (and XML_ERROR_FINISHED) from XML_GetBuffer.
++      const enum XML_Parsing originalStatus = ps_parsing;
++      ps_parsing = XML_PARSING;
++      void *const temp = XML_GetBuffer(parser, nLeftOver);
++      ps_parsing = originalStatus;
++#endif
++      // GetBuffer may have overwritten this, but we want to remember what the
++      // app requested, not how many bytes were left over after parsing.
++      lastBufferRequestSize = len;
++#if 1
++      if (temp == NULL) {
++        // NOTE: parser->m_errorCode has already been set by XML_GetBuffer().
++        eventPtr = eventEndPtr = NULL;
++        processor = errorProcessor;
++        return XML_STATUS_ERROR;
++      }
++#endif
++#if 0
+         if (temp == NULL) {
+           errorCode = XML_ERROR_NO_MEMORY;
+           eventPtr = eventEndPtr = NULL;
+@@ -1948,6 +2006,7 @@ XML_Parse(XML_Parser parser, const char
+         buffer = temp;
+         bufferLim = buffer + bytesToAllocate;
+       }
++#endif
+       memcpy(buffer, end, nLeftOver);
+     }
+     bufferPtr = buffer;
+@@ -1959,15 +2018,14 @@ XML_Parse(XML_Parser parser, const char
+     return result;
+   }
+ #endif  /* not defined XML_CONTEXT_BYTES */
+-  else {
+-    void *buff = XML_GetBuffer(parser, len);
+-    if (buff == NULL)
+-      return XML_STATUS_ERROR;
+-    else {
+-      memcpy(buff, s, len);
+-      return XML_ParseBuffer(parser, len, isFinal);
+-    }
++  void *buff = XML_GetBuffer(parser, len);
++  if (buff == NULL)
++    return XML_STATUS_ERROR;
++  if (len > 0) {
++    assert(s != NULL); // make sure s==NULL && len!=0 was rejected above
++    memcpy(buff, s, len);
+   }
++  return XML_ParseBuffer(parser, len, isFinal);
+ }
+ 
+ enum XML_Status XMLCALL
+@@ -2001,7 +2059,7 @@ XML_ParseBuffer(XML_Parser parser, int l
+   parseEndByteIndex += len;
+   ps_finalBuffer = (XML_Bool)isFinal;
+ 
+-  errorCode = processor(parser, start, parseEndPtr, &bufferPtr);
++  errorCode = callProcessor(parser, start, parseEndPtr, &bufferPtr);
+ 
+   if (errorCode != XML_ERROR_NONE) {
+     eventEndPtr = eventPtr;
+@@ -2047,7 +2105,11 @@ XML_GetBuffer(XML_Parser parser, int len
+   default: ;
+   }
+ 
+-  if (len > bufferLim - bufferEnd) {
++  // whether or not the request succeeds, `len` seems to be the app's preferred
++  // buffer fill size; remember it.
++  lastBufferRequestSize = len;
++  if (len > EXPAT_SAFE_PTR_DIFF(bufferLim, bufferEnd)
++      || buffer == NULL) {
+ #ifdef XML_CONTEXT_BYTES
+     int keep;
+ #endif  /* defined XML_CONTEXT_BYTES */
+@@ -2063,7 +2125,9 @@ XML_GetBuffer(XML_Parser parser, int len
+       keep = XML_CONTEXT_BYTES;
+     neededSize += keep;
+ #endif  /* defined XML_CONTEXT_BYTES */
+-    if (neededSize  <= bufferLim - buffer) {
++    if (buffer && bufferPtr
++        && neededSize
++               <= EXPAT_SAFE_PTR_DIFF(bufferLim, buffer)) {
+ #ifdef XML_CONTEXT_BYTES
+       if (keep < bufferPtr - buffer) {
+         int offset = (int)(bufferPtr - buffer) - keep;
+@@ -2072,8 +2136,11 @@ XML_GetBuffer(XML_Parser parser, int len
+         bufferPtr -= offset;
+       }
+ #else
+-      memmove(buffer, bufferPtr, bufferEnd - bufferPtr);
+-      bufferEnd = buffer + (bufferEnd - bufferPtr);
++      memmove(buffer, bufferPtr,
++              EXPAT_SAFE_PTR_DIFF(bufferEnd, bufferPtr));
++      bufferEnd
++          = buffer
++            + EXPAT_SAFE_PTR_DIFF(bufferEnd, bufferPtr);
+       bufferPtr = buffer;
+ #endif  /* not defined XML_CONTEXT_BYTES */
+     }
+@@ -2171,7 +2238,7 @@ XML_ResumeParser(XML_Parser parser)
+   }
+   ps_parsing = XML_PARSING;
+ 
+-  errorCode = processor(parser, bufferPtr, parseEndPtr, &bufferPtr);
++  errorCode = callProcessor(parser, bufferPtr, parseEndPtr, &bufferPtr);
+ 
+   if (errorCode != XML_ERROR_NONE) {
+     eventEndPtr = eventPtr;
+@@ -2481,6 +2548,15 @@ MOZ_XML_ProcessingEntityValue(XML_Parser
+ }
+ /* END MOZILLA CHANGE */
+ 
++XML_Bool XMLCALL
++XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled) {
++  if (parser != NULL && (enabled == XML_TRUE || enabled == XML_FALSE)) {
++    parser->m_reparseDeferralEnabled = enabled;
++    return XML_TRUE;
++  }
++  return XML_FALSE;
++}
++
+ /* Initially tag->rawName always points into the parse buffer;
+    for those TAG instances opened while the current parse buffer was
+    processed, and not yet closed, we need to store tag->rawName in a more

SOURCES/fedora-shebang-build.patch

@@ -1,9 +0,0 @@
-diff -up firefox-73.0/build/unix/run-mozilla.sh.old firefox-73.0/build/unix/run-mozilla.sh
---- firefox-73.0/build/unix/run-mozilla.sh.old	2020-02-12 09:58:00.150895904 +0100
-+++ firefox-73.0/build/unix/run-mozilla.sh	2020-02-12 09:58:06.505860696 +0100
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/sh
- #
- # This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this

SOURCES/find-external-requires

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Finds requirements provided outside of the current file set
-
-filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
-
-provides=`echo $filelist | /usr/lib/rpm/find-provides`
-
-{
-for f in $filelist ; do
-	echo $f | /usr/lib/rpm/find-requires | while read req ; do
-		found=0
-		for p in $provides ; do
-			if [ "$req" = "$p" ]; then
-				found=1
-			fi
-		done
-		if [ "$found" = "0" ]; then
-			echo $req
-		fi
-	done
-done
-} | sort -u

SOURCES/firefox-debugedits-error.patch

@@ -1,50 +0,0 @@
-diff -up firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
-diff -up firefox-68.0/media/webrtc/trunk/Makefile.old firefox-68.0/media/webrtc/trunk/Makefile
-diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc.old firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc
---- firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc.old	2019-06-12 08:17:02.673268442 +0200
-+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc	2019-06-12 08:17:13.582328073 +0200
-@@ -21,7 +21,7 @@
-  *  be found in the AUTHORS file in the root of the source tree.
-  */
- 
--#include "modules/audio_processing//utility/ooura_fft.h"
-+#include "modules/audio_processing/utility/ooura_fft.h"
- 
- #include <math.h>
- 
-diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.old firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
---- firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.old	2019-06-12 08:17:36.671454285 +0200
-+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc	2019-06-12 08:17:46.989510679 +0200
-@@ -8,7 +8,7 @@
-  *  be found in the AUTHORS file in the root of the source tree.
-  */
- 
--#include "modules/audio_processing//utility/ooura_fft.h"
-+#include "modules/audio_processing/utility/ooura_fft.h"
- 
- #include <emmintrin.h>
- 
-diff -up firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c.old firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c
---- firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c.old	2019-06-12 08:16:15.673011534 +0200
-+++ firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c	2019-06-12 08:16:22.602049410 +0200
-@@ -17,7 +17,7 @@
- #include "aom_dsp/blend.h"
- #include "aom/aom_integer.h"
- #include "aom_dsp/x86/synonyms.h"
--#include "aom_dsp/x86//masked_sad_intrin_ssse3.h"
-+#include "aom_dsp/x86/masked_sad_intrin_ssse3.h"
- 
- static INLINE unsigned int masked_sad32xh_avx2(
-     const uint8_t *src_ptr, int src_stride, const uint8_t *a_ptr, int a_stride,
-diff -up firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c.old firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c
---- firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c.old	2019-06-12 08:16:35.404119384 +0200
-+++ firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c	2019-06-12 08:16:43.415163174 +0200
-@@ -19,7 +19,7 @@
- #include "aom/aom_integer.h"
- #include "aom_dsp/x86/synonyms.h"
- 
--#include "aom_dsp/x86//masked_sad_intrin_ssse3.h"
-+#include "aom_dsp/x86/masked_sad_intrin_ssse3.h"
- 
- // For width a multiple of 16
- static INLINE unsigned int masked_sad_ssse3(const uint8_t *src_ptr,

SOURCES/firefox-gcc-build.patch

@@ -0,0 +1,38 @@
+--- 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);
+     }
+

SOURCES/firefox-nss-addon-hack.patch

@@ -0,0 +1,19 @@
+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) {

SOURCES/firefox-pipewire-0-3.patch

@@ -1,846 +0,0 @@
-diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 2081d0c683a4..641133bf1ea4 100644
---- a/config/system-headers.mozbuild
-+++ b/config/system-headers.mozbuild
-@@ -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 --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
-index ba885217b3ba..201d3b755221 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
-@@ -158,7 +158,7 @@ if (rtc_include_tests) {
- if (is_linux) {
-   if (rtc_use_pipewire) {
-     pkg_config("pipewire") {
--      packages = [ "libpipewire-0.2" ]
-+      packages = [ "libpipewire-0.3" ]
- 
-       defines = [ "WEBRTC_USE_PIPEWIRE" ]
-     }
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-index 90b40431c7e4..d844aa79d591 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-@@ -194,6 +194,30 @@ 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.3",
-+        "glib-2.0",
-+        "gio-2.0",
-+        "gobject-2.0"
-+    ]
-+
-+    CXXFLAGS += CONFIG['TK_CFLAGS']
-+    CXXFLAGS += [ "-I/usr/include/pipewire-0.3" ]
-+    CXXFLAGS += [ "-I/usr/include/spa-0.2" ]
-+
-+    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 --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
-index 1eb8ead26efa..316468eed1fc 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
-@@ -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
- };
- 
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-index 379341c833de..76349f1fbd4d 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-@@ -15,8 +15,11 @@
- 
- #include <spa/param/format-utils.h>
- #include <spa/param/props.h>
--#include <spa/param/video/raw-utils.h>
--#include <spa/support/type-map.h>
-+
-+#include <linux/dma-buf.h>
-+#include <sys/mman.h>
-+#include <sys/ioctl.h>
-+#include <sys/syscall.h>
- 
- #include <memory>
- #include <utility>
-@@ -36,31 +39,36 @@ const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";
- const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";
- const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";
- 
--// static
--void BaseCapturerPipeWire::OnStateChanged(void* data,
--                                          pw_remote_state old_state,
--                                          pw_remote_state state,
--                                          const char* error_message) {
--  BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
--  RTC_DCHECK(that);
- 
--  switch (state) {
--    case PW_REMOTE_STATE_ERROR:
--      RTC_LOG(LS_ERROR) << "PipeWire remote state error: " << error_message;
--      break;
--    case PW_REMOTE_STATE_CONNECTED:
--      RTC_LOG(LS_INFO) << "PipeWire remote state: connected.";
--      that->CreateReceivingStream();
--      break;
--    case PW_REMOTE_STATE_CONNECTING:
--      RTC_LOG(LS_INFO) << "PipeWire remote state: connecting.";
-+// static
-+void BaseCapturerPipeWire::SyncDmaBuf(int fd, uint64_t start_or_end) {
-+  struct dma_buf_sync sync = { 0 };
-+
-+  sync.flags = start_or_end | DMA_BUF_SYNC_READ;
-+
-+  while(true) {
-+    int ret;
-+    ret = ioctl (fd, DMA_BUF_IOCTL_SYNC, &sync);
-+    if (ret == -1 && errno == EINTR) {
-+      continue;
-+    } else if (ret == -1) {
-+      RTC_LOG(LS_ERROR) << "Failed to synchronize DMA buffer: " << g_strerror(errno);
-       break;
--    case PW_REMOTE_STATE_UNCONNECTED:
--      RTC_LOG(LS_INFO) << "PipeWire remote state: unconnected.";
-+    } else {
-       break;
-+    }
-   }
- }
- 
-+// static
-+void BaseCapturerPipeWire::OnCoreError(void *data,
-+                                       uint32_t id,
-+                                       int seq,
-+                                       int res,
-+                                       const char *message) {
-+  RTC_LOG(LS_ERROR) << "core error: " << message;
-+}
-+
- // static
- void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
-                                                 pw_stream_state old_state,
-@@ -73,76 +81,54 @@ void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
-     case PW_STREAM_STATE_ERROR:
-       RTC_LOG(LS_ERROR) << "PipeWire stream state error: " << error_message;
-       break;
--    case PW_STREAM_STATE_CONFIGURE:
--      pw_stream_set_active(that->pw_stream_, true);
--      break;
--    case PW_STREAM_STATE_UNCONNECTED:
--    case PW_STREAM_STATE_CONNECTING:
--    case PW_STREAM_STATE_READY:
-     case PW_STREAM_STATE_PAUSED:
-     case PW_STREAM_STATE_STREAMING:
-+    case PW_STREAM_STATE_UNCONNECTED:
-+    case PW_STREAM_STATE_CONNECTING:
-       break;
-   }
- }
- 
- // static
--void BaseCapturerPipeWire::OnStreamFormatChanged(void* data,
--                                                 const struct spa_pod* format) {
-+void BaseCapturerPipeWire::OnStreamParamChanged(void *data, uint32_t id,
-+                                                const struct spa_pod *format) {
-   BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
-   RTC_DCHECK(that);
- 
--  RTC_LOG(LS_INFO) << "PipeWire stream format changed.";
-+  RTC_LOG(LS_INFO) << "PipeWire stream param changed.";
- 
--  if (!format) {
--    pw_stream_finish_format(that->pw_stream_, /*res=*/0, /*params=*/nullptr,
--                            /*n_params=*/0);
-+  if (!format || id != SPA_PARAM_Format) {
-     return;
-   }
- 
--  that->spa_video_format_ = new spa_video_info_raw();
--  spa_format_video_raw_parse(format, that->spa_video_format_,
--                             &that->pw_type_->format_video);
-+  spa_format_video_raw_parse(format, &that->spa_video_format_);
- 
--  auto width = that->spa_video_format_->size.width;
--  auto height = that->spa_video_format_->size.height;
-+  auto width = that->spa_video_format_.size.width;
-+  auto height = that->spa_video_format_.size.height;
-   auto stride = SPA_ROUND_UP_N(width * kBytesPerPixel, 4);
-   auto size = height * stride;
- 
-+  that->desktop_size_ = DesktopSize(width, height);
-+
-   uint8_t buffer[1024] = {};
-   auto builder = spa_pod_builder{buffer, sizeof(buffer)};
- 
-   // Setup buffers and meta header for new format.
--  const struct spa_pod* params[2];
--  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
--      &builder,
--      // id to enumerate buffer requirements
--      that->pw_core_type_->param.idBuffers,
--      that->pw_core_type_->param_buffers.Buffers,
--      // Size: specified as integer (i) and set to specified size
--      ":", that->pw_core_type_->param_buffers.size, "i", size,
--      // Stride: specified as integer (i) and set to specified stride
--      ":", that->pw_core_type_->param_buffers.stride, "i", stride,
--      // Buffers: specifies how many buffers we want to deal with, set as
--      // integer (i) where preferred number is 8, then allowed number is defined
--      // as range (r) from min and max values and it is undecided (u) to allow
--      // negotiation
--      ":", that->pw_core_type_->param_buffers.buffers, "iru", 8,
--      SPA_POD_PROP_MIN_MAX(1, 32),
--      // Align: memory alignment of the buffer, set as integer (i) to specified
--      // value
--      ":", that->pw_core_type_->param_buffers.align, "i", 16));
--  params[1] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
--      &builder,
--      // id to enumerate supported metadata
--      that->pw_core_type_->param.idMeta, that->pw_core_type_->param_meta.Meta,
--      // Type: specified as id or enum (I)
--      ":", that->pw_core_type_->param_meta.type, "I",
--      that->pw_core_type_->meta.Header,
--      // Size: size of the metadata, specified as integer (i)
--      ":", that->pw_core_type_->param_meta.size, "i",
--      sizeof(struct spa_meta_header)));
--
--  pw_stream_finish_format(that->pw_stream_, /*res=*/0, params, /*n_params=*/2);
-+  const struct spa_pod* params[3];
-+  params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+              SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
-+              SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
-+              SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
-+              SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 1, 32)));
-+  params[1] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+              SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
-+              SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
-+              SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))));
-+  params[2] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+              SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
-+              SPA_PARAM_META_type, SPA_POD_Id (SPA_META_VideoCrop),
-+              SPA_PARAM_META_size, SPA_POD_Int (sizeof(struct spa_meta_region))));
-+  pw_stream_update_params(that->pw_stream_, params, 3);
- }
- 
- // static
-@@ -150,15 +136,25 @@ void BaseCapturerPipeWire::OnStreamProcess(void* data) {
-   BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
-   RTC_DCHECK(that);
- 
--  pw_buffer* buf = nullptr;
-+  struct pw_buffer *next_buffer;
-+  struct pw_buffer *buffer = nullptr;
-+
-+  next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
-+  while (next_buffer) {
-+    buffer = next_buffer;
-+    next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
- 
--  if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
-+    if (next_buffer)
-+      pw_stream_queue_buffer (that->pw_stream_, buffer);
-+  }
-+
-+  if (!buffer) {
-     return;
-   }
- 
--  that->HandleBuffer(buf);
-+  that->HandleBuffer(buffer);
- 
--  pw_stream_queue_buffer(that->pw_stream_, buf);
-+  pw_stream_queue_buffer(that->pw_stream_, buffer);
- }
- 
- BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
-@@ -169,38 +165,22 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() {
-     pw_thread_loop_stop(pw_main_loop_);
-   }
- 
--  if (pw_type_) {
--    delete pw_type_;
--  }
--
--  if (spa_video_format_) {
--    delete spa_video_format_;
--  }
--
-   if (pw_stream_) {
-     pw_stream_destroy(pw_stream_);
-   }
- 
--  if (pw_remote_) {
--    pw_remote_destroy(pw_remote_);
-+  if (pw_core_) {
-+    pw_core_disconnect(pw_core_);
-   }
- 
--  if (pw_core_) {
--    pw_core_destroy(pw_core_);
-+  if (pw_context_) {
-+    pw_context_destroy(pw_context_);
-   }
- 
-   if (pw_main_loop_) {
-     pw_thread_loop_destroy(pw_main_loop_);
-   }
- 
--  if (pw_loop_) {
--    pw_loop_destroy(pw_loop_);
--  }
--
--  if (current_frame_) {
--    free(current_frame_);
--  }
--
-   if (start_request_signal_id_) {
-     g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
-   }
-@@ -250,27 +230,35 @@ void BaseCapturerPipeWire::InitPortal() {
- void BaseCapturerPipeWire::InitPipeWire() {
-   pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
- 
--  pw_loop_ = pw_loop_new(/*properties=*/nullptr);
--  pw_main_loop_ = pw_thread_loop_new(pw_loop_, "pipewire-main-loop");
--
--  pw_core_ = pw_core_new(pw_loop_, /*properties=*/nullptr);
--  pw_core_type_ = pw_core_get_type(pw_core_);
--  pw_remote_ = pw_remote_new(pw_core_, nullptr, /*user_data_size=*/0);
-+  pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr);
-+  pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0);
-+  if (!pw_context_) {
-+    RTC_LOG(LS_ERROR) << "Failed to create PipeWire context";
-+    return;
-+  }
- 
--  InitPipeWireTypes();
-+  pw_core_ = pw_context_connect(pw_context_, nullptr, 0);
-+  if (!pw_core_) {
-+    RTC_LOG(LS_ERROR) << "Failed to connect PipeWire context";
-+    return;
-+  }
- 
-   // Initialize event handlers, remote end and stream-related.
--  pw_remote_events_.version = PW_VERSION_REMOTE_EVENTS;
--  pw_remote_events_.state_changed = &OnStateChanged;
-+  pw_core_events_.version = PW_VERSION_CORE_EVENTS;
-+  pw_core_events_.error = &OnCoreError;
- 
-   pw_stream_events_.version = PW_VERSION_STREAM_EVENTS;
-   pw_stream_events_.state_changed = &OnStreamStateChanged;
--  pw_stream_events_.format_changed = &OnStreamFormatChanged;
-+  pw_stream_events_.param_changed = &OnStreamParamChanged;
-   pw_stream_events_.process = &OnStreamProcess;
- 
--  pw_remote_add_listener(pw_remote_, &spa_remote_listener_, &pw_remote_events_,
--                         this);
--  pw_remote_connect_fd(pw_remote_, pw_fd_);
-+  pw_core_add_listener(pw_core_, &spa_core_listener_, &pw_core_events_, this);
-+
-+  pw_stream_ = CreateReceivingStream();
-+  if (!pw_stream_) {
-+    RTC_LOG(LS_ERROR) << "Failed to create PipeWire stream";
-+    return;
-+  }
- 
-   if (pw_thread_loop_start(pw_main_loop_) < 0) {
-     RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop";
-@@ -278,81 +266,132 @@ void BaseCapturerPipeWire::InitPipeWire() {
-   }
- }
- 
--void BaseCapturerPipeWire::InitPipeWireTypes() {
--  spa_type_map* map = pw_core_type_->map;
--  pw_type_ = new PipeWireType();
--
--  spa_type_media_type_map(map, &pw_type_->media_type);
--  spa_type_media_subtype_map(map, &pw_type_->media_subtype);
--  spa_type_format_video_map(map, &pw_type_->format_video);
--  spa_type_video_format_map(map, &pw_type_->video_format);
--}
--
--void BaseCapturerPipeWire::CreateReceivingStream() {
-+pw_stream* BaseCapturerPipeWire::CreateReceivingStream() {
-   spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
--  spa_rectangle pwScreenBounds =
--      spa_rectangle{static_cast<uint32_t>(desktop_size_.width()),
--                    static_cast<uint32_t>(desktop_size_.height())};
-+  spa_rectangle pwMaxScreenBounds = spa_rectangle{INT32_MAX, INT32_MAX};
- 
--  spa_fraction pwFrameRateMin = spa_fraction{0, 1};
--  spa_fraction pwFrameRateMax = spa_fraction{60, 1};
-+  auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr);
- 
--  pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1",
--                                                /*end of varargs*/ nullptr);
--  pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps);
-+  if (!stream) {
-+    RTC_LOG(LS_ERROR) << "Could not create receiving stream.";
-+    return nullptr;
-+  }
- 
-   uint8_t buffer[1024] = {};
--  const spa_pod* params[1];
--  spa_pod_builder builder = spa_pod_builder{buffer, sizeof(buffer)};
--  params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
--      &builder,
--      // id to enumerate formats
--      pw_core_type_->param.idEnumFormat, pw_core_type_->spa_format, "I",
--      pw_type_->media_type.video, "I", pw_type_->media_subtype.raw,
--      // Video format: specified as id or enum (I), preferred format is BGRx,
--      // then allowed formats are enumerated (e) and the format is undecided (u)
--      // to allow negotiation
--      ":", pw_type_->format_video.format, "Ieu", pw_type_->video_format.BGRx,
--      SPA_POD_PROP_ENUM(2, pw_type_->video_format.RGBx,
--                        pw_type_->video_format.BGRx),
--      // Video size: specified as rectangle (R), preferred size is specified as
--      // first parameter, then allowed size is defined as range (r) from min and
--      // max values and the format is undecided (u) to allow negotiation
--      ":", pw_type_->format_video.size, "Rru", &pwScreenBounds, 2,
--      &pwMinScreenBounds, &pwScreenBounds,
--      // Frame rate: specified as fraction (F) and set to minimum frame rate
--      // value
--      ":", pw_type_->format_video.framerate, "F", &pwFrameRateMin,
--      // Max frame rate: specified as fraction (F), preferred frame rate is set
--      // to maximum value, then allowed frame rate is defined as range (r) from
--      // min and max values and it is undecided (u) to allow negotiation
--      ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2,
--      &pwFrameRateMin, &pwFrameRateMax));
--
--  pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
--                         this);
-+  const spa_pod* params[2];
-+  spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer));
-+
-+  params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
-+              SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-+              SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
-+              SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
-+              SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(5, SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx, SPA_VIDEO_FORMAT_RGBA,
-+                                                                 SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_BGRA),
-+              SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&pwMinScreenBounds,
-+                                                                    &pwMinScreenBounds,
-+                                                                    &pwMaxScreenBounds),
-+              0));
-+  pw_stream_add_listener(stream, &spa_stream_listener_, &pw_stream_events_, this);
-+
-   pw_stream_flags flags = static_cast<pw_stream_flags>(
--      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE |
--      PW_STREAM_FLAG_MAP_BUFFERS);
--  if (pw_stream_connect(pw_stream_, PW_DIRECTION_INPUT, /*port_path=*/nullptr,
--                        flags, params,
--                        /*n_params=*/1) != 0) {
-+      PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE);
-+
-+  if (pw_stream_connect(stream, PW_DIRECTION_INPUT, pw_stream_node_id_, PW_STREAM_FLAG_AUTOCONNECT, params, 1) != 0) {
-     RTC_LOG(LS_ERROR) << "Could not connect receiving stream.";
-     portal_init_failed_ = true;
--    return;
-   }
-+
-+  return stream;
- }
- 
- void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
-+  struct spa_meta_region* video_crop;
-   spa_buffer* spaBuffer = buffer->buffer;
--  void* src = nullptr;
-+  uint8_t *map = nullptr;
-+  uint8_t* src = nullptr;
-+  uint8_t* dst = nullptr;
-+
-+  if (spaBuffer->datas[0].chunk->size == 0) {
-+    map = nullptr;
-+    src = nullptr;
-+  } else if (spaBuffer->datas[0].type == SPA_DATA_MemFd) {
-+    map = static_cast<uint8_t*>(mmap(
-+        nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
-+        PROT_READ, MAP_PRIVATE, spaBuffer->datas[0].fd, 0));
-+
-+    if (map == MAP_FAILED) {
-+      RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
-+      return;
-+    }
-+
-+    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
-+  } else if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
-+    int fd;
-+    fd = spaBuffer->datas[0].fd;
- 
--  if (!(src = spaBuffer->datas[0].data)) {
-+    map = static_cast<uint8_t*>(mmap(
-+        nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
-+        PROT_READ, MAP_PRIVATE, fd, 0));
-+
-+    if (map == MAP_FAILED) {
-+      RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
-+      return;
-+    }
-+
-+    SyncDmaBuf(fd, DMA_BUF_SYNC_START);
-+
-+    src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
-+  } else if (spaBuffer->datas[0].type == SPA_DATA_MemPtr) {
-+    map = nullptr;
-+    src = static_cast<uint8_t*>(spaBuffer->datas[0].data);
-+  } else {
-     return;
-   }
- 
--  uint32_t maxSize = spaBuffer->datas[0].maxsize;
--  int32_t srcStride = spaBuffer->datas[0].chunk->stride;
-+  if (!src) {
-+    return;
-+  }
-+
-+  DesktopSize prev_crop_size = DesktopSize(0, 0);
-+  if (video_crop_size_initialized_) {
-+    prev_crop_size = video_crop_size_;
-+  }  
-+
-+  if ((video_crop = static_cast<struct spa_meta_region*>(
-+           spa_buffer_find_meta_data(spaBuffer, SPA_META_VideoCrop, sizeof(*video_crop))))) {
-+    RTC_DCHECK(video_crop->region.size.width <= desktop_size_.width() &&
-+               video_crop->region.size.height <= desktop_size_.height());
-+    if ((video_crop->region.size.width != desktop_size_.width() ||
-+        video_crop->region.size.height != desktop_size_.height()) && video_crop->region.size.width && video_crop->region.size.height) {
-+      video_crop_size_ = DesktopSize(video_crop->region.size.width, video_crop->region.size.height);
-+      video_crop_size_initialized_ = true;
-+    } else {
-+      video_crop_size_initialized_ = false;
-+    }
-+  } else {
-+    video_crop_size_initialized_ = false;
-+  }
-+
-+  size_t frame_size;
-+  if (video_crop_size_initialized_) {
-+    frame_size =
-+        video_crop_size_.width() * video_crop_size_.height() * kBytesPerPixel;
-+  } else {
-+    frame_size =
-+        desktop_size_.width() * desktop_size_.height() * kBytesPerPixel;
-+  }
-+
-+  if (!current_frame_ ||
-+      (video_crop_size_initialized_ && !video_crop_size_.equals(prev_crop_size))) {
-+    current_frame_ = std::make_unique<uint8_t[]>(frame_size);
-+  }
-+  RTC_DCHECK(current_frame_ != nullptr);
-+
-+  const int32_t dstStride = video_crop_size_initialized_
-+                                ? video_crop_size_.width() * kBytesPerPixel
-+                                : desktop_size_.width() * kBytesPerPixel;
-+  const int32_t srcStride = spaBuffer->datas[0].chunk->stride;
-+
-   if (srcStride != (desktop_size_.width() * kBytesPerPixel)) {
-     RTC_LOG(LS_ERROR) << "Got buffer with stride different from screen stride: "
-                       << srcStride
-@@ -361,21 +400,40 @@ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
-     return;
-   }
- 
--  if (!current_frame_) {
--    current_frame_ = static_cast<uint8_t*>(malloc(maxSize));
-+  dst = current_frame_.get();
-+
-+  // Adjust source content based on crop video position
-+  if (video_crop_size_initialized_ &&
-+      (video_crop->region.position.y + video_crop_size_.height() <= desktop_size_.height())) {
-+    for (int i = 0; i < video_crop->region.position.y; ++i) {
-+      src += srcStride;
-+    }
-+  }
-+  const int xOffset =
-+      video_crop_size_initialized_ && (video_crop->region.position.x + video_crop_size_.width() <=
-+                           desktop_size_.width())
-+          ? video_crop->region.position.x * kBytesPerPixel
-+          : 0;
-+  const int height = video_crop_size_initialized_ ? video_crop_size_.height() : desktop_size_.height();
-+  for (int i = 0; i < height; ++i) {
-+    // Adjust source content based on crop video position if needed
-+    src += xOffset;
-+    std::memcpy(dst, src, dstStride);
-+    // If both sides decided to go with the RGBx format we need to convert it to
-+    // BGRx to match color format expected by WebRTC.
-+    if (spa_video_format_.format == SPA_VIDEO_FORMAT_RGBx ||
-+        spa_video_format_.format == SPA_VIDEO_FORMAT_RGBA) {
-+      ConvertRGBxToBGRx(dst, dstStride);
-+    }
-+    src += srcStride - xOffset;
-+    dst += dstStride;
-   }
--  RTC_DCHECK(current_frame_ != nullptr);
- 
--  // If both sides decided to go with the RGBx format we need to convert it to
--  // BGRx to match color format expected by WebRTC.
--  if (spa_video_format_->format == pw_type_->video_format.RGBx) {
--    uint8_t* tempFrame = static_cast<uint8_t*>(malloc(maxSize));
--    std::memcpy(tempFrame, src, maxSize);
--    ConvertRGBxToBGRx(tempFrame, maxSize);
--    std::memcpy(current_frame_, tempFrame, maxSize);
--    free(tempFrame);
--  } else {
--    std::memcpy(current_frame_, src, maxSize);
-+  if (map) {
-+    if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
-+      SyncDmaBuf(spaBuffer->datas[0].fd, DMA_BUF_SYNC_END);
-+    }
-+    munmap(map, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset);
-   }
- }
- 
-@@ -725,10 +783,7 @@ void BaseCapturerPipeWire::OnStartRequestResponseSignal(
-       g_variant_get(variant, "(u@a{sv})", &stream_id, &options);
-       RTC_DCHECK(options != nullptr);
- 
--      g_variant_lookup(options, "size", "(ii)", &width, &height);
--
--      that->desktop_size_.set(width, height);
--
-+      that->pw_stream_node_id_ = stream_id;
-       g_variant_unref(options);
-       g_variant_unref(variant);
-     }
-@@ -813,10 +868,15 @@ void BaseCapturerPipeWire::CaptureFrame() {
-     return;
-   }
- 
--  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(desktop_size_));
-+  DesktopSize frame_size = desktop_size_;
-+  if (video_crop_size_initialized_) {
-+    frame_size = video_crop_size_;
-+  }
-+  
-+  std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(frame_size));
-   result->CopyPixelsFrom(
--      current_frame_, (desktop_size_.width() * kBytesPerPixel),
--      DesktopRect::MakeWH(desktop_size_.width(), desktop_size_.height()));
-+      current_frame_.get(), (frame_size.width() * kBytesPerPixel),
-+      DesktopRect::MakeWH(frame_size.width(), frame_size.height()));
-   if (!result) {
-     callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
-     return;
-@@ -837,4 +897,22 @@ bool BaseCapturerPipeWire::SelectSource(SourceId id) {
-   return true;
- }
- 
-+// static
-+std::unique_ptr<DesktopCapturer>
-+BaseCapturerPipeWire::CreateRawScreenCapturer(
-+    const DesktopCaptureOptions& options) {
-+  std::unique_ptr<BaseCapturerPipeWire> capturer =
-+      std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
-+  return std::move(capturer);}
-+
-+// static
-+std::unique_ptr<DesktopCapturer>
-+BaseCapturerPipeWire::CreateRawWindowCapturer(
-+    const DesktopCaptureOptions& options) {
-+
-+  std::unique_ptr<BaseCapturerPipeWire> capturer =
-+      std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
-+  return std::move(capturer);
-+}
-+
- }  // namespace webrtc
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-index 56b101acbaa6..de54157d1a2a 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
-@@ -22,17 +22,13 @@
- 
- namespace webrtc {
- 
--class PipeWireType {
-- public:
--  spa_type_media_type media_type;
--  spa_type_media_subtype media_subtype;
--  spa_type_format_video format_video;
--  spa_type_video_format video_format;
--};
--
- class BaseCapturerPipeWire : public DesktopCapturer {
-  public:
--  enum CaptureSourceType { Screen = 1, Window };
-+  enum CaptureSourceType : uint32_t {
-+    kScreen = 0b01,
-+    kWindow = 0b10,
-+    kAny = 0b11
-+  };
- 
-   explicit BaseCapturerPipeWire(CaptureSourceType source_type);
-   ~BaseCapturerPipeWire() override;
-@@ -43,28 +39,32 @@ class BaseCapturerPipeWire : public DesktopCapturer {
-   bool GetSourceList(SourceList* sources) override;
-   bool SelectSource(SourceId id) override;
- 
-+  static std::unique_ptr<DesktopCapturer> CreateRawScreenCapturer(
-+      const DesktopCaptureOptions& options);
-+
-+  static std::unique_ptr<DesktopCapturer> CreateRawWindowCapturer(
-+      const DesktopCaptureOptions& options);
-+
-  private:
-   // PipeWire types -->
-+  pw_context* pw_context_ = nullptr;
-   pw_core* pw_core_ = nullptr;
--  pw_type* pw_core_type_ = nullptr;
-   pw_stream* pw_stream_ = nullptr;
--  pw_remote* pw_remote_ = nullptr;
--  pw_loop* pw_loop_ = nullptr;
-   pw_thread_loop* pw_main_loop_ = nullptr;
--  PipeWireType* pw_type_ = nullptr;
- 
-+  spa_hook spa_core_listener_ = {};
-   spa_hook spa_stream_listener_ = {};
--  spa_hook spa_remote_listener_ = {};
- 
-+  pw_core_events pw_core_events_ = {};
-   pw_stream_events pw_stream_events_ = {};
--  pw_remote_events pw_remote_events_ = {};
- 
--  spa_video_info_raw* spa_video_format_ = nullptr;
-+  struct spa_video_info_raw spa_video_format_;
- 
-+  guint32 pw_stream_node_id_ = 0;
-   gint32 pw_fd_ = -1;
- 
-   CaptureSourceType capture_source_type_ =
--      BaseCapturerPipeWire::CaptureSourceType::Screen;
-+      BaseCapturerPipeWire::CaptureSourceType::kAny;
- 
-   // <-- end of PipeWire types
- 
-@@ -78,33 +78,37 @@ class BaseCapturerPipeWire : public DesktopCapturer {
-   guint sources_request_signal_id_ = 0;
-   guint start_request_signal_id_ = 0;
- 
-+  bool video_crop_size_initialized_ = false;
-+  DesktopSize video_crop_size_;;
-   DesktopSize desktop_size_ = {};
-   DesktopCaptureOptions options_ = {};
- 
--  uint8_t* current_frame_ = nullptr;
-+  std::unique_ptr<uint8_t[]> current_frame_;
-   Callback* callback_ = nullptr;
- 
-   bool portal_init_failed_ = false;
- 
-   void InitPortal();
-   void InitPipeWire();
--  void InitPipeWireTypes();
- 
--  void CreateReceivingStream();
-+  pw_stream* CreateReceivingStream();
-   void HandleBuffer(pw_buffer* buffer);
- 
-   void ConvertRGBxToBGRx(uint8_t* frame, uint32_t size);
- 
--  static void OnStateChanged(void* data,
--                             pw_remote_state old_state,
--                             pw_remote_state state,
--                             const char* error);
-+  static void SyncDmaBuf(int fd, uint64_t start_or_end);
-+  static void OnCoreError(void *data,
-+                          uint32_t id,
-+                          int seq,
-+                          int res,
-+                          const char *message);
-+  static void OnStreamParamChanged(void *data,
-+                                   uint32_t id,
-+                                   const struct spa_pod *format);
-   static void OnStreamStateChanged(void* data,
-                                    pw_stream_state old_state,
-                                    pw_stream_state state,
-                                    const char* error_message);
--
--  static void OnStreamFormatChanged(void* data, const struct spa_pod* format);
-   static void OnStreamProcess(void* data);
-   static void OnNewBuffer(void* data, uint32_t id);
- 
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-index 26956fc67dc8..3813d697bb38 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
-@@ -15,7 +15,7 @@
- namespace webrtc {
- 
- ScreenCapturerPipeWire::ScreenCapturerPipeWire()
--    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Screen) {}
-+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kScreen) {}
- ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}
- 
- // static
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-index 35436475cb4d..c43a1f1a0c4e 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
-@@ -15,7 +15,7 @@
- namespace webrtc {
- 
- WindowCapturerPipeWire::WindowCapturerPipeWire()
--    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Window) {}
-+    : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kWindow) {}
- WindowCapturerPipeWire::~WindowCapturerPipeWire() {}
- 
- // static
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-index cf8a9dd0e0db..d27fab8d28d9 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
-@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
-     const DesktopCaptureOptions& options) {
- #if defined(WEBRTC_USE_PIPEWIRE)
-   if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
--    return ScreenCapturerPipeWire::CreateRawScreenCapturer(options);
-+    return BaseCapturerPipeWire::CreateRawScreenCapturer(options);
-   }
- #endif  // defined(WEBRTC_USE_PIPEWIRE)
- 
-diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
-index 82359e50c2db..bb9724cf7cc2 100644
---- a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
-+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
-@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
-     const DesktopCaptureOptions& options) {
- #if defined(WEBRTC_USE_PIPEWIRE)
-   if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
--    return WindowCapturerPipeWire::CreateRawWindowCapturer(options);
-+    return BaseCapturerPipeWire::CreateRawWindowCapturer(options);
-   }
- #endif  // defined(WEBRTC_USE_PIPEWIRE)
- 

SOURCES/firefox-pipewire.patch

@@ -1,63 +0,0 @@
-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
- };
- 

SOURCES/firefox-rhel6-hugepage.patch

@@ -1,13 +0,0 @@
-diff -up firefox-68.1.0/xpcom/threads/nsThread.cpp.old firefox-68.1.0/xpcom/threads/nsThread.cpp
---- firefox-68.1.0/xpcom/threads/nsThread.cpp.old	2019-09-20 12:17:35.481661390 +0200
-+++ firefox-68.1.0/xpcom/threads/nsThread.cpp	2019-09-20 12:19:14.269180516 +0200
-@@ -556,7 +556,8 @@ void nsThread::InitCommon() {
-     // kernel report them as separate regions, even when they are adjacent to
-     // heap memory. This allows us to accurately track the actual memory
-     // consumption of our allocated stacks.
--    madvise(mStackBase, stackSize, MADV_NOHUGEPAGE);
-+    // not supported on RHEL6
-+    // madvise(mStackBase, stackSize, MADV_NOHUGEPAGE);
- 
-     pthread_attr_destroy(&attr);
- #elif defined(XP_WIN)

SOURCES/firefox-rhel6-nss-tls1.3.patch

@@ -1,13 +0,0 @@
-diff -up firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp.old firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp
---- firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp.old	2019-10-24 14:20:21.227037984 +0200
-+++ firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp	2019-10-24 14:45:52.769506967 +0200
-@@ -996,6 +996,9 @@ void nsNSSComponent::FillTLSVersionRange
-     return;
-   }
- 
-+  // Enable TLS 1.3 as our NSS supports it.
-+  supported.max = 0x304;
-+
-   // Clip the defaults by what NSS actually supports to enable
-   // working with a system NSS with different ranges.
-   rangeOut.min = std::max(rangeOut.min, supported.min);

SOURCES/get-calendar-langpacks.sh

@@ -1,126 +0,0 @@
-#!/bin/bash
-#set -x
-set -e
-usage()
-{
-cat << EOF
-usage: $0 options
-
-This script downloads calendar langpacks for Thunderbird.
-
-OPTIONS:
-   -h      Show this message
-   -v      Version string (7.0.1)
-   -b      Build number (1, 2, 3)
-   -r      Reuse downloaded files (when you don't want to redownload)
-EOF
-}
-
-VER=
-BUILDNUM=
-LANG_DATE=`date "+%Y%m%d"`
-while getopts “hv:b:r” OPTION
-do
-     case $OPTION in
-         h)
-             usage
-             exit 1
-             ;;
-         v)
-             VER=$OPTARG
-             ;;
-         b)
-             BUILDNUM=$OPTARG
-             ;;
-         ?)
-             usage
-             exit
-             ;;
-     esac
-done
-
-if [ -z "$VER" -o -z "$BUILDNUM"  ]
-then
-     echo "Missing version or build number."
-     usage
-     exit 1
-fi
-
-WHITE='\033[1;33m'
-NC='\033[0m' # No Color
-
-LOCALES=`curl -f https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/ | grep "a href"|sed -e "s|.*/\([^/]*\)/\".*|\1|"|tail -n+2 |grep -v xpi`
-#echo $LOCALES
-rm -rf lightning-langpacks
-mkdir -p lightning-langpacks
-cd lightning-langpacks
-LOCALE_COUNT=`echo $LOCALES| tr ' ' '\n' | wc -l`
-LOCALE_NUM=0
-for lang in $LOCALES; do
-  LOCALE_NUM=$((LOCALE_NUM+1))
-  echo -e "${WHITE}Processing calendar locale: $lang ($LOCALE_NUM/$LOCALE_COUNT)${NC}"
-  mkdir -p extracted_lightning
-  mkdir -p calendar-locales
-  #echo Downloading TB binary for locale: $lang
-  wget --quiet https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/$lang/thunderbird-$VER.tar.bz2
-
-  cd extracted_lightning
-  tar -xf ../thunderbird-$VER.tar.bz2 thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
-  set +e
-  unzip -qq thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
-  set -e
-  LIGHTNING_VERSION=`cat app.ini |grep "^Version="|sed -e 's/Version=//'`
-  BUILD_ID=`cat app.ini |grep "^BuildID="|sed -e 's/BuildID=//'`
-  MAX_VERSION=`cat app.ini |grep MaxVersion|sed -e s/MaxVersion=//`
-  MIN_VERSION=`cat app.ini |grep MinVersion|sed -e s/MinVersion=//`
-  rm -rf thunderbird
-  mkdir -p ../calendar-locales/chrome
-  cp -r chrome/calendar-$lang ../calendar-locales/chrome
-  cp -r chrome/lightning-$lang ../calendar-locales/chrome
-  cd -
-
-  cd calendar-locales
-  # create manifest
-  cat > manifest.json <<EOL
-{
-  "languages": {
-    "$lang": {
-      "chrome_resources": {
-        "calendar": "chrome/calendar-$lang/locale/$lang/calendar/",
-        "lightning": "chrome/lightning-$lang/locale/$lang/lightning/"
-      },
-      "version": "$LIGHTNING_VERSION"
-    }
-  },
-  "applications": {
-    "gecko": {
-      "strict_min_version": "$MIN_VERSION",
-      "id": "langpack-cal-$lang@lightning.mozilla.org",
-      "strict_max_version": "$MAX_VERSION"
-    }
-  },
-  "langpack_id": "$lang",
-  "version": "7.$LIGHTNING_VERSION.$BUILD_ID",
-  "name": "$lang Language Pack Calendar",
-  "manifest_version": 2,
-  "sources": {
-    "browser": {
-      "base_path": "browser/"
-    }
-  },
-  "author": "Mozilla.cz (contributors: Pavel Cvrček, Pavel Franc, Michal Stanke, Michal Vašíček)",
-  "description": "Language pack for Thunderbird for $lang, this was repacked by Fedora/RHEL package maintainer from original binaries."
-}
-
-EOL
-  zip --quiet -r ../langpack-cal-$lang@lightning.mozilla.org.xpi *
-  cd -
-  rm -rf calendar-locales
-  rm -rf extracted_lightning
-
-  rm -f thunderbird-$VER.tar.bz2
-done
-echo "Creating lightning-langpacks-$VER.tar.xz..."
-tar cJf ../lightning-langpacks-$VER.tar.xz *.xpi
-cd ..
-rm -rf lightning-langpacks

SOURCES/google-loc-api-key

@@ -0,0 +1 @@
+AIzaSyB2h2OuRcUgy5N-5hsZqiPW6sH3n_rptiQ

SOURCES/gtk3-private-3.22.26-1-files.inc

@@ -1,54 +0,0 @@
-%dir %{gtk3_install_path}/bin
-%{gtk3_install_path}/bin/gdk-pixbuf-query-loaders-%{__isa_bits}
-%{gtk3_install_path}/bin/gdk-pixbuf-thumbnailer
-%{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits}
-%{gtk3_install_path}/bin/glib-compile-schemas
-%{gtk3_install_path}/bin/gtk-query-immodules-3.0-%{__isa_bits}
-%{gtk3_install_path}/bin/gtk-update-icon-cache
-%{gtk3_install_path}/bin/fc-cache
-
-%{gtk3_install_path}/etc
-
-%dir %{gtk3_install_path}/%{_lib}
-%{gtk3_install_path}/%{_lib}/libatk-1.0.so.*
-%{gtk3_install_path}/%{_lib}/libatk-bridge-2.0.so.*
-%{gtk3_install_path}/%{_lib}/libatspi.so.*
-%{gtk3_install_path}/%{_lib}/libcairo.so.*
-%{gtk3_install_path}/%{_lib}/libcairo-gobject.so.*
-%{gtk3_install_path}/%{_lib}/libfontconfig.so.*
-%{gtk3_install_path}/%{_lib}/libfreetype.so.*
-%{gtk3_install_path}/%{_lib}/libgdk-3.so.*
-%{gtk3_install_path}/%{_lib}/libgdk_pixbuf-2.0.so.*
-%{gtk3_install_path}/%{_lib}/libgio-2.0.so.*
-%{gtk3_install_path}/%{_lib}/libglib-2.0.so.*
-%{gtk3_install_path}/%{_lib}/libgmodule-2.0.so.*
-%{gtk3_install_path}/%{_lib}/libgobject-2.0.so.*
-%{gtk3_install_path}/%{_lib}/libgthread-2.0.so.*
-%{gtk3_install_path}/%{_lib}/libgtk-3.so.*
-%{gtk3_install_path}/%{_lib}/libharfbuzz.so.*
-%{gtk3_install_path}/%{_lib}/libpango-1.0.so.*
-%{gtk3_install_path}/%{_lib}/libpangocairo-1.0.so.*
-%{gtk3_install_path}/%{_lib}/libpangoft2-1.0.so.*
-%{gtk3_install_path}/%{_lib}/libpcre.so.*
-%{gtk3_install_path}/%{_lib}/librsvg-2.so.*
-%dir %{gtk3_install_path}/%{_lib}/cairo
-%{gtk3_install_path}/%{_lib}/cairo/cairo-fdr.so.*
-%{gtk3_install_path}/%{_lib}/cairo/cairo-sphinx.so.*
-%{gtk3_install_path}/%{_lib}/cairo/libcairo-trace.so.*
-%{gtk3_install_path}/%{_lib}/gdk-pixbuf-2.0
-%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders.cache
-%{gtk3_install_path}/%{_lib}/gio
-%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gio/modules/giomodule.cache
-%{gtk3_install_path}/%{_lib}/gtk-3.0
-%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gtk-3.0/3.0.0/immodules.cache
-
-%{gtk3_install_path}/libexec
-
-%{gtk3_install_path}/share
-%ghost %attr(644, root, root) %{gtk3_install_path}/share/icons/Adwaita/icon-theme.cache
-%ghost %attr(644, root, root) %{gtk3_install_path}/share/icons/hicolor/icon-theme.cache
-%ghost %attr(644, root, root) %{gtk3_install_path}/share/glib-2.0/schemas/gschemas.compiled
-
-%{gtk3_install_path}/var
-%dir %{gtk3_install_path}/var/cache/fontconfig
-

SOURCES/gtk3-private-3.22.26-1-post.inc

@@ -1,23 +0,0 @@
-# adwaita-icon-theme
-touch --no-create %{gtk3_install_path}/share/icons/Adwaita &>/dev/null || :
-touch --no-create %{gtk3_install_path}/share/icons/hicolor &>/dev/null || :
-%{gtk3_install_path}/bin/gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
-
-# glib2
-%{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits} %{gtk3_install_path}/%{_lib}/gio/modules
-
-# gtk3
-%{gtk3_install_path}/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache
-%{gtk3_install_path}/bin/glib-compile-schemas %{gtk3_install_path}/share/glib-2.0/schemas &> /dev/null || :
-
-# fontconfig
-umask 0022
-
-# Force regeneration of all fontconfig cache files
-# The check for existance is needed on dual-arch installs (the second
-#  copy of fontconfig might install the binary instead of the first)
-# The HOME setting is to avoid problems if HOME hasn't been reset
-# FIXME hardcoded version !
-if [ -x %{gtk3_install_path}/bin/fc-cache ] && %{gtk3_install_path}/bin/fc-cache --version 2>&1 | grep -q 2.10.95 ; then
-  HOME=/root %{gtk3_install_path}/bin/fc-cache -f
-fi

SOURCES/gtk3-private-3.22.26-1-posttrans.inc

@@ -1,3 +0,0 @@
-%{gtk3_install_path}/gtk-update-icon-cache %{gtk3_install_path}/share/icons/hicolor &>/dev/null || :
-# adwaita
-%{gtk3_install_path}/gtk-update-icon-cache %{gtk3_install_path}/share/icons/Adwaita &>/dev/null || :

SOURCES/gtk3-private-3.22.26-1-postun.inc

@@ -1,27 +0,0 @@
-# adwaita
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{gtk3_install_path}/share/icons/Adwaita &>/dev/null
-    touch --no-create %{gtk3_install_path}/share/icons/hicolor &>/dev/null
-    %{gtk3_install_path}/bin/gtk-update-icon-cache %{gtk3_install_path}/share/icons/Adwaita &>/dev/null || :
-    %{gtk3_install_path}/bin/gtk-update-icon-cache %{gtk3_install_path}/share/icons/hicolor &>/dev/null || :
-fi
-
-# gdk-pixbuf2
-if [ $1 -gt 0 ]; then
-  %{gtk3_install_path}/bin/gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
-fi
-
-# glib2
-[ ! -x %{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits} ] || \
-%{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits} %{gtk3_install_path}/%{_lib}/gio/modules
-
-# gtk3
-if [ $1 -gt 0 ]; then
-  %{gtk3_install_path}/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache
-fi
-
-if [ $1 -eq 0 ] ; then
-    rm -rf %{gtk3_install_path}/var/cache/fontconfig/* &>/dev/null || :
-fi
-
-%{gtk3_install_path}/bin/glib-compile-schemas %{gtk3_install_path}/share/glib-2.0/schemas &> /dev/null || :

SOURCES/gtk3-private-3.22.26-1-requires-provides-filter.inc

@@ -1,26 +0,0 @@
-%filter_provides_in %{gtk3_install_path}/%{_lib}
-%filter_requires_in %{gtk3_install_path}/%{_lib}
-
-%filter_from_requires /libgdk-3.*/d
-%filter_from_requires /libatk-1.0.so.*/d
-%filter_from_requires /libatk-bridge-2.0.so.*/d
-%filter_from_requires /libatspi.so.*/d
-%filter_from_requires /libcairo.so.*/d
-%filter_from_requires /libcairo-gobject.so.*/d
-%filter_from_requires /libfontconfig.so.*/d
-%filter_from_requires /libfreetype.so.*/d
-%filter_from_requires /libgdk-3.so.*/d
-%filter_from_requires /libgdk_pixbuf-2.0.so.*/d
-%filter_from_requires /libgio-2.0.so.*/d
-%filter_from_requires /libglib-2.0.so.*/d
-%filter_from_requires /libgmodule-2.0.so.*/d
-%filter_from_requires /libgobject-2.0.so.*/d
-%filter_from_requires /libgthread-2.0.so.*/d
-%filter_from_requires /libgtk-3.so.*/d
-%filter_from_requires /libharfbuzz.so.*/d
-%filter_from_requires /libpango-1.0.so.*/d
-%filter_from_requires /libpangocairo-1.0.so.*/d
-%filter_from_requires /libpangoft2-1.0.so.*/d
-%filter_from_requires /libpcre.so.*/d
-
-# Don't forget to call %%filter_setup from the consumer!

SOURCES/gtk3-private-3.22.26-1-setup-flags-env.inc

@@ -1,34 +0,0 @@
-%if "%{name}" == "gtk3-private"
-    function prepend_buildroot_include_path_to_compiler_flags() {
-        export CFLAGS="-I%{_buildrootdir}%{gtk3_install_path}/$@ $CFLAGS" \
-        export CXXFLAGS="-I%{_buildrootdir}%{gtk3_install_path}/$@ $CXXFLAGS"
-    }
-    
-    prepend_buildroot_include_path_to_compiler_flags include
-    prepend_buildroot_include_path_to_compiler_flags include/glib-2.0
-    prepend_buildroot_include_path_to_compiler_flags include/glib-2.0
-    prepend_buildroot_include_path_to_compiler_flags include/gio-unix-2.0
-    prepend_buildroot_include_path_to_compiler_flags %{_lib}/glib-2.0/include
-    prepend_buildroot_include_path_to_compiler_flags include/freetype2
-    prepend_buildroot_include_path_to_compiler_flags include/fontconfig
-    prepend_buildroot_include_path_to_compiler_flags include/harfbuzz
-    prepend_buildroot_include_path_to_compiler_flags include/gdk-pixbuf-2.0
-    prepend_buildroot_include_path_to_compiler_flags include/atk-1.0
-    prepend_buildroot_include_path_to_compiler_flags include/at-spi-2.0
-    prepend_buildroot_include_path_to_compiler_flags include/at-spi2-atk/2.0
-    prepend_buildroot_include_path_to_compiler_flags include/cairo
-    prepend_buildroot_include_path_to_compiler_flags include/pango-1.0
-    prepend_buildroot_include_path_to_compiler_flags include/librsvg-2.0
-    prepend_buildroot_include_path_to_compiler_flags include/cairo
-    prepend_buildroot_include_path_to_compiler_flags include/gtk-3.0
-    prepend_buildroot_include_path_to_compiler_flags include/gtk-3.0/unix-print
-    prepend_buildroot_include_path_to_compiler_flags include/librsvg-2.0
-%else
-    sed -i 's@%{gtk3_install_path}@%{_buildrootdir}%{gtk3_install_path}@g' %{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig/*.pc
-%endif
-
-export LDFLAGS="-L%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
-export LDFLAGS="-Wl,-rpath,%{gtk3_install_path}/%{_lib} $LDFLAGS"
-export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
-
-export PKG_CONFIG_PATH=%{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig

SOURCES/mozilla-1196777.patch

@@ -1,13 +0,0 @@
-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-05-21 11:29:55.833376744 +0200
-+++ firefox-68.0/widget/gtk/nsWindow.cpp	2019-05-21 12:15:35.446089316 +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;
- 
- #if !GTK_CHECK_VERSION(3, 22, 0)
- typedef enum {

SOURCES/mozilla-bmo1005535.patch

@@ -1,12 +0,0 @@
-diff -up firefox-78.0/gfx/skia/skia/src/gpu/GrColor.h.mozilla.bmo1005535 firefox-78.0/gfx/skia/skia/src/gpu/GrColor.h
---- firefox-78.0/gfx/skia/skia/src/gpu/GrColor.h.mozilla.bmo1005535	2020-06-25 16:16:34.459083304 +0200
-+++ firefox-78.0/gfx/skia/skia/src/gpu/GrColor.h	2020-06-25 16:17:00.968174743 +0200
-@@ -64,7 +64,7 @@ static inline GrColor GrColorPackRGBA(un
-  *  Since premultiplied means that alpha >= color, we construct a color with
-  *  each component==255 and alpha == 0 to be "illegal"
-  */
--#define GrColor_ILLEGAL     (~(0xFF << GrColor_SHIFT_A))
-+#define GrColor_ILLEGAL     ((uint32_t)(~(0xFF << GrColor_SHIFT_A)))
- 
- /** Normalizes and coverts an uint8_t to a float. [0, 255] -> [0.0, 1.0] */
- static inline float GrNormalizeByteToFloat(uint8_t value) {

SOURCES/mozilla-bmo1170092.patch

@@ -1,7 +1,7 @@
-diff -up firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
---- firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2020-06-17 04:18:58.000000000 +0200
-+++ firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2020-06-25 13:45:28.816999491 +0200
-@@ -244,8 +244,20 @@ nsresult nsReadConfig::openAndEvaluateJS
+diff -up firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp
+--- firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2023-07-10 21:08:53.000000000 +0200
++++ firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp	2023-07-17 10:33:23.443355156 +0200
+@@ -263,8 +263,20 @@ nsresult nsReadConfig::openAndEvaluateJS
      if (NS_FAILED(rv)) return rv;
  
      rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
@@ -12,7 +12,7 @@ diff -up firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
 +                                  getter_AddRefs(jsFile));
 +      NS_ENSURE_SUCCESS(rv, rv);
 +
-+      rv = jsFile->AppendNative(NS_LITERAL_CSTRING("pref"));
++      rv = jsFile->AppendNative(nsLiteralCString("pref"));
 +      NS_ENSURE_SUCCESS(rv, rv);
 +      rv = jsFile->AppendNative(nsDependentCString(aFileName));
 +      NS_ENSURE_SUCCESS(rv, rv);
@@ -23,22 +23,23 @@ diff -up firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
    } else {
      nsAutoCString location("resource://gre/defaults/autoconfig/");
      location += aFileName;
-diff -up firefox-78.0/modules/libpref/Preferences.cpp.1170092 firefox-78.0/modules/libpref/Preferences.cpp
---- firefox-78.0/modules/libpref/Preferences.cpp.1170092	2020-06-25 13:45:28.818999498 +0200
-+++ firefox-78.0/modules/libpref/Preferences.cpp	2020-06-25 13:48:45.996708102 +0200
-@@ -4499,6 +4499,8 @@ nsresult Preferences::InitInitialObjects
+diff -up firefox-115.0.2/modules/libpref/Preferences.cpp.1170092 firefox-115.0.2/modules/libpref/Preferences.cpp
+--- firefox-115.0.2/modules/libpref/Preferences.cpp.1170092	2023-07-10 21:09:00.000000000 +0200
++++ firefox-115.0.2/modules/libpref/Preferences.cpp	2023-07-17 10:33:23.444355156 +0200
+@@ -4825,6 +4825,9 @@ nsresult Preferences::InitInitialObjects
    //
    // Thus, in the omni.jar case, we always load app-specific default
    // preferences from omni.jar, whether or not `$app == $gre`.
++  //
 +  // At very end load configuration from system config location:
 +  // - /etc/firefox/pref/*.js
  
    nsresult rv = NS_ERROR_FAILURE;
    UniquePtr<nsZipFind> find;
-diff -up firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-78.0/toolkit/xre/nsXREDirProvider.cpp
---- firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2020-06-17 04:20:11.000000000 +0200
-+++ firefox-78.0/toolkit/xre/nsXREDirProvider.cpp	2020-06-25 13:48:28.613645633 +0200
-@@ -60,6 +60,7 @@
+diff -up firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp
+--- firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp.1170092	2023-07-10 22:57:20.000000000 +0200
++++ firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp	2023-07-17 10:56:25.309692121 +0200
+@@ -72,6 +72,7 @@
  #endif
  #ifdef XP_UNIX
  #  include <ctype.h>
@@ -46,14 +47,12 @@ diff -up firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-78.0/tool
  #endif
  #ifdef XP_IOS
  #  include "UIKitDirProvider.h"
-@@ -533,6 +534,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/");
+@@ -478,6 +479,17 @@ nsXREDirProvider::GetFile(const char* aP
+     rv = file->AppendNative(nsLiteralCString(PREF_OVERRIDE_DIRNAME));
+     NS_ENSURE_SUCCESS(rv, rv);
+     rv = EnsureDirectoryExists(file);
++  } else if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
++    nsCString sysConfigDir = nsLiteralCString("/etc/");
 +    nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
 +    if (!appInfo)
 +      return NS_ERROR_NOT_AVAILABLE;
@@ -61,35 +60,32 @@ diff -up firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-78.0/tool
 +    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) {
-@@ -845,6 +861,17 @@ nsresult nsXREDirProvider::GetFilesInter
- 
-     LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
++    NS_NewNativeLocalFile(sysConfigDir, false, getter_AddRefs(file));
++    rv = EnsureDirectoryExists(file);
+   } else {
+     // We don't know anything about this property. Fail without warning, because
+     // otherwise we'll get too much warning spam due to
+@@ -694,6 +706,16 @@ nsXREDirProvider::GetFiles(const char* a
+     }
+ #endif
  
 +    // Add /etc/<application>/pref/ directory if it exists
 +    nsCOMPtr<nsIFile> systemPrefDir;
 +    rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
 +                                getter_AddRefs(systemPrefDir));
 +    if (NS_SUCCEEDED(rv)) {
-+      rv = systemPrefDir->AppendNative(NS_LITERAL_CSTRING("pref"));
-+      if (NS_SUCCEEDED(rv)) {
++      rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
++      if (NS_SUCCEEDED(rv))
 +        directories.AppendObject(systemPrefDir);
 +      }
-+    }
 +
      rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
    } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
      // NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
-diff -up firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h
---- firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2020-06-17 04:20:17.000000000 +0200
-+++ firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h	2020-06-25 13:45:28.819999502 +0200
-@@ -60,6 +60,7 @@
+diff -up firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h
+--- firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2023-07-10 21:09:13.000000000 +0200
++++ firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h	2023-07-17 10:33:23.444355156 +0200
+@@ -58,6 +58,7 @@
  #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
  #define NS_APP_PREFS_OVERRIDE_DIR \
    "PrefDOverride"  // Directory for per-profile defaults

SOURCES/mozilla-bmo1504834-part1.patch

@@ -1,24 +1,34 @@
-diff -up firefox-78.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 firefox-78.0/gfx/2d/DrawTargetSkia.cpp
---- firefox-78.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1	2020-06-17 04:18:58.000000000 +0200
-+++ firefox-78.0/gfx/2d/DrawTargetSkia.cpp	2020-06-25 16:52:29.824532769 +0200
-@@ -135,8 +135,7 @@ static IntRect CalculateSurfaceBounds(co
-   return surfaceBounds.Intersect(bounds);
+# HG changeset patch
+# Parent  9fcbd287056a40084b1e679f787bf683b291f323
+Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
+
+diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
+--- a/gfx/2d/DrawTargetSkia.cpp
++++ b/gfx/2d/DrawTargetSkia.cpp
+@@ -156,7 +156,8 @@ static IntRect CalculateSurfaceBounds(co
  }
  
--static const int kARGBAlphaOffset =
+ static const int kARGBAlphaOffset =
 -    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
-+static const int kARGBAlphaOffset = 0;  // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
++    0;  // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 ==
++        // SurfaceFormat::B8G8R8A8 ? 3 : 0;
  
  static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
                               const int32_t aStride, SurfaceFormat aFormat) {
-diff -up firefox-78.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 firefox-78.0/gfx/2d/Types.h
---- firefox-78.0/gfx/2d/Types.h.mozilla-bmo1504834-part1	2020-06-25 16:52:29.826532776 +0200
-+++ firefox-78.0/gfx/2d/Types.h	2020-06-25 16:55:02.942063616 +0200
-@@ -90,15 +90,8 @@ enum class SurfaceFormat : int8_t {
- // The following values are endian-independent synonyms. The _UINT32 suffix
- // indicates that the name reflects the layout when viewed as a uint32_t
- // value.
+diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
+--- a/gfx/2d/Types.h
++++ b/gfx/2d/Types.h
+@@ -89,18 +89,11 @@ enum class SurfaceFormat : int8_t {
+   // This represents the unknown format.
+   UNKNOWN,  // TODO: Replace uses with Maybe<SurfaceFormat>.
+ 
+-// The following values are endian-independent synonyms. The _UINT32 suffix
+-// indicates that the name reflects the layout when viewed as a uint32_t
+-// value.
 -#if MOZ_LITTLE_ENDIAN()
++  // The following values are endian-independent synonyms. The _UINT32 suffix
++  // indicates that the name reflects the layout when viewed as a uint32_t
++  // value.
    A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
    X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
 -#elif MOZ_BIG_ENDIAN()
@@ -30,9 +40,9 @@ diff -up firefox-78.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 firefox-78.0/gfx/2
  
    // The following values are OS and endian-independent synonyms.
    //
-diff -up firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo1504834-part1 firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc
---- firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo1504834-part1	2020-06-17 04:18:58.000000000 +0200
-+++ firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc	2020-06-25 16:54:02.993855444 +0200
+diff --git a/gfx/skia/skia/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/skcms.cc
+--- a/gfx/skia/skia/modules/skcms/skcms.cc
++++ b/gfx/skia/skia/modules/skcms/skcms.cc
 @@ -30,6 +30,8 @@
          #include <avx512fintrin.h>
          #include <avx512dqintrin.h>
@@ -41,8 +51,8 @@ diff -up firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo150483
 +    #define SKCMS_PORTABLE
  #endif
  
- // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
-@@ -280,20 +282,28 @@ enum {
+ static bool runtime_cpu_detection = true;
+@@ -324,20 +326,28 @@ enum {
  static uint16_t read_big_u16(const uint8_t* ptr) {
      uint16_t be;
      memcpy(&be, ptr, sizeof(be));
@@ -51,10 +61,11 @@ diff -up firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo150483
 +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 +    return be;
  #else
+-    return __builtin_bswap16(be);
 +    #if defined(_MSC_VER)
-+    return _byteswap_ushort(be);
++     return _byteswap_ushort(be);
 +    #else
-     return __builtin_bswap16(be);
++     return __builtin_bswap16(be);
 +    #endif
  #endif
  }
@@ -67,10 +78,11 @@ diff -up firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo150483
 +#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
 +    return be;
  #else
+-    return __builtin_bswap32(be);
 +    #if defined(_MSC_VER)
-+    return _byteswap_ulong(be);
++     return _byteswap_ulong(be);
 +    #else
-     return __builtin_bswap32(be);
++     return __builtin_bswap32(be);
 +    #endif
  #endif
  }

SOURCES/mozilla-bmo1504834-part2.patch

@@ -1,88 +0,0 @@
-# HG changeset patch
-# Parent  36563351309ddbc6c29559ba50a41d005f925abb
-Skia does not support big endian. The places to fix are too numerous and upstream (skia, not Mozilla)
-has no interest in maintaining big endian.
-So here we try to swizzle the input for skia, so that skia always works on LE, and when it comes
-out again, we transform back to BE.
-
-diff -r 36563351309d gfx/2d/ConvolutionFilter.cpp
---- a/gfx/2d/ConvolutionFilter.cpp	Mon Sep 09 17:59:28 2019 +0200
-+++ b/gfx/2d/ConvolutionFilter.cpp	Tue Sep 10 08:25:13 2019 +0200
-@@ -35,9 +35,38 @@
-   return true;
- }
- 
-+static void ByteSwapArray(uint8_t *u8Array, int32_t size) {
-+    uint32_t *array = reinterpret_cast<uint32_t*>(u8Array);
-+    for (int pxl = 0; pxl < size; ++pxl) {
-+        // Use an endian swap to move the bytes, i.e. BGRA -> ARGB.
-+        uint32_t rgba = array[pxl];
-+        array[pxl] = NativeEndian::swapToLittleEndian(rgba);
-+    }
-+}
-+
- void ConvolutionFilter::ConvolveHorizontally(const uint8_t* aSrc, uint8_t* aDst,
-                                              bool aHasAlpha) {
-+#if MOZ_BIG_ENDIAN
-+    int outputSize = mFilter->numValues();
-+
-+    // Input size isn't handed in, so we have to calculate it quickly
-+    int inputSize = 0;
-+    for (int xx = 0; xx < outputSize; ++xx) {
-+        // Get the filter that determines the current output pixel.
-+        int filterOffset, filterLength;
-+        mFilter->FilterForValue(xx, &filterOffset, &filterLength);
-+        inputSize = std::max(inputSize, filterOffset + filterLength);
-+    }
-+
-+    ByteSwapArray((uint8_t*)aSrc, inputSize);
-+#endif
-+
-   SkOpts::convolve_horizontally(aSrc, *mFilter, aDst, aHasAlpha);
-+
-+#if MOZ_BIG_ENDIAN
-+    ByteSwapArray((uint8_t*)aSrc, inputSize);
-+    ByteSwapArray(aDst, outputSize);
-+#endif
- }
- 
- void ConvolutionFilter::ConvolveVertically(uint8_t* const* aSrc, uint8_t* aDst,
-@@ -49,8 +78,26 @@
-   int32_t filterLength;
-   auto filterValues =
-       mFilter->FilterForValue(aRowIndex, &filterOffset, &filterLength);
-+
-+#if MOZ_BIG_ENDIAN
-+  for (int filterY = 0; filterY < filterLength; filterY++) {
-+      // Skia only knows LE, so we have to swizzle the input
-+    ByteSwapArray(aSrc[filterY], aRowSize);
-+  }
-+#endif
-+
-   SkOpts::convolve_vertically(filterValues, filterLength, aSrc, aRowSize, aDst,
-                               aHasAlpha);
-+
-+#if MOZ_BIG_ENDIAN
-+  // After skia is finished, we swizzle back to BE, in case
-+  // the input is used again somewhere else
-+  for (int filterY = 0; filterY < filterLength; filterY++) {
-+    ByteSwapArray(aSrc[filterY], aRowSize);
-+  }
-+  // The destination array as well
-+  ByteSwapArray(aDst, aRowSize);
-+#endif
- }
- 
- /* ConvolutionFilter::ComputeResizeFactor is derived from Skia's
-diff -r 36563351309d gfx/skia/skia/include/core/SkPreConfig.h
---- a/gfx/skia/skia/include/core/SkPreConfig.h	Mon Sep 09 17:59:28 2019 +0200
-+++ b/gfx/skia/skia/include/core/SkPreConfig.h	Tue Sep 10 08:25:13 2019 +0200
-@@ -73,7 +73,7 @@
-       defined(__ppc__) || defined(__hppa) || \
-       defined(__PPC__) || defined(__PPC64__) || \
-       defined(_MIPSEB) || defined(__ARMEB__) || \
--      defined(__s390__) || \
-+      defined(__s390__) || defined(__s390x__) || \
-       (defined(__sh__) && defined(__BIG_ENDIAN__)) || \
-       (defined(__ia64) && defined(__BIG_ENDIAN__))
-          #define SK_CPU_BENDIAN

SOURCES/mozilla-bmo1504834-part3.patch

@@ -1,44 +1,17 @@
 # HG changeset patch
-# Parent  aecb4600e5da17443b224c79eee178c1d8e155e3
+# Parent  09cd4ac2cc607e85aa572425b824fbab386af607
 For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
 right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
 
-diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
---- a/gfx/skia/skia/include/private/SkNx.h	Tue Aug 20 09:46:55 2019 +0200
-+++ b/gfx/skia/skia/include/private/SkNx.h	Mon Sep 09 10:04:06 2019 +0200
-@@ -238,7 +238,18 @@
-     AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
-     AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
- 
-+    // On Big endian the commented out variant doesn't work,
-+    // and honestly, I have no idea why it exists in the first place.
-+    // The reason its broken is, I think, that it defaults to the double-variant of ToBits()
-+    // which gets a 64-bit integer, and FromBits returns 32-bit,
-+    // cutting off the wrong half again.
-+    // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles).
-+    // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system)
-+#ifdef SK_CPU_BENDIAN
-+    AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; }
-+#else
-     AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); }
-+#endif
-     AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); }
-     AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
- 
-diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
---- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Tue Aug 20 09:46:55 2019 +0200
-+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Mon Sep 09 10:04:06 2019 +0200
-@@ -203,7 +203,13 @@
+diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts.h b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
+--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h
++++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
+@@ -210,6 +210,8 @@ namespace SK_OPTS_NS {
              //   ~~~>
              // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
              // c = 0*aa + d(1-1*aa) =      d(1-aa)
-+
-+            // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
-+#ifdef SK_CPU_BENDIAN
-+            return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
-+#else
-             return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
-+#endif
++            // TODO: Check this for endian-issues!
++            //       Do we need to switch 255 to the front for all of those tuples?
+             return (aa & Sk4px(skvx::byte16{0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255}))
                   + d.approxMulDiv255(aa.inv());
          };
-         while (h --> 0) {

SOURCES/mozilla-bmo1504834-part4.patch

@@ -1,30 +0,0 @@
-# HG changeset patch
-# Parent  46ea866ca3acb8bb5e1709ceb799b9c94f591dec
-Problem description: Tab-titles that are too long to fit into a tab get faded out.
-                     On big endian this is broken and instead of fading out, the 
-                     tab gets white and the font transparent, leading to an unreadable
-                     tab-title
-Solution: This is not a real solution, but a hack. The real solution would have been
-          to byte-swap the correct buffer, but I could not find it.
-          So the next best thing is to deactivate the fading-effect. Now all tab-titles
-          are readable, albeit not as pretty to look at as they could be. 
-Side-effects: I have not yet found an unwanted side-effect.
-
-diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
---- a/gfx/2d/DrawTargetSkia.cpp	Tue Oct 22 12:27:22 2019 +0200
-+++ b/gfx/2d/DrawTargetSkia.cpp	Thu Oct 31 09:11:56 2019 +0100
-@@ -1861,6 +1861,14 @@
-       SkCanvas::kPreserveLCDText_SaveLayerFlag |
-           (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
- 
-+#if MOZ_BIG_ENDIAN
-+  // Pushing a layer where an aMask is defined produces wrong output.
-+  // We _should_ endian swap the data, but I couldn't find a workable way to do so
-+  // Therefore I deactivate those layers in the meantime.
-+  // The result is: Tab-titles that are longer than the available space should be faded out.
-+  //                The fading doesn't work, so we deactivate the fading-effect here.
-+  if (!aMask)
-+#endif
-   mCanvas->saveLayer(saveRec);
- 
-   SetPermitSubpixelAA(aOpaque);

SOURCES/mozilla-bmo1554971.patch

@@ -1,22 +0,0 @@
-# HG changeset patch
-# Parent  a25cebecb02d5460b8ad757fe9cb4a9c8d1d7658
-Eliminate startup error message:
-JavaScript error: , line 0: Error: Type error for platformInfo value (Error processing arch: Invalid enumeration value "s390x") for runtime.getPlatformInfo.
-
-Reported here: https://bugzilla.mozilla.org/show_bug.cgi?id=1554971
-
-Uncertain if this is causing real problems or not. Also uncertain if the fix actually fixes anything.
-No response from upstream yet.
-
-diff -r a25cebecb02d -r 378b81b00e73 toolkit/components/extensions/schemas/runtime.json
---- a/toolkit/components/extensions/schemas/runtime.json	Fri Jul 05 12:42:44 2019 +0200
-+++ b/toolkit/components/extensions/schemas/runtime.json	Fri Jul 19 13:19:30 2019 +0200
-@@ -64,7 +64,7 @@
-       {
-         "id": "PlatformArch",
-         "type": "string",
--        "enum": ["arm", "x86-32", "x86-64"],
-+        "enum": ["arm", "x86-32", "x86-64", "s390x", "aarch64", "ppc64le"],
-         "allowedContexts": ["content", "devtools"],
-         "description": "The machine's processor architecture."
-       },

SOURCES/mozilla-bmo1602730.patch

@@ -1,28 +0,0 @@
-diff -r 6ef20eee3f8f gfx/layers/basic/BasicCompositor.cpp
---- a/gfx/layers/basic/BasicCompositor.cpp	Thu Oct 31 09:11:56 2019 +0100
-+++ b/gfx/layers/basic/BasicCompositor.cpp	Wed Dec 11 16:16:09 2019 +0100
-@@ -693,9 +693,13 @@
- 
-   RefPtr<SourceSurface> sourceMask;
-   Matrix maskTransform;
-+  // Setting an alpha-mask here breaks the URL-bar on big endian (s390x)
-+  // if the typed URL is too long for the textbox (automatic scrolling needed)
-+#if MOZ_LITTLE_ENDIAN
-   if (aTransform.Is2D()) {
-     SetupMask(aEffectChain, dest, offset, sourceMask, maskTransform);
-   }
-+#endif
- 
-   CompositionOp blendMode = CompositionOp::OP_OVER;
-   if (Effect* effect =
-diff -r 6ef20eee3f8f gfx/layers/composite/CompositableHost.cpp
---- a/gfx/layers/composite/CompositableHost.cpp	Thu Oct 31 09:11:56 2019 +0100
-+++ b/gfx/layers/composite/CompositableHost.cpp	Wed Dec 11 16:16:09 2019 +0100
-@@ -91,6 +91,7 @@
-   }
-   MOZ_ASSERT(source);
- 
-+  // Alternatively: Comment out these lines where the alpha-mask is set
-   RefPtr<EffectMask> effect =
-       new EffectMask(source, source->GetSize(), aTransform);
-   aEffects.mSecondaryEffects[EffectTypes::MASK] = effect;

SOURCES/mozilla-bmo1626236.patch

@@ -1,86 +0,0 @@
-# HG changeset patch
-# User msirringhaus@suse.de
-# Date 1582805876 -3600
-#      Thu Feb 27 13:17:56 2020 +0100
-# Node ID cc3d09abea31068e57f1ab918782f9f86fc6a158
-# Parent  9cd90914846f667f18babc491a74c164ae5d6e9f
-imported patch decoder_workaround.patch
-
-diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
---- a/image/decoders/nsGIFDecoder2.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ b/image/decoders/nsGIFDecoder2.cpp	Fri Mar 27 13:06:18 2020 +0100
-@@ -422,6 +422,9 @@
-   MOZ_ASSERT(mSwizzleFn);
-   uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
-   mSwizzleFn(data, data, aColors);
-+#if MOZ_BIG_ENDIAN()
-+  SwizzleRow(SurfaceFormat::A8R8G8B8, SurfaceFormat::B8G8R8A8)(data, data, aColors);
-+#endif
- }
- 
- LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
-diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
---- a/image/decoders/nsJPEGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ b/image/decoders/nsJPEGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
-@@ -263,6 +263,9 @@
-         case JCS_YCbCr:
-           // By default, we will output directly to BGRA. If we need to apply
-           // special color transforms, this may change.
-+#if MOZ_BIG_ENDIAN()
-+          mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
-+#else
-           switch (SurfaceFormat::OS_RGBX) {
-             case SurfaceFormat::B8G8R8X8:
-               mInfo.out_color_space = JCS_EXT_BGRX;
-@@ -277,6 +280,7 @@
-               mState = JPEG_ERROR;
-               return Transition::TerminateFailure();
-           }
-+#endif
-           break;
-         case JCS_CMYK:
-         case JCS_YCCK:
-diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
---- a/image/decoders/nsPNGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ b/image/decoders/nsPNGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
-@@ -361,7 +361,7 @@
-                                    IResumable* aOnResume) {
-   MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
- 
--  return mLexer.Lex(aIterator, aOnResume,
-+  LexerResult res = mLexer.Lex(aIterator, aOnResume,
-                     [=](State aState, const char* aData, size_t aLength) {
-                       switch (aState) {
-                         case State::PNG_DATA:
-@@ -371,6 +371,14 @@
-                       }
-                       MOZ_CRASH("Unknown State");
-                     });
-+
-+#if MOZ_BIG_ENDIAN()
-+  if(res.is<TerminalState>() && res.as<TerminalState>() == TerminalState::SUCCESS) {
-+      NativeEndian::swapToLittleEndianInPlace<uint32_t>((uint32_t*)(mImageData), mImageDataLength / 4);
-+  }
-+#endif
-+
-+  return res;
- }
- 
- LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
-diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
---- a/image/decoders/nsWebPDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ b/image/decoders/nsWebPDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
-@@ -237,7 +237,12 @@
-   // WebP doesn't guarantee that the alpha generated matches the hint in the
-   // header, so we always need to claim the input is BGRA. If the output is
-   // BGRX, swizzling will mask off the alpha channel.
-+#if MOZ_BIG_ENDIAN()
-+  mBuffer.colorspace = MODE_ARGB;
-+  SurfaceFormat inFormat = mFormat;
-+#else
-   SurfaceFormat inFormat = SurfaceFormat::OS_RGBA;
-+#endif
- 
-   SurfacePipeFlags pipeFlags = SurfacePipeFlags();
-   if (mFormat == SurfaceFormat::OS_RGBA &&
-

SOURCES/mozilla-bmo1670333.patch

@@ -0,0 +1,69 @@
+diff -up firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-115.0/dom/media/mp4/MP4Demuxer.cpp
+--- firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333	2023-06-06 23:14:43.000000000 +0200
++++ firefox-115.0/dom/media/mp4/MP4Demuxer.cpp	2023-06-08 08:15:48.214109403 +0200
+@@ -32,6 +32,8 @@ mozilla::LogModule* GetDemuxerLog() { re
+   DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
+             __func__, ##__VA_ARGS__)
+ 
++extern bool gUseKeyframeFromContainer;
++
+ namespace mozilla {
+ 
+ using TimeUnit = media::TimeUnit;
+@@ -404,6 +406,12 @@ already_AddRefed<MediaRawData> MP4TrackD
+           [[fallthrough]];
+         case H264::FrameType::OTHER: {
+           bool keyframe = type == H264::FrameType::I_FRAME;
++          if (gUseKeyframeFromContainer) {
++            if (sample->mKeyframe && sample->mKeyframe != keyframe) {
++              sample->mKeyframe = keyframe;
++            }
++            break;
++          }
+           if (sample->mKeyframe != keyframe) {
+             NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
+                                        "@ pts:%" PRId64 " dur:%" PRId64
+diff -up firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-115.0/dom/media/platforms/PDMFactory.cpp
+--- firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333	2023-06-06 23:14:44.000000000 +0200
++++ firefox-115.0/dom/media/platforms/PDMFactory.cpp	2023-06-08 08:09:33.145289602 +0200
+@@ -67,6 +67,8 @@
+ 
+ #include <functional>
+ 
++bool gUseKeyframeFromContainer = false;
++
+ using DecodeSupport = mozilla::media::DecodeSupport;
+ using DecodeSupportSet = mozilla::media::DecodeSupportSet;
+ using MediaCodec = mozilla::media::MediaCodec;
+@@ -562,7 +564,7 @@ void PDMFactory::CreateRddPDMs() {
+ #ifdef MOZ_FFMPEG
+   if (StaticPrefs::media_ffmpeg_enabled() &&
+       StaticPrefs::media_rdd_ffmpeg_enabled() &&
+-      !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
++      !(mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>())) {
+     mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
+         FFmpegRuntimeLinker::LinkStatusCode());
+   }
+@@ -738,9 +740,10 @@ void PDMFactory::CreateDefaultPDMs() {
+ 
+   CreateAndStartupPDM<AgnosticDecoderModule>();
+ 
+-  if (StaticPrefs::media_gmp_decoder_enabled() &&
++  if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
+       !StartupPDM(GMPDecoderModule::Create(),
+                   StaticPrefs::media_gmp_decoder_preferred())) {
++    gUseKeyframeFromContainer = true;
+     mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
+   }
+ }
+diff -up firefox-115.0/dom/media/platforms/PDMFactory.h.1670333 firefox-115.0/dom/media/platforms/PDMFactory.h
+--- firefox-115.0/dom/media/platforms/PDMFactory.h.1670333	2023-06-06 23:14:42.000000000 +0200
++++ firefox-115.0/dom/media/platforms/PDMFactory.h	2023-06-08 08:09:33.145289602 +0200
+@@ -103,6 +103,7 @@ class PDMFactory final {
+   RefPtr<PlatformDecoderModule> mNullPDM;
+ 
+   DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
++  bool mFFmpegUsed = false;
+ 
+   friend class RemoteVideoDecoderParent;
+   static void EnsureInit();

SOURCES/mozilla-bmo1716707-svg.patch

@@ -0,0 +1,29 @@
+# HG changeset patch
+# User M. Sirringhaus <msirringhaus@suse.de>
+# Date 1645518286 -3600
+#      Tue Feb 22 09:24:46 2022 +0100
+# Node ID 81832d035e101471dcf52dd91de287268add7a91
+# Parent  66f7ce16eb4965108687280e5443edd610631efb
+imported patch svg-rendering.patch
+
+diff --git a/image/imgFrame.cpp b/image/imgFrame.cpp
+--- a/image/imgFrame.cpp
++++ b/image/imgFrame.cpp
+@@ -372,6 +372,17 @@ nsresult imgFrame::InitWithDrawable(gfxD
+     return NS_ERROR_OUT_OF_MEMORY;
+   }
+ 
++#if MOZ_BIG_ENDIAN()
++  if (aBackend == gfx::BackendType::SKIA && canUseDataSurface) {
++      // SKIA is lying about what format it returns on big endian
++      for (int ii=0; ii < mRawSurface->GetSize().Height()*mRawSurface->Stride() / 4; ++ii) {
++        uint32_t *vals = (uint32_t*)(mRawSurface->GetData());
++        uint32_t val = ((vals[ii] << 8) & 0xFF00FF00 ) | ((vals[ii] >> 8) & 0xFF00FF );
++        vals[ii] = (val << 16) | (val >> 16);
++      }
++  }
++#endif
++
+   if (!canUseDataSurface) {
+     // We used an offscreen surface, which is an "optimized" surface from
+     // imgFrame's perspective.

SOURCES/mozilla-bmo1716707-swizzle.patch

@@ -0,0 +1,34 @@
+# HG changeset patch
+# User M. Sirringhaus <msirringhaus@suse.de>
+# Date 1645518286 -3600
+#      Tue Feb 22 09:24:46 2022 +0100
+# Node ID 494640792b4677f6462e95b90a54a4e22aeb738b
+# Parent  81832d035e101471dcf52dd91de287268add7a91
+imported patch one_swizzle_to_rule_them_all.patch
+
+Index: firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
+===================================================================
+--- firefox-102.0.orig/gfx/webrender_bindings/RenderCompositorSWGL.cpp
++++ firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
+@@ -7,6 +7,7 @@
+ #include "RenderCompositorSWGL.h"
+ 
+ #include "mozilla/gfx/Logging.h"
++#include "mozilla/gfx/Swizzle.h"
+ #include "mozilla/widget/CompositorWidget.h"
+ 
+ #ifdef MOZ_WIDGET_GTK
+@@ -235,6 +237,13 @@ void RenderCompositorSWGL::CommitMappedB
+   }
+   mDT->Flush();
+ 
++#if MOZ_BIG_ENDIAN()
++  // One swizzle to rule them all.
++  gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8,
++                   mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8,
++                   mDT->GetSize());
++#endif
++
+   // Done with the DT. Hand it back to the widget and clear out any trace of it.
+   mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion);
+   mDirtyRegion.SetEmpty();

SOURCES/mozilla-bmo1789216-disable-av1.patch

@@ -0,0 +1,89 @@
+diff --git a/media/ffvpx/libavcodec/allcodecs.c b/media/ffvpx/libavcodec/allcodecs.c
+--- a/media/ffvpx/libavcodec/allcodecs.c
++++ b/media/ffvpx/libavcodec/allcodecs.c
+@@ -755,12 +755,15 @@
+ extern FFCodec ff_libaom_av1_encoder;
+ extern const FFCodec ff_libaribb24_decoder;
+ extern const FFCodec ff_libcelt_decoder;
+ extern const FFCodec ff_libcodec2_encoder;
+ extern const FFCodec ff_libcodec2_decoder;
++#if CONFIG_MOZ_AV1
+ extern const FFCodec ff_libdav1d_decoder;
+ extern const FFCodec ff_libdavs2_decoder;
++extern const FFCodec ff_libuavs3d_decoder;
++#endif
+ extern const FFCodec ff_libfdk_aac_encoder;
+ extern const FFCodec ff_libfdk_aac_decoder;
+ extern const FFCodec ff_libgsm_encoder;
+ extern const FFCodec ff_libgsm_decoder;
+ extern const FFCodec ff_libgsm_ms_encoder;
+@@ -783,11 +786,10 @@
+ extern const FFCodec ff_libspeex_encoder;
+ extern const FFCodec ff_libspeex_decoder;
+ extern const FFCodec ff_libsvtav1_encoder;
+ extern const FFCodec ff_libtheora_encoder;
+ extern const FFCodec ff_libtwolame_encoder;
+-extern const FFCodec ff_libuavs3d_decoder;
+ extern const FFCodec ff_libvo_amrwbenc_encoder;
+ extern const FFCodec ff_libvorbis_encoder;
+ extern const FFCodec ff_libvorbis_decoder;
+ extern const FFCodec ff_libvpx_vp8_encoder;
+ extern const FFCodec ff_libvpx_vp8_decoder;
+diff --git a/media/ffvpx/libavcodec/codec_list.c b/media/ffvpx/libavcodec/codec_list.c
+--- a/media/ffvpx/libavcodec/codec_list.c
++++ b/media/ffvpx/libavcodec/codec_list.c
+@@ -9,12 +9,14 @@
+     &ff_flac_decoder,
+ #endif
+ #if CONFIG_MP3_DECODER
+     &ff_mp3_decoder,
+ #endif
++#if CONFIG_MOZ_AV1
+ #if CONFIG_LIBDAV1D
+     &ff_libdav1d_decoder,
+ #endif
+ #if CONFIG_AV1_DECODER
+     &ff_av1_decoder,
+ #endif
++#endif
+     NULL };
+diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
+--- a/media/ffvpx/libavcodec/moz.build
++++ b/media/ffvpx/libavcodec/moz.build
+@@ -84,11 +84,10 @@
+         'cbs.c',
+         'cbs_av1.c',
+         'golomb.c',
+         'h264pred.c',
+         'imgconvert.c',
+-        'libdav1d.c',
+         'mathtables.c',
+         'qsv_api.c',
+         'raw.c',
+         'videodsp.c',
+         'vp8.c',
+@@ -107,14 +106,19 @@
+         'vp9mvs.c',
+         'vp9prob.c',
+         'vp9recon.c',
+         'vpx_rac.c',
+     ]
+-    USE_LIBS += [
+-        'dav1d',
+-        'media_libdav1d_asm',
+-    ]
++    if CONFIG['MOZ_AV1']:
++        USE_LIBS += [
++            'dav1d',
++            'media_libdav1d_asm',
++        ]
++        SOURCES += [
++            'libdav1d.c',
++        ]
++
+     if CONFIG['MOZ_WAYLAND']:
+         LOCAL_INCLUDES += ['/media/mozva']
+         SOURCES += [
+             'vaapi_av1.c',
+             'vaapi_decode.c',
+

SOURCES/mozilla-bmo849632.patch

@@ -1,16 +1,20 @@
+# HG changeset patch
+# Parent  3de59fe1b8708c01e134ce698c4232b8a854f617
 Problem:  webGL sites are displayed in the wrong color (usually blue-ish)
 Solution: Problem is with skia once again. Output of webgl seems endian-correct, but skia only
           knows how to deal with little endian.
           So we swizzle the output of webgl after reading it from readpixels()
 Note:     This does not fix all webGL sites, but is a step in the right direction
-diff -r 6b017d3e9733 gfx/gl/GLContext.h
---- a/gfx/gl/GLContext.h    Mon Sep 09 10:04:05 2019 +0200
-+++ b/gfx/gl/GLContext.h    Wed Nov 13 17:13:04 2019 +0100
-@@ -1551,6 +1551,13 @@
+
+Index: firefox-115.0/gfx/gl/GLContext.h
+===================================================================
+--- firefox-115.0.orig/gfx/gl/GLContext.h
++++ firefox-115.0/gfx/gl/GLContext.h
+@@ -1560,6 +1560,13 @@ class GLContext : public GenericAtomicRe
      BEFORE_GL_CALL;
      mSymbols.fReadPixels(x, y, width, height, format, type, pixels);
      OnSyncCall();
-+#if MOZ_BIG_ENDIAN
++#if MOZ_BIG_ENDIAN()
 +    uint8_t* itr = (uint8_t*)pixels;
 +    for (GLsizei i = 0; i < width * height; i++) {
 +      NativeEndian::swapToLittleEndianInPlace((uint32_t*)itr, 1);
@@ -20,4 +24,3 @@ diff -r 6b017d3e9733 gfx/gl/GLContext.h
      AFTER_GL_CALL;
      mHeavyGLCallsSinceLastFlush = true;
    }
-

SOURCES/mozilla-bmo998749.patch

@@ -27,4 +27,3 @@ diff -r 506857dace0a -r 34676feac1a5 gfx/2d/FilterProcessing.h
  
  class FilterProcessing {
   public:
-

SOURCES/mozilla-s390-context.patch

@@ -1,36 +0,0 @@
-# HG changeset patch
-# User msirringhaus@suse.de
-# Date 1558452408 -7200
-#      Tue May 21 17:26:48 2019 +0200
-# Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
-# Parent  a3cc550d25e3a04d906f516928cbcbe50efd585e
-[mq]: mozilla-s390-context.patch
-
-diff -r a3cc550d25e3 -r 602e92722e76 js/src/wasm/WasmSignalHandlers.cpp
---- a/js/src/wasm/WasmSignalHandlers.cpp	Tue May 21 17:22:06 2019 +0200
-+++ b/js/src/wasm/WasmSignalHandlers.cpp	Tue May 21 17:26:48 2019 +0200
-@@ -154,6 +154,10 @@
- #    define R01_sig(p) ((p)->uc_mcontext.gp_regs[1])
- #    define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
- #  endif
-+#  if defined(__linux__) && defined(__s390x__)
-+#    define GR_sig(p,x) ((p)->uc_mcontext.gregs[x])
-+#    define PSWa_sig(p) ((p)->uc_mcontext.psw.addr)
-+#  endif
- #elif defined(__NetBSD__)
- #  define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
- #  define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
-@@ -385,8 +389,13 @@
- #  define PC_sig(p) R32_sig(p)
- #  define SP_sig(p) R01_sig(p)
- #  define FP_sig(p) R01_sig(p)
-+#elif defined(__s390x__)
-+# define PC_sig(p) PSWa_sig(p)
-+# define SP_sig(p) GR_sig(p, 15)
-+# define FP_sig(p) GR_sig(p, 11)
- #endif
- 
-+
- static void SetContextPC(CONTEXT* context, uint8_t* pc) {
- #ifdef PC_sig
-   *reinterpret_cast<uint8_t**>(&PC_sig(context)) = pc;

SOURCES/mozilla-s390x-skia-gradient.patch

@@ -1,52 +0,0 @@
-# HG changeset patch
-# Parent  acf59ea86dd1d878b43920832093f082dcfc61c0
-
-diff -r acf59ea86dd1 gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp
---- a/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp	Mon Mar 09 08:26:10 2020 +0100
-+++ b/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp	Fri Mar 27 13:30:28 2020 +0100
-@@ -7,7 +7,7 @@
- 
- #include "include/core/SkPaint.h"
- #include "src/shaders/gradients/Sk4fLinearGradient.h"
--
-+#include "src/core/SkEndian.h"
- #include <cmath>
- #include <utility>
- 
-@@ -28,6 +28,9 @@
- 
-     while (n >= 4) {
-         DstTraits<premul>::store4x(c0, c1, c2, c3, dst, bias0, bias1);
-+#ifdef SK_CPU_BENDIAN
-+        SkEndianSwap32s(dst, 4);
-+#endif
-         dst += 4;
- 
-         c0 = c0 + dc4;
-@@ -37,12 +40,23 @@
-         n -= 4;
-     }
-     if (n & 2) {
--        DstTraits<premul>::store(c0, dst++, bias0);
--        DstTraits<premul>::store(c1, dst++, bias1);
-+        DstTraits<premul>::store(c0, dst, bias0);
-+#ifdef SK_CPU_BENDIAN
-+        *dst = SkEndianSwap32(*dst);
-+#endif
-+        ++dst;
-+        DstTraits<premul>::store(c1, dst, bias1);
-+#ifdef SK_CPU_BENDIAN
-+        *dst = SkEndianSwap32(*dst);
-+#endif
-+        ++dst;
-         c0 = c0 + dc2;
-     }
-     if (n & 1) {
-         DstTraits<premul>::store(c0, dst, bias0);
-+#ifdef SK_CPU_BENDIAN
-+        *dst = SkEndianSwap32(*dst);
-+#endif
-     }
- }
- 
-

SOURCES/node-stdout-nonblocking-wrapper

@@ -1,3 +1,2 @@
 #!/bin/sh
-#exec /usr/bin/node "$@" 2>&1 | cat -
-exec $MOZ_NODEJS "$@" 2>&1 | cat -
+exec node "$@" 2>&1 | cat -

SOURCES/nss-setup-flags-env.inc

@@ -1,7 +1,7 @@
-sed -i 's@%{gtk3_install_path}@%{_buildrootdir}%{gtk3_install_path}@g' %{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig/nss*.pc
+sed -i 's@%{bundled_install_path}@%{_buildrootdir}%{bundled_install_path}@g' %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/nss*.pc
 
-export LDFLAGS="-L%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
-export LDFLAGS="-Wl,-rpath,%{gtk3_install_path}/%{_lib} $LDFLAGS"
-export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
-export PKG_CONFIG_PATH=%{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig
-export PATH="{_buildrootdir}%{gtk3_install_path}/bin:$PATH"
+export LDFLAGS="-L%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
+export LDFLAGS="-Wl,-rpath,%{bundled_install_path}/%{_lib} $LDFLAGS"
+export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
+export PKG_CONFIG_PATH=%{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig
+export PATH="{_buildrootdir}%{bundled_install_path}/bin:$PATH"

SOURCES/process-official-tarball

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+rm -rf ./process-tarball-dir
+mkdir ./process-tarball-dir
+tar -xJf $1 --directory process-tarball-dir
+
+rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0030-isvalid.html
+rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0008-isvalid.html
+rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfalite/0030-isvalid.html
+rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cursors/woolly-64.svg
+rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cursors/woolly.svg
+rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0230-novalid.html
+rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0231-isvalid.html
+rm -vf ./process-tarball-dir/*/layout/inspector/tests/chrome/test_fontVariationsAPI.css
+
+processed_tarball=${1/source/processed-source}
+
+cd ./process-tarball-dir
+tar -cf - ./* | xz -9 -T 0 -f > $processed_tarball
+mv $processed_tarball ..
+cd ..
+
+rm -rf ./process-tarball-dir

SOURCES/python-2.7-gcc8-fix.patch

@@ -1,57 +0,0 @@
-commit 0b91f8a668201fc58fa732b8acc496caedfdbae0
-Author: Florian Weimer <fw@deneb.enyo.de>
-Date:   Sun Apr 29 12:18:33 2018 -0700
-
-    Indicate that _PyGC_Head is only 8-byte aligned. (closes bpo-33374)
-
-    By spec, the "long double" in _PyGC_Head requires the union to always be 16-byte
-    aligned. However, obmalloc only yields 8-byte alignment. Compilers including GCC
-    8 are starting to use alignment information to do store-merging. So, the "long
-    double" needs to be changed to a simple "double" as was long ago done in Python
-    3 by e348c8d154cf6342c79d627ebfe89dfe9de23817. For 2.7, we need to add some
-    dummy padding to make sure _PyGC_Head stays the same size.
-
-diff --git a/Include/objimpl.h b/Include/objimpl.h
-index 5f28683329..cbf6bc3f87 100644
---- Python-2.7.13/Include/objimpl.h
-+++ Python-2.7.13/Include/objimpl.h
-@@ -248,6 +248,20 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t);
- /* for source compatibility with 2.2 */
- #define _PyObject_GC_Del PyObject_GC_Del
-
-+/*
-+ * Former over-aligned definition of PyGC_Head, used to compute the size of the
-+ * padding for the new version below.
-+ */
-+union _gc_head;
-+union _gc_head_old {
-+    struct {
-+        union _gc_head_old *gc_next;
-+        union _gc_head_old *gc_prev;
-+        Py_ssize_t gc_refs;
-+    } gc;
-+    long double dummy;
-+};
-+
- /* GC information is stored BEFORE the object structure. */
- typedef union _gc_head {
-     struct {
-@@ -255,7 +269,8 @@ typedef union _gc_head {
-         union _gc_head *gc_prev;
-         Py_ssize_t gc_refs;
-     } gc;
--    long double dummy;  /* force worst-case alignment */
-+    double dummy; /* Force at least 8-byte alignment. */
-+    char dummy_padding[sizeof(union _gc_head_old)];
- } PyGC_Head;
-
- extern PyGC_Head *_PyGC_generation0;
-diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
-new file mode 100644
-index 0000000000..9ec1a605c8
---- /dev/null
-+++ Python-2.7.13/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
-@@ -0,0 +1,3 @@
-+Tweak the definition of PyGC_Head, so compilers do not believe it is always
-+16-byte aligned on x86. This prevents crashes with more aggressive
-+optimizations present in GCC 8.

SOURCES/python-2.7.patch

@@ -1,17 +0,0 @@
-diff -up Python-2.7.13/configure.build Python-2.7.13/configure
---- Python-2.7.13/configure.build	2019-06-04 13:32:12.772134075 +0200
-+++ Python-2.7.13/configure	2019-06-04 13:32:26.140144601 +0200
-@@ -6018,11 +6018,11 @@ then
- 		# debug builds.
- 		OPT="-g -O0 -Wall $STRICT_PROTO"
- 	    else
--		OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
-+		OPT="-g $WRAP -O2 -Wall $STRICT_PROTO"
- 	    fi
- 	    ;;
- 	*)
--	    OPT="-O3 -Wall $STRICT_PROTO"
-+	    OPT="-O2 -Wall $STRICT_PROTO"
- 	    ;;
- 	esac
- 	case $ac_sys_system in

SOURCES/python-encode.patch

@@ -1,12 +0,0 @@
-diff -up firefox-68.0/python/mozbuild/mozbuild/controller/building.py.old firefox-68.0/python/mozbuild/mozbuild/controller/building.py
---- firefox-68.0/python/mozbuild/mozbuild/controller/building.py.old	2019-05-29 10:46:55.403262995 +0200
-+++ firefox-68.0/python/mozbuild/mozbuild/controller/building.py	2019-05-29 10:47:42.691176970 +0200
-@@ -571,7 +571,7 @@ class TerminalLoggingHandler(logging.Han
-             if self.footer:
-                 self.footer.clear()
- 
--            self.fh.write(msg)
-+            self.fh.write(msg.encode("utf-8"))
-             self.fh.write('\n')
- 
-             if self.footer:

SOURCES/python-missing-utimensat.patch

@@ -1,12 +0,0 @@
-diff -up python3/Python-3.6.8/configure.old python3/Python-3.6.8/configure
---- Python-3.6.8/configure.old	2019-10-01 12:56:35.074551835 +0200
-+++ Python-3.6.8/configure	2019-10-01 12:56:44.240517798 +0200
-@@ -11438,7 +11438,7 @@ for ac_func in alarm accept4 setitimer g
-  sigaction sigaltstack siginterrupt sigpending sigrelse \
-  sigtimedwait sigwait sigwaitinfo snprintf strftime strlcpy symlinkat sync \
-  sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
-- truncate uname unlinkat unsetenv utimensat utimes waitid waitpid wait3 wait4 \
-+ truncate uname unlinkat unsetenv utimes waitid waitpid wait3 wait4 \
-  wcscoll wcsftime wcsxfrm wmemcmp writev _getpty
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

SOURCES/rhbz-1354671.patch

@@ -0,0 +1,12 @@
+diff -up firefox-70.0/layout/base/PresShell.h.1354671 firefox-70.0/layout/base/PresShell.h
+--- firefox-70.0/layout/base/PresShell.h.1354671	2019-10-22 12:33:12.987775587 +0200
++++ firefox-70.0/layout/base/PresShell.h	2019-10-22 12:36:39.999366086 +0200
+@@ -257,7 +257,7 @@ class PresShell final : public nsStubDoc
+    * to the same aSize value.  AllocateFrame is infallible and will abort
+    * on out-of-memory.
+    */
+-  void* AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
++  void* __attribute__((optimize("no-lifetime-dse"))) AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
+ #define FRAME_ID(classname, ...)                                  \
+   static_assert(size_t(nsQueryFrame::FrameIID::classname##_id) == \
+                     size_t(eArenaObjectID_##classname),           \

SOURCES/rhbz-1821418.patch

@@ -1,36 +0,0 @@
-diff -up firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp.rhbz-1821418 firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp
---- firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp.rhbz-1821418	2020-06-17 04:20:44.000000000 +0200
-+++ firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp	2020-06-25 14:50:46.369798294 +0200
-@@ -157,8 +157,12 @@ bool nsAvailableMemoryWatcher::IsVirtual
- 
- /* static */
- bool nsAvailableMemoryWatcher::IsCommitSpaceLow(const MEMORYSTATUSEX& aStat) {
--  if ((kLowCommitSpaceThreshold != 0) &&
--      (aStat.ullAvailPageFile < kLowCommitSpaceThreshold)) {
-+  const char* threshold = getenv("MOZ_GC_THRESHOLD");
-+  if (threshold) {
-+    kLowCommitSpaceThreshold = atoi(threshold);
-+  }
-+
-+  if ((kLowCommitSpaceThreshold == 0) || (aStat.ullAvailPageFile < kLowCommitSpaceThreshold)) {
-     sNumLowCommitSpaceEvents++;
-     CrashReporter::AnnotateCrashReport(
-         CrashReporter::Annotation::LowCommitSpaceEvents,
-@@ -210,12 +214,15 @@ void nsAvailableMemoryWatcher::AdjustPol
- // polling interval accordingly.
- NS_IMETHODIMP
- nsAvailableMemoryWatcher::Notify(nsITimer* aTimer) {
-+  const char* threshold = getenv("MOZ_GC_THRESHOLD");
-+  bool forceLowMem = (threshold && atoi(threshold) == 0);
-+
-   MEMORYSTATUSEX stat;
-   stat.dwLength = sizeof(stat);
-   bool success = GlobalMemoryStatusEx(&stat);
- 
--  if (success) {
--    bool lowMemory = IsVirtualMemoryLow(stat) || IsCommitSpaceLow(stat);
-+  if (success || forceLowMemory) {
-+    bool lowMemory = IsVirtualMemoryLow(stat) || IsCommitSpaceLow(stat || forceLowMem);
- 
-     if (lowMemory) {
-       SendMemoryPressureEvent();

SOURCES/rhel6-abiv2-mozbz1642174.patch

@@ -1,29 +0,0 @@
-diff -up firefox-78.2.0/security/nss/lib/freebl/freebl.gyp.rhel6-abiv2-mozbz1642174 firefox-78.2.0/security/nss/lib/freebl/freebl.gyp
---- firefox-78.2.0/security/nss/lib/freebl/freebl.gyp.rhel6-abiv2-mozbz1642174	2020-09-12 08:29:08.527410514 +0200
-+++ firefox-78.2.0/security/nss/lib/freebl/freebl.gyp	2020-09-12 08:42:26.279064334 +0200
-@@ -259,7 +259,7 @@
-       'type': 'static_library',
-       'sources': [
-         'gcm-ppc.c',
--        'sha512-p8.s',
-+        #'sha512-p8.s',
-       ],
-       'dependencies': [
-         '<(DEPTH)/exports.gyp:nss_exports'
-diff -up firefox-78.2.0/security/nss/lib/freebl/Makefile.rhel6-abiv2-mozbz1642174 firefox-78.2.0/security/nss/lib/freebl/Makefile
---- firefox-78.2.0/security/nss/lib/freebl/Makefile.rhel6-abiv2-mozbz1642174	2020-08-17 20:34:06.000000000 +0200
-+++ firefox-78.2.0/security/nss/lib/freebl/Makefile	2020-09-12 08:28:08.089142990 +0200
-@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm)
- endif
- ifeq ($(CPU_ARCH),ppc)
-     EXTRA_SRCS += gcm-ppc.c
--    ASFILES += sha512-p8.s
- ifdef USE_64
-     DEFINES += -DNSS_NO_INIT_SUPPORT
-+		#PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
-+   # ifeq ($(PPC_ABI),2)
-+   #     ASFILES += sha512-p8.s
-+   # endif		
- endif # USE_64
- endif # ppc
- endif # Linux

SOURCES/rhel6-at-no-automount.patch

@@ -1,27 +0,0 @@
-diff -ru firefox-78.3.0/security/sandbox/linux/SandboxFilter.cpp firefox-78.4.0/security/sandbox/linux/SandboxFilter.cpp
---- firefox-78.3.0/security/sandbox/linux/SandboxFilter.cpp	2020-09-14 21:21:02.000000000 +0200
-+++ firefox-78.4.0/security/sandbox/linux/SandboxFilter.cpp	2020-10-14 11:34:48.000000000 +0200
-@@ -243,14 +243,21 @@
-     auto path = reinterpret_cast<const char*>(aArgs.args[1]);
-     auto buf = reinterpret_cast<statstruct*>(aArgs.args[2]);
-     auto flags = static_cast<int>(aArgs.args[3]);
-+
-+    if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 &&
-+        strcmp(path, "") == 0) {
-+      return ConvertError(fstatsyscall(fd, buf));
-+    }
-+
-     if (fd != AT_FDCWD && path[0] != '/') {
-       SANDBOX_LOG_ERROR("unsupported fd-relative fstatat(%d, \"%s\", %p, %d)",
-                         fd, path, buf, flags);
-       return BlockedSyscallTrap(aArgs, nullptr);
-     }
--    if ((flags & ~AT_SYMLINK_NOFOLLOW) != 0) {
-+    if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)) != 0) {
-       SANDBOX_LOG_ERROR("unsupported flags %d in fstatat(%d, \"%s\", %p, %d)",
--                        (flags & ~AT_SYMLINK_NOFOLLOW), fd, path, buf, flags);
-+                        (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)), fd,
-+                        path, buf, flags);
-       return BlockedSyscallTrap(aArgs, nullptr);
-     }
-     return (flags & AT_SYMLINK_NOFOLLOW) == 0 ? broker->Stat(path, buf)

SOURCES/rhel6-auxv.patch

@@ -1,21 +0,0 @@
-diff -up thunderbird-78.3.0/comm/third_party/botan/src/lib/utils/os_utils.cpp.auxv thunderbird-78.3.0/comm/third_party/botan/src/lib/utils/os_utils.cpp
---- thunderbird-78.3.0/comm/third_party/botan/src/lib/utils/os_utils.cpp.auxv	2020-09-25 17:23:50.810638756 +0200
-+++ thunderbird-78.3.0/comm/third_party/botan/src/lib/utils/os_utils.cpp	2020-09-25 17:26:00.156999592 +0200
-@@ -42,7 +42,7 @@
- 
- #if defined(BOTAN_TARGET_OS_HAS_GETAUXVAL) || defined(BOTAN_TARGET_OS_IS_ANDROID) || \
-   defined(BOTAN_TARGET_OS_HAS_ELF_AUX_INFO)
--  #include <sys/auxv.h>
-+  //#include <sys/auxv.h>
- #endif
- 
- #if defined(BOTAN_TARGET_OS_HAS_WIN32)
-@@ -109,7 +109,7 @@ uint32_t OS::get_process_id()
- unsigned long OS::get_auxval(unsigned long id)
-    {
- #if defined(BOTAN_TARGET_OS_HAS_GETAUXVAL)
--   return ::getauxval(id);
-+   //return ::getauxval(id);
- #elif defined(BOTAN_TARGET_OS_IS_ANDROID) && defined(BOTAN_TARGET_ARCH_IS_ARM32)
- 
-    if(id == 0)

SOURCES/rhel6-auxvh.patch

@@ -1,39 +0,0 @@
-diff -up firefox-78.2.0/mozglue/build/ppc.cpp.ppc-vsx firefox-78.2.0/mozglue/build/ppc.cpp
---- firefox-78.2.0/mozglue/build/ppc.cpp.ppc-vsx	2020-09-11 07:07:05.850864720 +0200
-+++ firefox-78.2.0/mozglue/build/ppc.cpp	2020-09-11 07:08:48.884202679 +0200
-@@ -14,10 +14,6 @@
- #if defined(XP_LINUX)
- // Use the getauxval() function if available.
- // ARCH_3_00 wasn't defined until glibc 2.23, so include just in case.
--#  include <sys/auxv.h>
--#  ifndef PPC_FEATURE2_ARCH_3_00
--#    define PPC_FEATURE2_ARCH_3_00 0x00800000
--#  endif
- #endif
- 
- const unsigned PPC_FLAG_VMX = 1;
-@@ -33,24 +29,8 @@ static signed get_ppc_cpu_flags(void) {
-   }
-   cpu_flags = 0;
- 
--#if defined(XP_LINUX)
--  // Try getauxval().
--  unsigned long int cap = getauxval(AT_HWCAP);
--  unsigned long int cap2 = getauxval(AT_HWCAP2);
--
--  if (cap & PPC_FEATURE_HAS_ALTIVEC) {
--    cpu_flags |= PPC_FLAG_VMX;
--  }
--  if (cap & PPC_FEATURE_HAS_VSX) {
--    cpu_flags |= PPC_FLAG_VSX;
--  }
--  if (cap2 & PPC_FEATURE2_ARCH_3_00) {
--    cpu_flags |= PPC_FLAG_VSX3;
--  }
--#else
-   // Non-Linux detection here. Currently, on systems other than Linux,
-   // no CPU SIMD features will be detected.
--#endif
- 
-   return cpu_flags;
- }

SOURCES/rhel6-clock_gettime.patch

@@ -1,12 +0,0 @@
-diff -up thunderbird-78.3.1/comm/third_party/botan/src/lib/utils/os_utils.cpp.rhel6-clock_gettime thunderbird-78.3.1/comm/third_party/botan/src/lib/utils/os_utils.cpp
---- thunderbird-78.3.1/comm/third_party/botan/src/lib/utils/os_utils.cpp.rhel6-clock_gettime	2020-09-29 21:41:52.180409804 +0200
-+++ thunderbird-78.3.1/comm/third_party/botan/src/lib/utils/os_utils.cpp	2020-09-29 21:42:54.438565760 +0200
-@@ -254,6 +254,8 @@ uint64_t OS::get_high_resolution_clock()
-    fall back to std::chrono.
-    */
- 
-+#undef BOTAN_TARGET_OS_HAS_CLOCK_GETTIME
-+
- #if defined(BOTAN_TARGET_OS_HAS_CLOCK_GETTIME)
- 
-    // The ordering here is somewhat arbitrary...

SOURCES/rhel6-dbusver.patch

@@ -1,41 +0,0 @@
-diff -up firefox-78.2.0/third_party/rust/libdbus-sys/build.rs.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/build.rs
---- firefox-78.2.0/third_party/rust/libdbus-sys/build.rs.rhel6-dbusver	2020-08-17 20:34:46.000000000 +0200
-+++ firefox-78.2.0/third_party/rust/libdbus-sys/build.rs	2020-09-09 21:06:34.932374254 +0200
-@@ -3,5 +3,5 @@ extern crate pkg_config;
- fn main() {
-     // See https://github.com/joshtriplett/metadeps/issues/9 for why we don't use
-     // metadeps here, but instead keep this manually in sync with Cargo.toml.
--    pkg_config::Config::new().atleast_version("1.6").probe("dbus-1").unwrap();
-+    pkg_config::Config::new().atleast_version("1.2").probe("dbus-1").unwrap();
- }
-diff -up firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json
---- firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json.rhel6-dbusver	2020-08-17 20:35:05.000000000 +0200
-+++ firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json	2020-09-09 21:11:37.045287830 +0200
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"7054b852a13a318562f3ef791e69802f234c9f3d943f2de2d1cef8b31fd0939a","LICENSE-APACHE":"453745410e3be8cf25d56872ea2aec975a78e6c9f217443d0bf908a5bce7c8ff","LICENSE-MIT":"de3911c2d98c8bd2d701ee721347053d9b55995a11f9a8c955e44d3ca1b376bf","build.rs":"9fbc218277d76a570c01c5795a7c8008f5458317cc036d7c88b1dc1a4af22fb7","src/lib.rs":"c8a0d43a3b7e9c8828d4946437379f1985492bd6b04fdd5e967bbcace2197c3d"},"package":"18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"7054b852a13a318562f3ef791e69802f234c9f3d943f2de2d1cef8b31fd0939a","LICENSE-APACHE":"453745410e3be8cf25d56872ea2aec975a78e6c9f217443d0bf908a5bce7c8ff","LICENSE-MIT":"de3911c2d98c8bd2d701ee721347053d9b55995a11f9a8c955e44d3ca1b376bf","build.rs":"41d24ea34bd37eb7a47253ac0681da2dde73e52caf04bbcecf795965e5d36466","src/lib.rs":"31e939a4a7f537265a84c91ba940ac31ac0f66c53a49971f1b21bbd2e4a7b5e9"},"package":"18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"}
-diff -up firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs
---- firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs.rhel6-dbusver	2020-08-17 20:34:38.000000000 +0200
-+++ firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs	2020-09-09 21:06:34.933374260 +0200
-@@ -252,13 +252,14 @@ extern "C" {
-     pub fn dbus_signature_validate_single(signature: *const c_char, error: *mut DBusError) -> u32;
- 
-     pub fn dbus_threads_init_default() -> c_int;
-+}
-+    pub fn dbus_validate_bus_name(busname: *const c_char, error: *mut DBusError) -> u32 {return 1;}
-+    pub fn dbus_validate_error_name(errorname: *const c_char, error: *mut DBusError) -> u32 {return 1;}
-+    pub fn dbus_validate_interface(interface: *const c_char, error: *mut DBusError) -> u32 {return 1;}
-+    pub fn dbus_validate_member(member: *const c_char, error: *mut DBusError) -> u32 {return 1;}
-+    pub fn dbus_validate_path(path: *const c_char, error: *mut DBusError) -> u32 {return 1;}
- 
--    pub fn dbus_validate_bus_name(busname: *const c_char, error: *mut DBusError) -> u32;
--    pub fn dbus_validate_error_name(errorname: *const c_char, error: *mut DBusError) -> u32;
--    pub fn dbus_validate_interface(interface: *const c_char, error: *mut DBusError) -> u32;
--    pub fn dbus_validate_member(member: *const c_char, error: *mut DBusError) -> u32;
--    pub fn dbus_validate_path(path: *const c_char, error: *mut DBusError) -> u32;
--
-+extern "C" {
-     pub fn dbus_watch_get_enabled(watch: *mut DBusWatch) -> u32;
-     pub fn dbus_watch_get_flags(watch: *mut DBusWatch) -> c_uint;
-     pub fn dbus_watch_get_unix_fd(watch: *mut DBusWatch) -> c_int;

SOURCES/rhel6-kernel.patch

@@ -1,16 +0,0 @@
-diff -up firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.rhel6-kernel firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
---- firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.rhel6-kernel	2020-09-09 19:56:13.159597467 +0200
-+++ firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc	2020-09-09 19:56:31.457712629 +0200
-@@ -385,11 +385,7 @@ bool DeviceInfoLinux::IsDeviceNameMatche
- 
- bool DeviceInfoLinux::IsVideoCaptureDevice(struct v4l2_capability* cap)
- {
--  if (cap->capabilities & V4L2_CAP_DEVICE_CAPS) {
--    return cap->device_caps & V4L2_CAP_VIDEO_CAPTURE;
--  } else {
--    return cap->capabilities & V4L2_CAP_VIDEO_CAPTURE;
--  }
-+  return false;
- }
- 
- int32_t DeviceInfoLinux::FillCapabilities(int fd) {

SOURCES/rhel6-mach-fail.patch

@@ -1,12 +0,0 @@
-diff -up firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py.mach-fail firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py
---- firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py.mach-fail	2020-09-09 19:25:18.552930506 +0200
-+++ firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py	2020-09-09 19:25:31.081010223 +0200
-@@ -591,7 +591,7 @@ class TerminalLoggingHandler(logging.Han
-             if self.footer:
-                 self.footer.clear()
- 
--            self.fh.write(msg.encode("utf-8"))
-+            self.fh.write(msg)
-             self.fh.write('\n')
- 
-             if self.footer:

SOURCES/rhel6-zconst.patch

@@ -1,12 +0,0 @@
-diff -up firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp.zconst firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp
---- firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp.zconst	2020-09-09 20:29:17.489123431 +0200
-+++ firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp	2020-09-09 20:30:09.544457350 +0200
-@@ -523,7 +523,7 @@ nsProfiler::GetProfileDataAsGzippedArray
-             stream.opaque = nullptr;
-             stream.next_out = (Bytef*)outBuff.Elements();
-             stream.avail_out = outBuff.Length();
--            stream.next_in = (z_const Bytef*)aResult.Data();
-+            stream.next_in = (Bytef*)aResult.Data();
-             stream.avail_in = aResult.Length();
- 
-             // A windowBits of 31 is the default (15) plus 16 for emitting a

SOURCES/thunderbird-mozconfig

@@ -1,27 +1,39 @@
 ac_add_options --enable-application=comm/mail
 
-ac_add_options --enable-default-toolkit=cairo-gtk3
-
-ac_add_options --prefix="$PREFIX"
-ac_add_options --libdir="$LIBDIR"
-ac_add_options --with-system-zlib
+ac_add_options --allow-addon-sideload
+ac_add_options --disable-bootstrap
+ac_add_options --disable-crashreporter
+#ac_add_options --disable-elf-hack
+ac_add_options --disable-jemalloc
 ac_add_options --disable-strip
 ac_add_options --disable-tests
-#ac_add_options --enable-libnotify
-ac_add_options --enable-necko-wifi
 ac_add_options --disable-updater
-ac_add_options --enable-calendar
 ac_add_options --enable-chrome-format=omni
+ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
+ac_add_options --enable-js-shell
+ac_add_options --enable-necko-wifi
+ac_add_options --enable-official-branding
+ac_add_options --enable-official-branding
 ac_add_options --enable-pulseaudio
-ac_add_options --with-system-icu
-ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
+ac_add_options --enable-release
+ac_add_options --enable-system-ffi
+ac_add_options --libdir="$LIBDIR"
+ac_add_options --prefix="$PREFIX"
+ac_add_options --update-channel=release
 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 --disable-av1
-ac_add_options --disable-crashreporter
+ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
+ac_add_options --without-sysroot
+ac_add_options --without-system-icu
+ac_add_options --without-wasm-sandboxed-libraries
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-unsigned-addon-scopes=app,system
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
+export MOZ_UPDATE_CHANNEL=release
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZILLA_OFFICIAL=1

SOURCES/thunderbird-redhat-default-prefs.js

@@ -1,7 +1,7 @@
 pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
-# Allow users to set custom colors
-# pref("browser.display.use_system_colors",   true);
+/* Allow users to set custom colors*/
+/* pref("browser.display.use_system_colors",   true);*/
 pref("general.useragent.vendor", "Red Hat");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
@@ -9,17 +9,19 @@ pref("mail.shell.checkDefaultClient", false);
 pref("toolkit.networkmanager.disable", false);
 pref("offline.autoDetect", true);
 
-# Disable global indexing by default
+/* Disable global indexing by default*/
 pref("mailnews.database.global.indexer.enabled", false);
 
-# Do not switch to Smart Folders after upgrade to 3.0b4
+/* Do not switch to Smart Folders after upgrade to 3.0b4 */
 pref("mail.folder.views.version", "1");
 pref("extensions.shownSelectionUI", true);
-pref("extensions.autoDisableScope", 0);
+pref("extensions.autoDisableScopes", 0);
 
-# For rhbz#1024232
+/* For rhbz#1024232 */
 pref("ui.SpellCheckerUnderlineStyle",       1);
 
+/* Workaround for rhbz#1753011 */
+pref("spellchecker.dictionary_path", "/usr/share/myspell");
 /* Workaround for rhbz#1134876 */
 pref("javascript.options.baselinejit",      false);
 /* Workaround for rhbz#1110291 */
@@ -28,6 +30,7 @@ pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
 pref("security.use_mozillapkix_verification", false);
 /* Use OS settings for UI language */
 pref("intl.locale.requested", "");
+/* Disable telemetry */
 pref("datareporting.healthreport.uploadEnabled", false);
 pref("datareporting.policy.dataSubmissionEnabled", false);
 pref("toolkit.telemetry.archive.enabled", false);

SOURCES/thunderbird-redhat-default-prefs.js.rhel7

@@ -1,33 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-# Allow users to set custom colors
-# pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "Red Hat");
-pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
-pref("intl.locale.matchOS", true);
-pref("mail.shell.checkDefaultClient", false);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-
-# Disable global indexing by default
-pref("mailnews.database.global.indexer.enabled", false);
-
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1");
-pref("extensions.shownSelectionUI", true);
-pref("extensions.autoDisableScope", 0);
-
-# For rhbz#1024232
-pref("ui.SpellCheckerUnderlineStyle",       1);
-
-/* Workaround for rhbz#1134876 */
-pref("javascript.options.baselinejit",      false);
-/* Workaround for rhbz#1110291 */
-pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
-/* Workaround for mozbz#1063315 */
-pref("security.use_mozillapkix_verification", false);
-/* Use OS settings for UI language */
-pref("intl.locale.requested", "");
-pref("datareporting.healthreport.uploadEnabled", false);
-pref("datareporting.policy.dataSubmissionEnabled", false);
-pref("toolkit.telemetry.archive.enabled", false);

SOURCES/thunderbird-symbolic.svg

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg826"
+   inkscape:version="0.92+devel unknown"
+   sodipodi:docname="thunderbird-symbolic.svg">
+  <defs
+     id="defs820" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#555753"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="14.909311"
+     inkscape:cy="6.5299379"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1136"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true" />
+  <metadata
+     id="metadata823">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76664)">
+    <path
+       style="fill:#bebebe;fill-opacity:1;stroke-width:0.50472808;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:1.00945637, 3.02836921000000014"
+       d="M 6.2871094 0.6796875 C 5.4163558 0.91578892 4.8510898 1.5936957 4.5292969 2.1464844 C 2.421315 3.2450921 0.99225272 5.3610823 0.9921875 7.7949219 C 0.99477587 10.359489 2.3110205 12.446765 4.71875 13.445312 C 3.4595645 12.812546 2.2935825 11.525048 1.9707031 10.179688 C 1.7935937 9.4417327 1.7111632 8.3804473 1.7871094 7.8671875 C 2.0153769 8.1799434 2.3679623 8.3686337 2.6191406 8.3535156 C 2.4938628 8.2316259 2.1405878 7.2674351 2.2246094 6.7109375 C 2.3603578 5.8118257 3.1848776 4.5727304 3.6171875 4.3652344 C 3.5950724 4.1994643 3.6227354 4.5729785 3.6347656 4.6757812 C 3.6727178 5.0001403 3.7890738 5.2722323 3.7246094 5.5625 C 3.6729882 5.7950165 3.4515893 6.0294455 3.4980469 6.4824219 C 3.5108599 6.6073731 3.6284702 6.8445848 3.7539062 6.9277344 C 3.7535036 6.9231566 3.7580261 6.9016692 3.7578125 6.8964844 C 4.1688563 6.4878098 4.2988638 6.3923311 4.8164062 6.1835938 C 5.3947783 5.9504725 5.7292796 5.4840924 6.5429688 5.3242188 C 7.1567719 5.2036518 7.7980995 5.4618768 8.4160156 5.4316406 C 8.9595412 5.4051839 9.6230469 5.3164062 9.6230469 5.3164062 C 9.6230469 5.3164062 10.529591 6.3734458 10.554688 8.0839844 C 10.561372 8.5399466 10.393117 9.2581935 10.080078 9.6074219 C 10.10866 9.6301636 10.842076 9.8181331 11.496094 8.9296875 L 11.496094 8.9277344 C 11.500502 8.9217421 11.509138 8.9123452 11.513672 8.90625 C 11.511804 8.9162203 11.509634 8.919117 11.507812 8.9296875 C 11.082979 11.395346 10.343305 12.786026 9.3730469 13.716797 L 9.3652344 13.716797 C 9.1593686 13.914136 8.9415569 14.089651 8.7167969 14.253906 C 8.6515695 14.300524 8.584386 14.344389 8.5175781 14.388672 C 8.3185959 14.523496 8.1179918 14.6549 7.9042969 14.771484 C 7.453226 15.017472 9.0852392 14.946167 10.126953 14.476562 C 10.157938 14.470814 10.189917 14.46715 10.220703 14.460938 C 9.8033537 14.744465 9.3535156 15 9.3535156 15 C 9.3535156 15 10.890634 14.899538 11.974609 13.804688 C 11.975453 13.803262 11.975783 13.800425 11.976562 13.798828 C 13.818222 12.736706 15.007176 10.687802 15.007812 8.21875 C 15.005272 5.4392694 13.347542 2.9608845 10.865234 2.0253906 C 9.9215437 1.5797455 8.881353 1.3464382 7.8261719 1.34375 C 7.5325222 1.3437527 7.2448312 1.3664635 6.9609375 1.4003906 C 6.9469035 1.339967 6.9417802 1.323023 6.9726562 1.203125 C 6.8504944 1.2378967 6.8589251 1.2466706 6.7519531 1.2988281 C 6.7527631 1.1850643 6.7593232 1.2159555 6.7519531 1.0976562 C 6.5269885 1.1694673 6.5079647 1.1993654 6.3398438 1.3085938 C 6.3964573 1.0867355 6.399826 1.1278526 6.5527344 0.88671875 C 6.3493259 0.94186206 6.0726487 1.1030774 5.7460938 1.4511719 C 5.8509855 1.1114301 5.9907037 1.0292938 6.2871094 0.6796875 z "
+       transform="matrix(0.26458333,0,0,0.26458333,0,292.76664)"
+       id="path24330" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26511249;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;opacity:1"
+       d="M 0.81054688 293.97852 L 0.59179688 294.12695 L 1.4453125 295.40234 L 2.9335938 294.85156 L 2.8417969 294.60352 L 1.5507812 295.08008 L 0.81054688 293.97852 z "
+       id="path24387" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 1.7871094,9.8730469 0.1210937,0.5820311 -0.1230469,-0.02344 c 0,0 0.2754046,0.874485 0.8561662,1.437975 0.5080908,0.49319 0.9335266,1.121624 2.1243026,1.601087 C 4.3317049,12.663641 4.1812012,12.346136 3.9980469,11.6875 l 0.2128906,0.07031 C 4.5424397,12.049861 4.8536251,12.30456 5.5800781,12.4375 5.4786992,12.266213 5.448324,12.238135 5.3847656,12.142578 l 4.7363284,1.554688 0.316406,-0.945313 z"
+       transform="matrix(0.26458333,0,0,0.26458333,0,292.76664)"
+       id="path24379"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccc" />
+  </g>
+</svg>

SOURCES/thunderbird.sh.in

@@ -10,12 +10,12 @@
 MOZ_ARCH=$(uname -m)
 case $MOZ_ARCH in
         x86_64 | s390x | sparc64 )
-                MOZ_LIB_DIR="/usr/lib64"
-                SECONDARY_LIB_DIR="/usr/lib"
+                MOZ_LIB_DIR="__PREFIX__/lib64"
+                SECONDARY_LIB_DIR="__PREFIX__/lib"
                 ;;
         * )
-                MOZ_LIB_DIR="/usr/lib"
-                SECONDARY_LIB_DIR="/usr/lib64"
+                MOZ_LIB_DIR="__PREFIX__/lib"
+                SECONDARY_LIB_DIR="__PREFIX__/lib64"
                 ;;
 esac
 
@@ -35,6 +35,22 @@ MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird"
 MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
 MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
 
+##
+## Enable Wayland backend?
+##
+%DISABLE_WAYLAND_PLACEHOLDER%
+
+if ! [ $MOZ_DISABLE_WAYLAND ] && [ "$WAYLAND_DISPLAY" ]; then
+  if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
+    export MOZ_ENABLE_WAYLAND=1
+  fi
+##  Enable Wayland on KDE/Sway
+##
+  if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
+    export MOZ_ENABLE_WAYLAND=1
+  fi
+fi
+
 ##
 ## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
 ## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango
@@ -45,7 +61,7 @@ MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{3550f703-e582-4d05-9a08-4
 ##
 ## Set MOZ_APP_LAUNCHER for gnome-session
 ##
-export MOZ_APP_LAUNCHER="/usr/bin/thunderbird"
+export MOZ_APP_LAUNCHER="__PREFIX__/bin/thunderbird"
 
 ##
 ## Disable the GNOME crash dialog, Moz has it's own
@@ -123,23 +139,4 @@ fi
 NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
 export NSS_SSL_CBC_RANDOM_IV
 
-# Linux version specific environment variables
-%RHEL_ENV_VARS%
-
-# Make sure at-spi-bus is running
-if ! dbus-send --session            \
-     --dest=org.freedesktop.DBus    \
-     --type=method_call             \
-     --print-reply                  \
-     /org/freedesktop/DBus          \
-     org.freedesktop.DBus.ListNames \
-     | grep org.a11y.Bus > /dev/null; then
-    if [ -f "$MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher" ]; then
-        echo "Starting a11y dbus service..."
-        $MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher &
-    else
-        echo "Running without a11y support!"
-    fi
-fi
-
 exec $MOZ_PROGRAM "$@"