import thunderbird-102.3.0-3.el9_1

2 years ago · 3cc510e45a
commit 3cc510e45a
49 changed files with 2958 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,6 @@
 SOURCES/cbindgen-vendor.tar.xz
 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
 SOURCES/nss-3.79.0-6.el8_1.src.rpm
 SOURCES/thunderbird-102.3.0.processed-source.tar.xz
 SOURCES/thunderbird-langpacks-102.3.0-20220916.tar.xz
 SOURCES/thunderbird-symbolic.svg
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@ -0,0 +1,6 @@
 2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz
 af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
 fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm
 9344c5c96c40ea76f66ef594c16c73a6f72ecd7d SOURCES/thunderbird-102.3.0.processed-source.tar.xz
 acfcde32709f2dabf0c99ba19ddd8f4c6515b53a SOURCES/thunderbird-langpacks-102.3.0-20220916.tar.xz
 42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg
--- a/SOURCES/0001-GLIBCXX-fix-for-GCC-12.patch
+++ b/SOURCES/0001-GLIBCXX-fix-for-GCC-12.patch
@ -0,0 +1,44 @@
 From efd5bc0715e5477318be95a76811cda0a89e8289 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
 Date: Fri, 4 Mar 2022 12:00:26 +0100
 Subject: [PATCH] GLIBCXX fix for GCC 12?
 ---
 build/unix/stdc++compat/stdc++compat.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 diff --git a/build/unix/stdc++compat/stdc++compat.cpp b/build/unix/stdc++compat/stdc++compat.cpp
 index 0180f6bcfa998..8d7a542ff11f0 100644
 --- a/build/unix/stdc++compat/stdc++compat.cpp
 +++ b/build/unix/stdc++compat/stdc++compat.cpp
@@ -24,6 +24,7 @@
    GLIBCXX_3.4.27 is from gcc 10
    GLIBCXX_3.4.28 is from gcc 10
    GLIBCXX_3.4.29 is from gcc 11
 +   GLIBCXX_3.4.30 is from gcc 12
 This file adds the necessary compatibility tricks to avoid symbols with
 version GLIBCXX_3.4.20 and bigger, keeping binary compatibility with
@@ -69,6 +70,19 @@ void __attribute__((weak)) __throw_bad_array_new_length() { MOZ_CRASH(); }
 }  // namespace std
 #endif
 +#if _GLIBCXX_RELEASE >= 12
 +namespace std {
 +
 +/* This avoids the GLIBCXX_3.4.30 symbol version. */
 +void __attribute__((weak))
 +__glibcxx_assert_fail(const char* __file, int __line, const char* __function,
 +                      const char* __condition) {
 +  MOZ_CRASH();
 +}
 +
 +}  // namespace std
 +#endif
 +
 /* While we generally don't build with exceptions, we have some host tools
  * that do use them. libstdc++ from GCC 5.0 added exception constructors with
  * char const* argument. Older versions only have a constructor with
 -- 
 2.35.1
--- a/SOURCES/build-aarch64-skia.patch
+++ b/SOURCES/build-aarch64-skia.patch
@ -0,0 +1,45 @@
 diff -up firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia firefox-72.0/gfx/skia/skia/include/private/SkHalf.h
 --- firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia	2020-01-02 22:33:02.000000000 +0100
 +++ firefox-72.0/gfx/skia/skia/include/private/SkHalf.h	2020-01-03 09:00:37.537296105 +0100
@@ -40,7 +40,7 @@ static inline Sk4h SkFloatToHalf_finite_
 static inline Sk4f SkHalfToFloat_finite_ftz(uint64_t rgba) {
     Sk4h hs = Sk4h::Load(&rgba);
 -#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
 +#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
     float32x4_t fs;
     asm ("fcvtl %[fs].4s, %[hs].4h   \n"   // vcvt_f32_f16(...)
         : [fs] "=w" (fs)                   // =w: write-only NEON register
@@ -62,7 +62,7 @@ static inline Sk4f SkHalfToFloat_finite_
 }
 static inline Sk4h SkFloatToHalf_finite_ftz(const Sk4f& fs) {
 -#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
 +#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
     float32x4_t vec = fs.fVec;
     asm ("fcvtn %[vec].4h, %[vec].4s  \n"   // vcvt_f16_f32(vec)
         : [vec] "+w" (vec));                // +w: read-write NEON register
 diff -up firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
 --- firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
 +++ firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2020-01-03 10:11:41.259219508 +0100
@@ -1087,7 +1087,7 @@ SI F from_half(U16 h) {
 }
 SI U16 to_half(F f) {
 -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
 +#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
     return vcvt_f16_f32(f);
 diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
 --- firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
 +++ firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h	2020-01-03 10:11:53.513250979 +0100
@@ -183,8 +183,6 @@ SI F F_from_Half(U16 half) {
 SI U16 Half_from_F(F f) {
 #if defined(USING_NEON_FP16)
     return bit_pun<U16>(f);
 -#elif defined(USING_NEON_F16C)
 -    return (U16)vcvt_f16_f32(f);
 #elif defined(USING_AVX512F)
     return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
 #elif defined(USING_AVX_F16C)
--- a/SOURCES/build-arm-libaom.patch
+++ b/SOURCES/build-arm-libaom.patch
@ -0,0 +1,12 @@
 diff -up firefox-73.0/media/libaom/moz.build.old firefox-73.0/media/libaom/moz.build
 --- firefox-73.0/media/libaom/moz.build.old	2020-02-07 23:13:28.000000000 +0200
 +++ firefox-73.0/media/libaom/moz.build	2020-02-17 10:30:08.509805092 +0200
@@ -55,7 +55,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
     for f in SOURCES:
         if f.endswith('neon.c'):
 -            SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
 +            SOURCES[f].flags += CONFIG['NEON_FLAGS']
     if CONFIG['OS_TARGET'] == 'Android':
         # For cpu-features.h
--- a/SOURCES/build-arm-libopus.patch
+++ b/SOURCES/build-arm-libopus.patch
@ -0,0 +1,12 @@
 diff -up firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old firefox-66.0/media/libopus/silk/arm/arm_silk_map.c
 --- firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old	2019-03-12 21:07:35.356677522 +0100
 +++ firefox-66.0/media/libopus/silk/arm/arm_silk_map.c	2019-03-12 21:07:42.937693394 +0100
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 # include "config.h"
 #endif
 -#include "main_FIX.h"
 +#include "fixed/main_FIX.h"
 #include "NSQ.h"
 #include "SigProc_FIX.h"
--- a/SOURCES/build-ascii-decode-fail-rhel7.patch
+++ b/SOURCES/build-ascii-decode-fail-rhel7.patch
@ -0,0 +1,45 @@
 diff -up firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py.build-ascii-decode-fail-rhel7 firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py
 --- firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py.build-ascii-decode-fail-rhel7	2022-06-23 09:11:39.000000000 +0200
 +++ firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py	2022-08-16 13:24:31.697757209 +0200
@@ -73,6 +73,8 @@ class Reader(object):
             self.name = "<unicode string>"
             self.check_printable(stream)
             self.buffer = stream+'\0'
 +            #self.encoding = 'utf-8'
 +            #self.raw_decode = codecs.utf_8_decode
         elif isinstance(stream, bytes):
             self.name = "<byte string>"
             self.raw_buffer = stream
@@ -83,6 +85,11 @@ class Reader(object):
             self.eof = False
             self.raw_buffer = None
             self.determine_encoding()
 +        print("DEBUG_OUTPUT:")
 +        print(self.name)
 +        print(self.encoding)
 +        print(self.stream)
 +        #print(self.stream.read())
     def peek(self, index=0):
         try:
 diff -up firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py.build-ascii-decode-fail-rhel7 firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py
 --- firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py.build-ascii-decode-fail-rhel7	2022-08-16 14:16:33.432529817 +0200
 +++ firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py	2022-08-17 08:01:38.175878171 +0200
@@ -37,7 +37,7 @@ def generate_feature_manifest(fd, input_
     write_fm_js_headers(fd)
     nimbus_dir_path = pathlib.Path(input_file).parent
     try:
 -        with open(input_file, "r") as yaml_input:
 +        with open(input_file, "r", encoding="utf-8") as yaml_input:
             data = yaml.safe_load(yaml_input)
             with pathlib.Path(nimbus_dir_path, FEATURE_MANIFEST_SCHEMA).open() as f:
                 schema = json.load(f)
@@ -92,7 +92,7 @@ def generate_platform_feature_manifest(f
         )
     try:
 -        with open(input_file, "r") as yaml_input:
 +        with open(input_file, "r", encoding="utf-8") as yaml_input:
             data = yaml.safe_load(yaml_input)
             fd.write(file_structure(data))
     except (IOError) as e:
--- a/SOURCES/build-big-endian-errors.patch
+++ b/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;
--- a/SOURCES/build-disable-elfhack.patch
+++ b/SOURCES/build-disable-elfhack.patch
@ -0,0 +1,12 @@
 diff -up firefox-97.0/toolkit/moz.configure.disable-elfhack firefox-97.0/toolkit/moz.configure
 --- firefox-97.0/toolkit/moz.configure.disable-elfhack	2022-02-08 09:58:47.518047952 +0100
 +++ firefox-97.0/toolkit/moz.configure	2022-02-08 10:17:49.552945956 +0100
@@ -1273,7 +1273,7 @@ with only_when("--enable-compile-environ
             help="{Enable|Disable} elf hacks",
         )
 -        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: True))
 +        set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: False))
 @depends(build_environment)
--- a/SOURCES/build-remove-dav1d-from-wayland-dep.patch
+++ b/SOURCES/build-remove-dav1d-from-wayland-dep.patch
@ -0,0 +1,49 @@
 diff -up firefox-102.0/media/ffvpx/config_common.h.dav1d-remove firefox-102.0/media/ffvpx/config_common.h
 --- firefox-102.0/media/ffvpx/config_common.h.dav1d-remove	2022-08-08 12:48:33.218128539 +0200
 +++ firefox-102.0/media/ffvpx/config_common.h	2022-08-08 12:48:52.986003374 +0200
@@ -24,15 +24,11 @@
 #undef CONFIG_VP8_VAAPI_HWACCEL
 #undef CONFIG_VP9_VAAPI_HWACCEL
 #undef CONFIG_AV1_VAAPI_HWACCEL
 -#undef CONFIG_LIBDAV1D
 -#undef CONFIG_AV1_DECODER
 #define CONFIG_VAAPI 1
 #define CONFIG_VAAPI_1 1
 #define CONFIG_VP8_VAAPI_HWACCEL 1
 #define CONFIG_VP9_VAAPI_HWACCEL 1
 #define CONFIG_AV1_VAAPI_HWACCEL 1
 -#define CONFIG_LIBDAV1D 1
 -#define CONFIG_AV1_DECODER 1
 #endif
 #endif
 diff -up firefox-102.0/media/ffvpx/libavcodec/moz.build.dav1d-remove firefox-102.0/media/ffvpx/libavcodec/moz.build
 --- firefox-102.0/media/ffvpx/libavcodec/moz.build.dav1d-remove	2022-08-08 12:44:24.098710736 +0200
 +++ firefox-102.0/media/ffvpx/libavcodec/moz.build	2022-08-08 12:46:42.635828719 +0200
@@ -104,17 +104,23 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
     ]
     if CONFIG['MOZ_WAYLAND']:
         LOCAL_INCLUDES += ['/media/mozva']
 +        if CONFIG['MOZ_DAV1D_ASM']:
 +            SOURCES += [
 +                'libdav1d.c',
 +            ]
         SOURCES += [
             'atsc_a53.c',
 -            'libdav1d.c',
             'vaapi_av1.c',
             'vaapi_decode.c',
             'vaapi_vp8.c',
             'vaapi_vp9.c',
         ]
 +        if CONFIG['MOZ_DAV1D_ASM']:
 +            USE_LIBS += [
 +                'dav1d',
 +                'media_libdav1d_asm',
 +            ]
         USE_LIBS += [
 -          'dav1d',
 -          'media_libdav1d_asm',
           'mozva'
         ]
--- a/SOURCES/build-rhel7-nasm-dwarf.patch
+++ b/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"
--- a/SOURCES/cbindgen-already-covers.patch
+++ b/SOURCES/cbindgen-already-covers.patch
@ -0,0 +1,11 @@
 diff -up thunderbird-102.1.0/gfx/webrender_bindings/webrender_ffi.h.cbindgen-covers thunderbird-102.1.0/gfx/webrender_bindings/webrender_ffi.h
 --- thunderbird-102.1.0/gfx/webrender_bindings/webrender_ffi.h.cbindgen-covers	2022-08-04 12:47:06.970587140 +0200
 +++ thunderbird-102.1.0/gfx/webrender_bindings/webrender_ffi.h	2022-08-04 12:47:13.642579587 +0200
@@ -73,7 +73,6 @@ struct WrPipelineInfo;
 struct WrPipelineIdAndEpoch;
 using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
 -const uint64_t ROOT_CLIP_CHAIN = ~0;
 }  // namespace wr
 }  // namespace mozilla
--- a/SOURCES/disable-openh264-download.patch
+++ b/SOURCES/disable-openh264-download.patch
@ -0,0 +1,39 @@
 diff -up firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old firefox-81.0/toolkit/modules/GMPInstallManager.jsm
 --- firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old	2020-09-25 10:39:04.769458703 +0200
 +++ firefox-81.0/toolkit/modules/GMPInstallManager.jsm	2020-09-25 10:39:22.038504747 +0200
@@ -54,10 +54,6 @@ function getScopedLogger(prefix) {
 const LOCAL_GMP_SOURCES = [
   {
 -    id: "gmp-gmpopenh264",
 -    src: "chrome://global/content/gmp-sources/openh264.json",
 -  },
 -  {
     id: "gmp-widevinecdm",
     src: "chrome://global/content/gmp-sources/widevinecdm.json",
   },
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
@@ -108,7 +108,6 @@ toolkit.jar:
 #ifdef XP_MACOSX
    content/global/macWindowMenu.js
 #endif
 -   content/global/gmp-sources/openh264.json    (gmp-sources/openh264.json)
    content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
 # Third party files
 diff --git a/toolkit/modules/GMPInstallManager.jsm b/toolkit/modules/GMPInstallManager.jsm
 --- a/toolkit/modules/GMPInstallManager.jsm
 +++ b/toolkit/modules/GMPInstallManager.jsm
@@ -238,6 +234,9 @@ GMPInstallManager.prototype = {
    *                 downloaderr, verifyerr or previouserrorencountered
    */
   installAddon(gmpAddon) {
 +    if (gmpAddon.isOpenH264) {
 +      return Promise.reject({ type: "disabled" });
 +    }
     if (this._deferred) {
       let log = getScopedLogger("GMPInstallManager.installAddon");
       log.error("previous error encountered");
--- a/SOURCES/disable-openpgp-in-thunderbird.patch
+++ b/SOURCES/disable-openpgp-in-thunderbird.patch
@ -0,0 +1,12 @@
 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
   async init() {
 +    // We don't have support for the opengpg in rhel ATM.
 +    return;
     if (this._alreadyTriedInit) {
       // We have previously attempted to init, don't try again.
       return;
--- a/SOURCES/fedora-shebang-build.patch
+++ b/SOURCES/fedora-shebang-build.patch
@ -0,0 +1,9 @@
 diff -up firefox-73.0/build/unix/run-mozilla.sh.old firefox-73.0/build/unix/run-mozilla.sh
 --- firefox-73.0/build/unix/run-mozilla.sh.old	2020-02-12 09:58:00.150895904 +0100
 +++ firefox-73.0/build/unix/run-mozilla.sh	2020-02-12 09:58:06.505860696 +0100
@@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/usr/bin/sh
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
--- a/SOURCES/firefox-enable-addons.patch
+++ b/SOURCES/firefox-enable-addons.patch
@ -0,0 +1,13 @@
 diff -up firefox-55.0/browser/app/profile/firefox.js.addons firefox-55.0/browser/app/profile/firefox.js
 --- firefox-55.0/browser/app/profile/firefox.js.addons	2017-08-02 10:58:30.566363833 +0200
 +++ firefox-55.0/browser/app/profile/firefox.js	2017-08-02 10:59:15.377216959 +0200
@@ -65,7 +65,8 @@ pref("extensions.systemAddon.update.url"
 // Disable add-ons that are not installed by the user in all scopes by default.
 // See the SCOPE constants in AddonManager.jsm for values to use here.
 -pref("extensions.autoDisableScopes", 15);
 +pref("extensions.autoDisableScopes", 0);
 +pref("extensions.showMismatchUI", false);
 // Scopes to scan for changes at startup.
 pref("extensions.startupScanScopes", 0);
--- a/SOURCES/firefox-gcc-build.patch
+++ b/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);
     }
--- a/SOURCES/firefox-nss-addon-hack.patch
+++ b/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) {
--- a/SOURCES/firefox-nss-version.patch
+++ b/SOURCES/firefox-nss-version.patch
@ -0,0 +1,13 @@
 diff -up firefox-102.2.0/build/moz.configure/nss.configure.nss-version firefox-102.2.0/build/moz.configure/nss.configure
 --- firefox-102.2.0/build/moz.configure/nss.configure.nss-version	2022-08-23 18:17:14.699869558 +0200
 +++ firefox-102.2.0/build/moz.configure/nss.configure	2022-08-23 18:15:33.790051448 +0200
@@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", h
 imply_option("--with-system-nspr", True, when="--with-system-nss")
 nss_pkg = pkg_check_modules(
 -    "NSS", "nss >= 3.79.1", when="--with-system-nss", config=False
 +    "NSS", "nss >= 3.79", when="--with-system-nss", config=False
 )
 set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
 diff -up firefox-102.2.0/.nss-version firefox-102.2.0/
--- a/SOURCES/google-api-key
+++ b/SOURCES/google-api-key
@ -0,0 +1 @@
 AIzaSyBPGXa4AYD4FC3HJK7LnIKxm4fDusVuuco
--- a/SOURCES/google-loc-api-key
+++ b/SOURCES/google-loc-api-key
@ -0,0 +1 @@
 AIzaSyB2h2OuRcUgy5N-5hsZqiPW6sH3n_rptiQ
--- a/SOURCES/mozilla-1170092.patch
+++ b/SOURCES/mozilla-1170092.patch
@ -0,0 +1,99 @@
 diff -up firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
 --- firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2021-03-18 14:48:36.000000000 +0100
 +++ firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2021-03-22 19:20:02.429310184 +0100
@@ -249,8 +249,20 @@ nsresult nsReadConfig::openAndEvaluateJS
     if (NS_FAILED(rv)) return rv;
     rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
 -    if (NS_FAILED(rv)) return rv;
 +    if (NS_FAILED(rv)) {
 +      // Look for cfg file in /etc/<application>/pref
 +      rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
 +                                  getter_AddRefs(jsFile));
 +      NS_ENSURE_SUCCESS(rv, rv);
 +
 +      rv = jsFile->AppendNative(nsLiteralCString("pref"));
 +      NS_ENSURE_SUCCESS(rv, rv);
 +      rv = jsFile->AppendNative(nsDependentCString(aFileName));
 +      NS_ENSURE_SUCCESS(rv, rv);
 +      rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
 +      NS_ENSURE_SUCCESS(rv, rv);
 +    }
   } else {
     nsAutoCString location("resource://gre/defaults/autoconfig/");
     location += aFileName;
 diff -up firefox-87.0/modules/libpref/Preferences.cpp.1170092 firefox-87.0/modules/libpref/Preferences.cpp
 --- firefox-87.0/modules/libpref/Preferences.cpp.1170092	2021-03-18 14:48:54.000000000 +0100
 +++ firefox-87.0/modules/libpref/Preferences.cpp	2021-03-22 19:20:02.429310184 +0100
@@ -4499,6 +4499,9 @@ nsresult Preferences::InitInitialObjects
   //
   // Thus, in the omni.jar case, we always load app-specific default
   // preferences from omni.jar, whether or not `$app == $gre`.
 +  //
 +  // At very end load configuration from system config location:
 +  // - /etc/firefox/pref/*.js
   nsresult rv = NS_ERROR_FAILURE;
   UniquePtr<nsZipFind> find;
 diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/toolkit/xre/nsXREDirProvider.cpp
 --- firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2021-03-18 14:52:00.000000000 +0100
 +++ firefox-87.0/toolkit/xre/nsXREDirProvider.cpp	2021-03-22 19:37:56.574480347 +0100
@@ -65,6 +65,7 @@
 #endif
 #ifdef XP_UNIX
 #  include <ctype.h>
 +#  include "nsIXULAppInfo.h"
 #endif
 #ifdef XP_IOS
 #  include "UIKitDirProvider.h"
@@ -552,6 +553,21 @@ nsXREDirProvider::GetFile(const char* aP
       }
     }
   }
 +
 +#if defined(XP_UNIX)
 +  if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
 +    nsCString sysConfigDir = nsLiteralCString("/etc/");
 +    nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
 +    if (!appInfo)
 +      return NS_ERROR_NOT_AVAILABLE;
 +    nsCString appName;
 +    appInfo->GetName(appName);
 +    ToLowerCase(appName);
 +    sysConfigDir.Append(appName);
 +    return NS_NewNativeLocalFile(sysConfigDir, false, aFile);
 +  }
 +#endif
 +
   if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
   if (ensureFilePermissions) {
@@ -874,6 +890,16 @@ nsresult nsXREDirProvider::GetFilesInter
     }
 #endif
 +    // Add /etc/<application>/pref/ directory if it exists
 +    nsCOMPtr<nsIFile> systemPrefDir;
 +    rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
 +                                getter_AddRefs(systemPrefDir));
 +    if (NS_SUCCEEDED(rv)) {
 +      rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
 +      if (NS_SUCCEEDED(rv))
 +        directories.AppendObject(systemPrefDir);
 +      }
 +
     rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
   } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
     // NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
 diff -up firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h
 --- firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2021-03-18 14:51:58.000000000 +0100
 +++ firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h	2021-03-22 19:20:02.430310213 +0100
@@ -59,6 +59,7 @@
 #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
 #define NS_APP_PREFS_OVERRIDE_DIR \
   "PrefDOverride"  // Directory for per-profile defaults
 +#define NS_APP_PREFS_SYSTEM_CONFIG_DIR          "PrefSysConf"   // Directory with system-wide configuration
 #define NS_APP_USER_PROFILE_50_DIR "ProfD"
 #define NS_APP_USER_PROFILE_LOCAL_50_DIR "ProfLD"
--- a/SOURCES/mozilla-1516803.patch
+++ b/SOURCES/mozilla-1516803.patch
@ -0,0 +1,15 @@
 diff -up firefox-84.0/security/sandbox/linux/moz.build.1516803 firefox-84.0/security/sandbox/linux/moz.build
 --- firefox-84.0/security/sandbox/linux/moz.build.1516803	2020-12-10 16:17:55.425139545 +0100
 +++ firefox-84.0/security/sandbox/linux/moz.build	2020-12-10 16:29:21.945860841 +0100
@@ -114,9 +114,8 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc")
 # gcc lto likes to put the top level asm in syscall.cc in a different partition
 # from the function using it which breaks the build.  Work around that by
 # forcing there to be only one partition.
 -for f in CONFIG["OS_CXXFLAGS"]:
 -    if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang":
 -        LDFLAGS += ["--param lto-partitions=1"]
 +if CONFIG['CC_TYPE'] != 'clang':
 +    LDFLAGS += ['--param', 'lto-partitions=1']
 DEFINES["NS_NO_XPCOM"] = True
 DisableStlWrapping()
--- a/SOURCES/mozilla-1669639.patch
+++ b/SOURCES/mozilla-1669639.patch
@ -0,0 +1,14 @@
 --- firefox-81.0.1/build/mach_initialize.py.old	2020-10-06 14:16:06.212974910 +0200
 +++ firefox-81.0.1/build/mach_initialize.py	2020-10-06 14:19:03.313179557 +0200
@@ -507,7 +507,10 @@ class ImportHook(object):
         # doesn't happen or because it doesn't matter).
         if not os.path.exists(module.__file__[:-1]):
             if os.path.exists(module.__file__):
 -                os.remove(module.__file__)
 +                try:
 +                    os.remove(module.__file__)
 +                except:
 +                    pass
             del sys.modules[module.__name__]
             module = self(name, globals, locals, fromlist, level)
--- a/SOURCES/mozilla-1670333.patch
+++ b/SOURCES/mozilla-1670333.patch
@ -0,0 +1,68 @@
 diff -up firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-99.0/dom/media/mp4/MP4Demuxer.cpp
 --- firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333	2022-03-31 01:24:44.000000000 +0200
 +++ firefox-99.0/dom/media/mp4/MP4Demuxer.cpp	2022-04-04 09:58:35.606351546 +0200
@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
   DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
             __func__, ##__VA_ARGS__)
 +extern bool gUseKeyframeFromContainer;
 +
 namespace mozilla {
 DDLoggedTypeDeclNameAndBase(MP4TrackDemuxer, MediaTrackDemuxer);
@@ -394,6 +396,12 @@ already_AddRefed<MediaRawData> MP4TrackD
           [[fallthrough]];
         case H264::FrameType::OTHER: {
           bool keyframe = type == H264::FrameType::I_FRAME;
 +          if (gUseKeyframeFromContainer) {
 +            if (sample->mKeyframe && sample->mKeyframe != keyframe) {
 +              sample->mKeyframe = keyframe;
 +            }
 +            break;
 +          }
           if (sample->mKeyframe != keyframe) {
             NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
                                        "@ pts:%" PRId64 " dur:%" PRId64
 diff -up firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-99.0/dom/media/platforms/PDMFactory.cpp
 --- firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333	2022-03-31 01:24:44.000000000 +0200
 +++ firefox-99.0/dom/media/platforms/PDMFactory.cpp	2022-04-04 10:09:57.383419125 +0200
@@ -58,6 +58,8 @@
 #include <functional>
 +bool gUseKeyframeFromContainer = false;
 +
 namespace mozilla {
 #define PDM_INIT_LOG(msg, ...) \
@@ -495,7 +497,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());
   }
@@ -602,8 +604,9 @@ void PDMFactory::CreateDefaultPDMs() {
   CreateAndStartupPDM<AgnosticDecoderModule>();
 -  if (StaticPrefs::media_gmp_decoder_enabled() &&
 +  if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
       !CreateAndStartupPDM<GMPDecoderModule>()) {
 +    gUseKeyframeFromContainer = true;
     mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
   }
 }
 diff -up firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 firefox-99.0/dom/media/platforms/PDMFactory.h
 --- firefox-99.0/dom/media/platforms/PDMFactory.h.1670333	2022-03-31 01:24:44.000000000 +0200
 +++ firefox-99.0/dom/media/platforms/PDMFactory.h	2022-04-04 09:58:35.606351546 +0200
@@ -121,6 +121,7 @@ class PDMFactory final {
   RefPtr<PlatformDecoderModule> mNullPDM;
   DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
 +  bool mFFmpegUsed = false;
   friend class RemoteVideoDecoderParent;
   static void EnsureInit();
--- a/SOURCES/mozilla-1775202.patch
+++ b/SOURCES/mozilla-1775202.patch
@ -0,0 +1,17 @@
 diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
 index 8579f8bb3622..d9ca79d4fcb8 100644
 --- a/third_party/libwebrtc/moz.build
 +++ b/third_party/libwebrtc/moz.build
@@ -520,7 +520,10 @@ if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
         "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
         "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
         "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
 -        "/third_party/libwebrtc/modules/audio_coding/isac_gn"
 +        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
 +        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
 +        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
 +        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
     ]
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--- a/SOURCES/mozilla-api-key
+++ b/SOURCES/mozilla-api-key
@ -0,0 +1 @@
 9008bb7e-1e22-4038-94fe-047dd48ccc0b
--- a/SOURCES/mozilla-bmo1005535.patch
+++ b/SOURCES/mozilla-bmo1005535.patch
@ -0,0 +1,30 @@
 # HG changeset patch
 # User Steve Singer <steve@ssinger.info>
 # Date 1558451540 -7200
 #      Tue May 21 17:12:20 2019 +0200
 # Node ID 433beec63e6b5f409683af20a0c1ab137cc7bfad
 # Parent  c0fdccc716e80a6d289c94f5d507ae141c62a3bf
 Bug 1005535 - Get skia GPU building on big endian.
 diff --git a/gfx/skia/skia/src/gpu/GrColor.h b/gfx/skia/skia/src/gpu/GrColor.h
 --- a/gfx/skia/skia/src/gpu/GrColor.h
 +++ b/gfx/skia/skia/src/gpu/GrColor.h
@@ -59,17 +59,17 @@ static inline GrColor GrColorPackRGBA(un
 #define GrColorUnpackG(color)   (((color) >> GrColor_SHIFT_G) & 0xFF)
 #define GrColorUnpackB(color)   (((color) >> GrColor_SHIFT_B) & 0xFF)
 #define GrColorUnpackA(color)   (((color) >> GrColor_SHIFT_A) & 0xFF)
 /**
  *  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) {
     static const float ONE_OVER_255 = 1.f / 255.f;
     return value * ONE_OVER_255;
 }
 /** Used to pick vertex attribute types. */
--- a/SOURCES/mozilla-bmo1504834-part1.patch
+++ b/SOURCES/mozilla-bmo1504834-part1.patch
@ -0,0 +1,121 @@
 # HG changeset patch
 # Parent  b5471d23321d16a0bacc25b7afd27d2e16adba1a
 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
@@ -130,18 +130,17 @@ static IntRect CalculateSurfaceBounds(co
   Rect sampledBounds = inverse.TransformBounds(*aBounds);
   if (!sampledBounds.ToIntRect(&bounds)) {
     return surfaceBounds;
   }
   return surfaceBounds.Intersect(bounds);
 }
 -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;
 static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
                              const int32_t aStride, SurfaceFormat aFormat) {
   if (aFormat != SurfaceFormat::B8G8R8X8 || aSize.IsEmpty()) {
     return true;
   }
   // We should've initialized the data to be opaque already
   // On debug builds, verify that this is actually true.
 diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
 --- a/gfx/2d/Types.h
 +++ b/gfx/2d/Types.h
@@ -84,25 +84,18 @@ enum class SurfaceFormat : int8_t {
   Depth,
   // This represents the unknown format.
   UNKNOWN,
 // 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()
   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
 -#elif MOZ_BIG_ENDIAN()
 -  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB
 -  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB
 -#else
 -#  error "bad endianness"
 -#endif
   // The following values are OS and endian-independent synonyms.
   //
   // TODO(aosmond): When everything blocking bug 1581828 has been resolved, we
   // can make this use R8B8G8A8 and R8B8G8X8 for non-Windows platforms.
   OS_RGBA = A8R8G8B8_UINT32,
   OS_RGBX = X8R8G8B8_UINT32
 };
 diff --git a/gfx/skia/skia/third_party/skcms/skcms.cc b/gfx/skia/skia/third_party/skcms/skcms.cc
 --- a/gfx/skia/skia/third_party/skcms/skcms.cc
 +++ b/gfx/skia/skia/third_party/skcms/skcms.cc
@@ -25,16 +25,18 @@
         // it'd be a lot slower.  But we want all those headers included so we
         // can use their features after runtime checks later.
         #include <smmintrin.h>
         #include <avxintrin.h>
         #include <avx2intrin.h>
         #include <avx512fintrin.h>
         #include <avx512dqintrin.h>
     #endif
 +#else
 +    #define SKCMS_PORTABLE
 #endif
 // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
 // We have better testing on 64-bit machines, so force 32-bit machines to behave like 64-bit.
 //
 // Please do not use sizeof() directly, and size_t only when required.
 // (We have no way of enforcing these requests...)
 #define SAFE_SIZEOF(x) ((uint64_t)sizeof(x))
@@ -275,30 +277,38 @@ enum {
     skcms_Signature_sf32 = 0x73663332,
     // XYZ is also a PCS signature, so it's defined in skcms.h
     // skcms_Signature_XYZ = 0x58595A20,
 };
 static uint16_t read_big_u16(const uint8_t* ptr) {
     uint16_t be;
     memcpy(&be, ptr, sizeof(be));
 -#if defined(_MSC_VER)
 +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 +    return be;
 +#else
 +    #if defined(_MSC_VER)
     return _byteswap_ushort(be);
 -#else
 +    #else
     return __builtin_bswap16(be);
 +    #endif
 #endif
 }
 static uint32_t read_big_u32(const uint8_t* ptr) {
     uint32_t be;
     memcpy(&be, ptr, sizeof(be));
 -#if defined(_MSC_VER)
 +#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
 +    return be;
 +#else
 +    #if defined(_MSC_VER)
     return _byteswap_ulong(be);
 -#else
 +    #else
     return __builtin_bswap32(be);
 +    #endif
 #endif
 }
 static int32_t read_big_i32(const uint8_t* ptr) {
     return (int32_t)read_big_u32(ptr);
 }
 static float read_big_fixed(const uint8_t* ptr) {
--- a/SOURCES/mozilla-bmo1504834-part3.patch
+++ b/SOURCES/mozilla-bmo1504834-part3.patch
@ -0,0 +1,64 @@
 # HG changeset patch
 # Parent  d1d66f7e4d0e7fd45e91e4fcee07555e72046d48
 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 --git a/gfx/skia/skia/include/private/SkNx.h b/gfx/skia/skia/include/private/SkNx.h
 --- a/gfx/skia/skia/include/private/SkNx.h
 +++ b/gfx/skia/skia/include/private/SkNx.h
@@ -233,17 +233,28 @@ struct SkNx<1,T> {
     AI SkNx operator<<(int bits) const { return fVal << bits; }
     AI SkNx operator>>(int bits) const { return fVal >> bits; }
     AI SkNx operator+(const SkNx& y) const { return fVal + y.fVal; }
     AI SkNx operator-(const SkNx& y) const { return fVal - y.fVal; }
     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)); }
     AI SkNx operator==(const SkNx& y) const { return FromBits(fVal == y.fVal ? ~0 : 0); }
     AI SkNx operator!=(const SkNx& y) const { return FromBits(fVal != y.fVal ? ~0 : 0); }
     AI SkNx operator<=(const SkNx& y) const { return FromBits(fVal <= y.fVal ? ~0 : 0); }
     AI SkNx operator>=(const SkNx& y) const { return FromBits(fVal >= y.fVal ? ~0 : 0); }
     AI SkNx operator< (const SkNx& y) const { return FromBits(fVal <  y.fVal ? ~0 : 0); }
 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
@@ -198,17 +198,23 @@ namespace SK_OPTS_NS {
                                        const SkAlpha* mask, size_t maskRB,
                                        int w, int h) {
         auto fn = [](const Sk4px& d, const Sk4px& aa) {
             //   = (s + d(1-sa))aa + d(1-aa)
             //   = s*aa + d(1-sa*aa)
             //   ~~~>
             // 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
                  + d.approxMulDiv255(aa.inv());
         };
         while (h --> 0) {
             Sk4px::MapDstAlpha(w, dst, mask, fn);
             dst  +=  dstRB / sizeof(*dst);
             mask += maskRB / sizeof(*mask);
         }
     }
--- a/SOURCES/mozilla-bmo849632.patch
+++ b/SOURCES/mozilla-bmo849632.patch
@ -0,0 +1,35 @@
 # 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 --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
 --- a/gfx/gl/GLContext.h
 +++ b/gfx/gl/GLContext.h
@@ -1548,16 +1548,23 @@ class GLContext : public GenericAtomicRe
     AFTER_GL_CALL;
   }
   void raw_fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
                        GLenum format, GLenum type, GLvoid* pixels) {
     BEFORE_GL_CALL;
     mSymbols.fReadPixels(x, y, width, height, format, type, pixels);
     OnSyncCall();
 +#if MOZ_BIG_ENDIAN()
 +    uint8_t* itr = (uint8_t*)pixels;
 +    for (GLsizei i = 0; i < width * height; i++) {
 +      NativeEndian::swapToLittleEndianInPlace((uint32_t*)itr, 1);
 +      itr += 4;
 +    }
 +#endif
     AFTER_GL_CALL;
     mHeavyGLCallsSinceLastFlush = true;
   }
   void fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
                    GLenum format, GLenum type, GLvoid* pixels);
  public:
--- a/SOURCES/mozilla-bmo998749.patch
+++ b/SOURCES/mozilla-bmo998749.patch
@ -0,0 +1,29 @@
 # HG changeset patch
 # User msirringhaus@suse.de
 # Date 1583738770 -3600
 #      Mon Mar 09 08:26:10 2020 +0100
 # Node ID 34676feac1a542e409e22acf5b98735f8313b1ce
 # Parent  506857dace0a08d1c9685e3ac264646590b3e27f
 [mq]: mozilla-bmo998749.patch
 diff -r 506857dace0a -r 34676feac1a5 gfx/2d/FilterProcessing.h
 --- a/gfx/2d/FilterProcessing.h	Fri Feb 28 12:31:51 2020 +0100
 +++ b/gfx/2d/FilterProcessing.h	Mon Mar 09 08:26:10 2020 +0100
@@ -13,10 +13,17 @@
 namespace mozilla {
 namespace gfx {
 +#if MOZ_BIG_ENDIAN()
 +const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_B = 3;
 +const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_G = 2;
 +const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_R = 1;
 +const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_A = 0;
 +#else
 const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_B = 0;
 const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_G = 1;
 const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_R = 2;
 const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_A = 3;
 +#endif
 class FilterProcessing {
  public:
--- a/SOURCES/mozilla-build-arm.patch
+++ b/SOURCES/mozilla-build-arm.patch
@ -0,0 +1,14 @@
 diff -up firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h
 --- firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm	2017-03-03 13:53:52.480754536 +0100
 +++ firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h	2017-03-03 13:56:01.476018102 +0100
@@ -203,6 +203,10 @@
     #define SK_ARM_HAS_CRC32
 #endif
 +#if defined(__aarch64__)
 +    #undef SK_ARM_HAS_NEON
 +#endif
 +
 //////////////////////////////////////////////////////////////////////
 #if !defined(SKIA_IMPLEMENTATION)
--- a/SOURCES/mozilla-s390-context.patch
+++ b/SOURCES/mozilla-s390-context.patch
@ -0,0 +1,53 @@
 # HG changeset patch
 # User msirringhaus@suse.de
 # Date 1558452408 -7200
 #      Tue May 21 17:26:48 2019 +0200
 # Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
 # Parent  136e1f2c44a3099b3e49a576fa62c8ad77aa431e
 [mq]: mozilla-s390-context.patch
 diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
 --- a/js/src/wasm/WasmSignalHandlers.cpp
 +++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -157,16 +157,20 @@ using mozilla::DebugOnly;
 #      define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
 #    endif
 #    if defined(__linux__) && defined(__loongarch__)
 #      define EPC_sig(p) ((p)->uc_mcontext.pc)
 #      define RRA_sig(p) ((p)->uc_mcontext.gregs[1])
 #      define RSP_sig(p) ((p)->uc_mcontext.gregs[3])
 #      define RFP_sig(p) ((p)->uc_mcontext.gregs[22])
 #    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])
 #    define ESP_sig(p) ((p)->uc_mcontext.__gregs[_REG_ESP])
 #    define RIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RIP])
 #    define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP])
 #    define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP])
 #    define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11])
@@ -399,16 +403,20 @@ struct macos_aarch64_context {
 #    define PC_sig(p) R32_sig(p)
 #    define SP_sig(p) R01_sig(p)
 #    define FP_sig(p) R01_sig(p)
 #  elif defined(__loongarch__)
 #    define PC_sig(p) EPC_sig(p)
 #    define FP_sig(p) RFP_sig(p)
 #    define SP_sig(p) RSP_sig(p)
 #    define LR_sig(p) RRA_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;
 #  else
   MOZ_CRASH();
 #  endif
--- a/SOURCES/mozilla-s390x-skia-gradient.patch
+++ b/SOURCES/mozilla-s390x-skia-gradient.patch
@ -0,0 +1,51 @@
 # 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
     }
 }
--- a/SOURCES/node-stdout-nonblocking-wrapper
+++ b/SOURCES/node-stdout-nonblocking-wrapper
@ -0,0 +1,2 @@
 #!/bin/sh
 exec node "$@" 2>&1 | cat -
--- a/SOURCES/nss-setup-flags-env.inc
+++ b/SOURCES/nss-setup-flags-env.inc
@ -0,0 +1,7 @@
 sed -i 's@%{bundled_install_path}@%{_buildrootdir}%{bundled_install_path}@g' %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/nss*.pc
 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"
--- a/SOURCES/one_swizzle_to_rule_them_all.patch
+++ b/SOURCES/one_swizzle_to_rule_them_all.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();
--- a/SOURCES/pgo.patch
+++ b/SOURCES/pgo.patch
@ -0,0 +1,115 @@
 diff -up firefox-99.0/build/moz.configure/lto-pgo.configure.pgo firefox-99.0/build/moz.configure/lto-pgo.configure
 --- firefox-99.0/build/moz.configure/lto-pgo.configure.pgo	2022-03-31 01:24:38.000000000 +0200
 +++ firefox-99.0/build/moz.configure/lto-pgo.configure	2022-04-04 10:15:45.387694143 +0200
@@ -247,8 +247,8 @@ def lto(
             cflags.append("-flto")
             ldflags.append("-flto")
         else:
 -            cflags.append("-flto=thin")
 -            ldflags.append("-flto=thin")
 +            cflags.append("-flto")
 +            ldflags.append("-flto")
         if target.os == "Android" and value == "cross":
             # Work around https://github.com/rust-lang/rust/issues/90088
@@ -264,7 +264,7 @@ def lto(
         if value == "full":
             cflags.append("-flto")
         else:
 -            cflags.append("-flto=thin")
 +            cflags.append("-flto")
         # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
         # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
         cflags.append("-fuse-ld=lld")
 diff -up firefox-99.0/build/pgo/profileserver.py.pgo firefox-99.0/build/pgo/profileserver.py
 --- firefox-99.0/build/pgo/profileserver.py.pgo	2022-03-31 01:24:38.000000000 +0200
 +++ firefox-99.0/build/pgo/profileserver.py	2022-04-04 10:15:45.387694143 +0200
@@ -11,7 +11,7 @@ import glob
 import subprocess
 import mozcrash
 -from mozbuild.base import MozbuildObject, BinaryNotFoundException
 +from mozbuild.base import MozbuildObject, BinaryNotFoundException, BuildEnvironmentNotFoundException
 from mozfile import TemporaryDirectory
 from mozhttpd import MozHttpd
 from mozprofile import FirefoxProfile, Preferences
@@ -87,9 +87,22 @@ if __name__ == "__main__":
     locations = ServerLocations()
     locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
 -    old_profraw_files = glob.glob("*.profraw")
 -    for f in old_profraw_files:
 -        os.remove(f)
 +    using_gcc = False
 +    try:
 +        if build.config_environment.substs.get('CC_TYPE') == 'gcc':
 +            using_gcc = True
 +    except BuildEnvironmentNotFoundException:
 +        pass
 +
 +    if using_gcc:
 +        for dirpath, _, filenames in os.walk('.'):
 +            for f in filenames:
 +                if f.endswith('.gcda'):
 +                    os.remove(os.path.join(dirpath, f))
 +    else:
 +        old_profraw_files = glob.glob('*.profraw')
 +        for f in old_profraw_files:
 +            os.remove(f)
     with TemporaryDirectory() as profilePath:
         # TODO: refactor this into mozprofile
@@ -212,6 +225,10 @@ if __name__ == "__main__":
             print("Firefox exited successfully, but produced a crashreport")
             sys.exit(1)
 +        print('Copying profile data....')
 +        os.system('pwd');
 +        os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
 +
         llvm_profdata = env.get("LLVM_PROFDATA")
         if llvm_profdata:
             profraw_files = glob.glob("*.profraw")
 diff -up firefox-99.0/build/unix/mozconfig.unix.pgo firefox-99.0/build/unix/mozconfig.unix
 --- firefox-99.0/build/unix/mozconfig.unix.pgo	2022-03-31 01:24:38.000000000 +0200
 +++ firefox-99.0/build/unix/mozconfig.unix	2022-04-04 10:15:45.387694143 +0200
@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
     CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
     CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
 +    if [ -n "$MOZ_PGO" ]; then
 +        if [ -z "$USE_ARTIFACT" ]; then
 +            ac_add_options --enable-lto
 +        fi
 +        export AR="$topsrcdir/gcc/bin/gcc-ar"
 +        export NM="$topsrcdir/gcc/bin/gcc-nm"
 +        export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
 +    fi
 +
     # We want to make sure we use binutils and other binaries in the tooltool
     # package.
     mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
 diff -up firefox-99.0/extensions/spellcheck/src/moz.build.pgo firefox-99.0/extensions/spellcheck/src/moz.build
 --- firefox-99.0/extensions/spellcheck/src/moz.build.pgo	2022-03-31 01:24:50.000000000 +0200
 +++ firefox-99.0/extensions/spellcheck/src/moz.build	2022-04-04 10:15:45.387694143 +0200
@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
     "mozInlineSpellChecker.h",
     "mozSpellChecker.h",
 ]
 +
 +CXXFLAGS += ['-fno-devirtualize']
 diff -up firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-99.0/toolkit/components/terminator/nsTerminator.cpp
 --- firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2022-04-04 10:15:45.387694143 +0200
 +++ firefox-99.0/toolkit/components/terminator/nsTerminator.cpp	2022-04-04 10:19:07.022239556 +0200
@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
   }
 #endif
 +  // Disable watchdog for PGO train builds - writting profile information at
 +  // exit may take time and it is better to make build hang rather than
 +  // silently produce poorly performing binary.
 +  crashAfterMS = INT32_MAX;
 +
   UniquePtr<Options> options(new Options());
   // crashAfterTicks is guaranteed to be > 0 as
   // crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
--- a/SOURCES/process-official-tarball
+++ b/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
--- a/SOURCES/rhbz-1173156.patch
+++ b/SOURCES/rhbz-1173156.patch
@ -0,0 +1,12 @@
 diff -up firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156 firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp
 --- firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156	2019-01-22 10:36:09.284069020 +0100
 +++ firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp	2019-01-22 10:37:12.669757744 +0100
@@ -161,7 +161,7 @@ nsresult nsAuthSambaNTLM::SpawnNTLMAuthH
   const char* username = PR_GetEnv("USER");
   if (!username) return NS_ERROR_FAILURE;
 -  const char* const args[] = {"ntlm_auth",
 +  const char* const args[] = {"/usr/bin/ntlm_auth",
                               "--helper-protocol",
                               "ntlmssp-client-1",
                               "--use-cached-creds",
--- a/SOURCES/rhbz-1219542-s390-build.patch
+++ b/SOURCES/rhbz-1219542-s390-build.patch
@ -0,0 +1,23 @@
 diff -up firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390 firefox-55.0/js/src/old-configure.in
 --- firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390	2017-07-31 18:20:48.000000000 +0200
 +++ firefox-55.0/js/src/old-configure.in	2017-08-02 14:31:32.190243669 +0200
@@ -541,7 +541,7 @@ case "$host" in
 *-linux*|*-kfreebsd*-gnu|*-gnu*)
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
 -    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
 +    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}"
     ;;
 *)
@@ -617,8 +617,8 @@ case "$target" in
 *-*linux*)
     if test "$GNU_CC" -o "$GNU_CXX"; then
 -        MOZ_PGO_OPTIMIZE_FLAGS="-O3"
 -        MOZ_OPTIMIZE_FLAGS="-O3"
 +        MOZ_PGO_OPTIMIZE_FLAGS="-O1"
 +        MOZ_OPTIMIZE_FLAGS="-O1"
         if test -z "$CLANG_CC"; then
            MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
         fi
--- a/SOURCES/rhbz-1354671.patch
+++ b/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),           \
--- a/SOURCES/svg-rendering.patch
+++ b/SOURCES/svg-rendering.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.
--- a/SOURCES/thunderbird-mozconfig
+++ b/SOURCES/thunderbird-mozconfig
@ -0,0 +1,35 @@
 ac_add_options --enable-application=comm/mail
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
 ac_add_options --with-system-zlib
 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-chrome-format=omni
 ac_add_options --enable-pulseaudio
 ac_add_options --without-system-icu
 ac_add_options --enable-release
 ac_add_options --allow-addon-sideload
 ac_add_options --with-system-jpeg
 ac_add_options --enable-js-shell
 ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --without-sysroot
 # investigate this one:
 ac_add_options --without-wasm-sandboxed-libraries
 ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
 ac_add_options --with-google-location-service-api-keyfile=../google-api-key
 ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
 ac_add_options --disable-crashreporter
 ac_add_options --enable-official-branding
 ac_add_options --disable-bootstrap
 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
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
--- a/SOURCES/thunderbird-redhat-default-prefs.js
+++ b/SOURCES/thunderbird-redhat-default-prefs.js
@ -0,0 +1,36 @@
 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.autoDisableScopes", 0);
 /* 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 */
 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", "");
 /* Disable telemetry */
 pref("datareporting.healthreport.uploadEnabled", false);
 pref("datareporting.policy.dataSubmissionEnabled", false);
 pref("toolkit.telemetry.archive.enabled", false);
--- a/SOURCES/thunderbird.desktop
+++ b/SOURCES/thunderbird.desktop
@ -0,0 +1,30 @@
 [Desktop Entry]
 Version=1.0
 Name=Thunderbird
 GenericName=Email
 Comment=Send and Receive Email
 Exec=thunderbird %u
 TryExec=thunderbird
 Icon=thunderbird
 Terminal=false
 Type=Application
 MimeType=message/rfc822;x-scheme-handler/mailto;
 StartupNotify=true
 Categories=Network;Email;
 Name[cs]=Poštovní klient Thunderbird
 Name[ca]=Client de correu Thunderbird
 Name[fi]=Thunderbird-sähköposti
 Name[fr]=Messagerie Thunderbird
 Name[pl]=Klient poczty Thunderbird
 Name[pt_BR]=Cliente de E-mail Thunderbird
 Name[sv]=E-postklienten Thunderbird
 Comment[ca]=Llegiu i escriviu correu
 Comment[cs]=Čtení a psaní pošty
 Comment[de]=Emails lesen und verfassen
 Comment[fi]=Lue ja kirjoita sähköposteja
 Comment[fr]=Lire et écrire des courriels
 Comment[it]=Leggere e scrivere email
 Comment[ja]=メールの読み書き
 Comment[pl]=Czytanie i wysyłanie e-maili
 Comment[pt_BR]=Ler e escrever suas mensagens
 Comment[sv]=Läs och skriv e-post
--- a/SOURCES/thunderbird.sh.in
+++ b/SOURCES/thunderbird.sh.in
@ -0,0 +1,145 @@
 #!/bin/bash
 #
 # Startup script for the fedora.us Thunderbird RPM
 # (based on the Mozilla RPM launch script)
 #
 ##
 ## Variables
 ##
 MOZ_ARCH=$(uname -m)
 case $MOZ_ARCH in
        x86_64 | s390x | sparc64 )
                MOZ_LIB_DIR="%PREFIX%/lib64"
                SECONDARY_LIB_DIR="%PREFIX%/lib"
                ;;
        * )
                MOZ_LIB_DIR="%PREFIX%/lib"
                SECONDARY_LIB_DIR="%PREFIX%/lib64"
                ;;
 esac
 if [ ! -x $MOZ_LIB_DIR/thunderbird/thunderbird ]; then
    if [ ! -x $SECONDARY_LIB_DIR/thunderbird/thunderbird ]; then
        echo "Error: $MOZ_LIB_DIR/thunderbird/thunderbird not found"
        if [ -d $SECONDARY_LIB_DIR ]; then
            echo "       $SECONDARY_LIB_DIR/thunderbird/thunderbird not found"
        fi
        exit 1
    fi
    MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
 fi
 MOZ_DIST_BIN="$MOZ_LIB_DIR/thunderbird"
 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
 ##
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 ##
 ## Set MOZ_APP_LAUNCHER for gnome-session
 ##
 export MOZ_APP_LAUNCHER="%PREFIX%/bin/thunderbird"
 ##
 ## Disable the GNOME crash dialog, Moz has it's own
 ## 
 GNOME_DISABLE_CRASH_DIALOG=1
 export GNOME_DISABLE_CRASH_DIALOG
 ##
 ## Disable the SLICE allocator (rhbz#1014858)
 ##
 export G_SLICE=always-malloc
 ##
 ## To disable the use of Firefox localization, set MOZ_DISABLE_LANGPACKS=1
 ## in your environment before launching Firefox.
 ##
 #
 # MOZ_DISABLE_LANGPACKS=1
 # export MOZ_DISABLE_LANGPACKS
 #
 ##
 ## Automatically installed langpacks are tracked by .fedora-langpack-install
 ## config file.
 ##
 FEDORA_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.fedora-langpack-install"
 # MOZ_DISABLE_LANGPACKS disables language packs completelly
 MOZILLA_DOWN=0
 if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
    pidof thunderbird > /dev/null 2>&1
    MOZILLA_DOWN=$?
 fi
 # Modify language pack configuration only when thunderbird is not running 
 # and language packs are not disabled
 if [ $MOZILLA_DOWN -ne 0 ]; then
    # Clear already installed langpacks
    mkdir -p $MOZ_EXTENSIONS_PROFILE_DIR
    if [ -f $FEDORA_LANGPACK_CONFIG ]; then
        rm `cat $FEDORA_LANGPACK_CONFIG` > /dev/null 2>&1
        rm $FEDORA_LANGPACK_CONFIG > /dev/null 2>&1
        # remove all empty langpacks dirs while they block installation of langpacks
        rmdir $MOZ_EXTENSIONS_PROFILE_DIR/lang* > /dev/null 2>&1
    fi
    # Get locale from system
    CURRENT_LOCALE=$LC_ALL
    CURRENT_LOCALE=${CURRENT_LOCALE:-$LC_MESSAGES}
    CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG}
    # Try without a local variant first, then with a local variant
    # So that pt-BR doesn't try to use pt for example
    SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"`
    MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"`
    function create_langpack_link() {
        local language=$*
        local langpack=langpack-${language}@thunderbird.mozilla.org.xpi
        if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then
            rm -rf $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
            ln -s $MOZ_LANGPACKS_DIR/$langpack \
                  $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
            echo $MOZ_EXTENSIONS_PROFILE_DIR/$langpack > $FEDORA_LANGPACK_CONFIG
            return 0
        fi
        return 1
    }
    create_langpack_link $SHORTMOZLOCALE || create_langpack_link $MOZLOCALE || true
 fi
 # BEAST fix (rhbz#1005611)
 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%
 exec $MOZ_PROGRAM "$@"
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec