import thunderbird-102.3.0-3.el8_6

2022-09-26 09:57:57 -04:00 · 2022-09-26 09:57:57 -04:00 · c606ceaed8
commit c606ceaed8
parent 9a54646f6a
54 changed files with 1561 additions and 2352 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 SOURCES/cbindgen-vendor.tar.xz
-SOURCES/nspr-4.32.0-1.el8_1.src.rpm
+SOURCES/nspr-4.34.0-3.el8_1.src.rpm
-SOURCES/nss-3.67.0-7.el8_1.src.rpm
+SOURCES/nss-3.79.0-6.el8_1.src.rpm
-SOURCES/thunderbird-91.13.0.processed-source.tar.xz
+SOURCES/thunderbird-102.3.0.processed-source.tar.xz
-SOURCES/thunderbird-langpacks-91.13.0-20220819.tar.xz
+SOURCES/thunderbird-langpacks-102.3.0-20220916.tar.xz
 SOURCES/thunderbird-symbolic.svg
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@ -1,5 +1,6 @@
-c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
+2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz
-b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
+af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
-8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm
+fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm
-4def481a0e18a393bc756888f3da179187272fcf SOURCES/thunderbird-91.13.0.processed-source.tar.xz
+9344c5c96c40ea76f66ef594c16c73a6f72ecd7d SOURCES/thunderbird-102.3.0.processed-source.tar.xz
-7a3d28c5d6f3266cacad2e42ca9c2cc9b90dd27e SOURCES/thunderbird-langpacks-91.13.0-20220819.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-debuginfo-fix.patch
+++ b/SOURCES/build-debuginfo-fix.patch
@ -1,24 +0,0 @@
 diff -up firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc.debuginfo-fix firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc
 --- firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc.debuginfo-fix	2021-09-01 11:11:46.738285751 +0200
 +++ firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc	2021-09-01 11:11:56.127319530 +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-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.debuginfo-fix firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
 --- firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.debuginfo-fix	2021-09-01 11:12:26.513428847 +0200
 +++ firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc	2021-09-01 11:12:32.117449009 +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>
--- 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-mozconfig-fix.patch
+++ b/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
--- a/SOURCES/build-nss-version.patch
+++ b/SOURCES/build-nss-version.patch
@ -1,24 +0,0 @@
 diff -up firefox-91.0.1/build/moz.configure/nspr.configure.nss-nspr-downgrade firefox-91.0.1/build/moz.configure/nspr.configure
 --- firefox-91.0.1/build/moz.configure/nspr.configure.nss-nspr-downgrade	2021-08-25 13:17:26.265307060 +0200
 +++ firefox-91.0.1/build/moz.configure/nspr.configure	2021-08-25 13:17:28.161313632 +0200
@@ -50,7 +50,7 @@ set_define("JS_WITHOUT_NSPR", True, when
 def nspr_minver(js_standalone):
     if js_standalone:
         return "nspr >= 4.10"
 -    return "nspr >= 4.32"
 +    return "nspr >= 4.31"
 nspr_pkg = pkg_check_modules("NSPR", nspr_minver, when="--with-system-nspr")
 diff -up firefox-91.0.1/build/moz.configure/nss.configure.nss-nspr-downgrade firefox-91.0.1/build/moz.configure/nss.configure
 --- firefox-91.0.1/build/moz.configure/nss.configure.nss-nspr-downgrade	2021-08-25 13:17:45.049372175 +0200
 +++ firefox-91.0.1/build/moz.configure/nss.configure	2021-08-25 13:17:37.763346918 +0200
@@ -9,7 +9,7 @@ option("--with-system-nss", help="Use sy
 imply_option("--with-system-nspr", True, when="--with-system-nss")
 nss_pkg = pkg_check_modules(
 -    "NSS", "nss >= 3.68", when="--with-system-nss", config=False
 +    "NSS", "nss >= 3.67", when="--with-system-nss", config=False
 )
 set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
--- a/SOURCES/build-ppc64le-inline.patch
+++ b/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);
--- 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/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
@ -1,28 +1,12 @@
-diff --git a/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm b/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
+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
--- a/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
-+++ b/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
+++ thunderbird-102.2.1/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm	2022-09-12 14:39:26.784999636 +0200
-@@ -53,20 +53,23 @@ var BondOpenPGP = {
+@@ -51,6 +51,8 @@ var BondOpenPGP = {
   // if null, we haven't yet read the pref
   // if true, pref was enabled and we already triggered init
   _isEnabled: null,
   _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 (this._alreadyTriedInit) {
-     if (!MailConstants.MOZ_OPENPGP) {
+       // 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
--- a/SOURCES/expat-CVE-2022-25235.patch
+++ b/SOURCES/expat-CVE-2022-25235.patch
@ -1,49 +0,0 @@
 diff -up thunderbird-91.7.0/parser/expat/lib/xmltok.c.expat-CVE-2022-25235 thunderbird-91.7.0/parser/expat/lib/xmltok.c
 --- thunderbird-91.7.0/parser/expat/lib/xmltok.c.expat-CVE-2022-25235	2022-03-02 17:57:38.364361168 +0100
 +++ thunderbird-91.7.0/parser/expat/lib/xmltok.c	2022-03-02 17:58:22.235512399 +0100
@@ -65,13 +65,6 @@
                       + ((((byte)[2]) >> 5) & 1)] \
          & (1u << (((byte)[2]) & 0x1F)))
 -#define UTF8_GET_NAMING(pages, p, n) \
 -  ((n) == 2 \
 -  ? UTF8_GET_NAMING2(pages, (const unsigned char *)(p)) \
 -  : ((n) == 3 \
 -     ? UTF8_GET_NAMING3(pages, (const unsigned char *)(p)) \
 -     : 0))
 -
 /* Detection of invalid UTF-8 sequences is based on Table 3.1B
    of Unicode 3.2: http://www.unicode.org/unicode/reports/tr28/
    with the additional restriction of not allowing the Unicode
 diff -up thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c.expat-CVE-2022-25235 thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c
 --- thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c.expat-CVE-2022-25235	2022-03-02 17:57:38.365361172 +0100
 +++ thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c	2022-03-02 18:04:51.240853247 +0100
@@ -34,7 +34,7 @@
    case BT_LEAD ## n: \
      if (end - ptr < n) \
        return XML_TOK_PARTIAL_CHAR; \
 -     if (!IS_NAME_CHAR(enc, ptr, n)) { \
 +     if (IS_INVALID_CHAR(enc, ptr, n) || ! IS_NAME_CHAR(enc, ptr, n)) { \
        *nextTokPtr = ptr; \
        return XML_TOK_INVALID; \
      } \
@@ -62,7 +62,7 @@
    case BT_LEAD ## n: \
      if (end - ptr < n) \
        return XML_TOK_PARTIAL_CHAR; \
 -     if (!IS_NMSTRT_CHAR(enc, ptr, n)) { \
 +     if (IS_INVALID_CHAR(enc, ptr, n) || ! IS_NMSTRT_CHAR(enc, ptr, n)) { \
        *nextTokPtr = ptr; \
        return XML_TOK_INVALID; \
      } \
@@ -1090,6 +1090,10 @@ PREFIX(prologTok)(const ENCODING *enc, c
   case BT_LEAD ## n: \
     if (end - ptr < n) \
       return XML_TOK_PARTIAL_CHAR; \
 +    if (IS_INVALID_CHAR(enc, ptr, n)) {                                        \
 +      *nextTokPtr = ptr;                                                       \
 +      return XML_TOK_INVALID;                                                  \
 +    }                                                                          \
     if (IS_NMSTRT_CHAR(enc, ptr, n)) { \
       ptr += n; \
       tok = XML_TOK_NAME; \
--- a/SOURCES/expat-CVE-2022-25236.patch
+++ b/SOURCES/expat-CVE-2022-25236.patch
@ -1,40 +0,0 @@
 diff -up thunderbird-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25236 thunderbird-91.7.0/parser/expat/lib/xmlparse.c
 --- thunderbird-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25236	2022-03-02 18:08:40.085642028 +0100
 +++ thunderbird-91.7.0/parser/expat/lib/xmlparse.c	2022-03-02 18:13:31.838667958 +0100
@@ -700,8 +700,7 @@ XML_ParserCreate(const XML_Char *encodin
 XML_Parser XMLCALL
 XML_ParserCreateNS(const XML_Char *encodingName, XML_Char nsSep)
 {
 -  XML_Char tmp[2];
 -  *tmp = nsSep;
 +  XML_Char tmp[2] = {nsSep, 0};
   return XML_ParserCreate_MM(encodingName, NULL, tmp);
 }
 #endif
@@ -1276,8 +1275,7 @@ XML_ExternalEntityParserCreate(XML_Parse
      would be otherwise.
   */
   if (ns) {
 -    XML_Char tmp[2];
 -    *tmp = namespaceSeparator;
 +    XML_Char tmp[2] = {parser->m_namespaceSeparator, 0};
     parser = parserCreate(encodingName, &parser->m_mem, tmp, newDtd);
   }
   else {
@@ -3667,6 +3665,16 @@ addBinding(XML_Parser parser, PREFIX *pr
     if (!mustBeXML && isXMLNS
         && (len > xmlnsLen || uri[len] != xmlnsNamespace[len]))
       isXMLNS = XML_FALSE;
 +    // NOTE: While Expat does not validate namespace URIs against RFC 3986,
 +    //       we have to at least make sure that the XML processor on top of
 +    //       Expat (that is splitting tag names by namespace separator into
 +    //       2- or 3-tuples (uri-local or uri-local-prefix)) cannot be confused
 +    //       by an attacker putting additional namespace separator characters
 +    //       into namespace declarations.  That would be ambiguous and not to
 +    //       be expected.
 +    if (parser->m_ns && (uri[len] == parser->m_namespaceSeparator)) {
 +      return XML_ERROR_SYNTAX;
 +    }
   }
   isXML = isXML && len == xmlLen;
   isXMLNS = isXMLNS && len == xmlnsLen;
--- a/SOURCES/expat-CVE-2022-25315.patch
+++ b/SOURCES/expat-CVE-2022-25315.patch
@ -1,24 +0,0 @@
 diff -up thunderbird-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25315 thunderbird-91.7.0/parser/expat/lib/xmlparse.c
 --- thunderbird-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25315	2022-03-02 18:17:50.966583254 +0100
 +++ thunderbird-91.7.0/parser/expat/lib/xmlparse.c	2022-03-02 18:19:27.636924735 +0100
@@ -2479,6 +2479,7 @@ storeRawNames(XML_Parser parser)
   while (tag) {
     int bufSize;
     int nameLen = sizeof(XML_Char) * (tag->name.strLen + 1);
 +    size_t rawNameLen;
     char *rawNameBuf = tag->buf + nameLen;
     /* Stop if already stored.  Since tagStack is a stack, we can stop
        at the first entry that has already been copied; everything
@@ -2490,7 +2491,11 @@ storeRawNames(XML_Parser parser)
     /* For re-use purposes we need to ensure that the
        size of tag->buf is a multiple of sizeof(XML_Char).
     */
 -    bufSize = nameLen + ROUND_UP(tag->rawNameLength, sizeof(XML_Char));
 +    rawNameLen = ROUND_UP(tag->rawNameLength, sizeof(XML_Char));
 +    /* Detect and prevent integer overflow. */
 +    if (rawNameLen > (size_t)INT_MAX - nameLen)
 +      return XML_FALSE;
 +    bufSize = nameLen + (int)rawNameLen;
     if (bufSize > tag->bufEnd - tag->buf) {
       char *temp = (char *)REALLOC(tag->buf, bufSize);
       if (temp == NULL)
--- 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-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/get-calendar-langpacks.sh
+++ b/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
--- 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
@ -1,6 +1,6 @@
-diff -up firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
+diff -up firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
--- firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2021-07-27 23:29:57.000000000 +0200
+--- firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2021-03-18 14:48:36.000000000 +0100
-+++ firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp	2021-07-29 16:20:44.164513998 +0200
+++ 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;
@ -23,22 +23,23 @@ diff -up firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
   } else {
     nsAutoCString location("resource://gre/defaults/autoconfig/");
     location += aFileName;
-diff -up firefox-91.0/modules/libpref/Preferences.cpp.1170092 firefox-91.0/modules/libpref/Preferences.cpp
+diff -up firefox-87.0/modules/libpref/Preferences.cpp.1170092 firefox-87.0/modules/libpref/Preferences.cpp
--- firefox-91.0/modules/libpref/Preferences.cpp.1170092	2021-07-27 23:30:34.000000000 +0200
+--- firefox-87.0/modules/libpref/Preferences.cpp.1170092	2021-03-18 14:48:54.000000000 +0100
-+++ firefox-91.0/modules/libpref/Preferences.cpp	2021-07-29 16:20:44.166514005 +0200
+++ firefox-87.0/modules/libpref/Preferences.cpp	2021-03-22 19:20:02.429310184 +0100
-@@ -4553,6 +4553,8 @@ nsresult Preferences::InitInitialObjects
+@@ -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-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-91.0/toolkit/xre/nsXREDirProvider.cpp
+diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/toolkit/xre/nsXREDirProvider.cpp
--- firefox-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2021-07-27 23:30:56.000000000 +0200
+--- firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092	2021-03-18 14:52:00.000000000 +0100
-+++ firefox-91.0/toolkit/xre/nsXREDirProvider.cpp	2021-07-29 16:26:20.071628932 +0200
+++ firefox-87.0/toolkit/xre/nsXREDirProvider.cpp	2021-03-22 19:37:56.574480347 +0100
-@@ -71,6 +71,7 @@
+@@ -65,6 +65,7 @@
 #endif
 #ifdef XP_UNIX
 #  include <ctype.h>
@ -46,7 +47,7 @@ diff -up firefox-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-91.0/tool
 #endif
 #ifdef XP_IOS
 #  include "UIKitDirProvider.h"
-@@ -550,6 +551,21 @@ nsXREDirProvider::GetFile(const char* aP
+@@ -552,6 +553,21 @@ nsXREDirProvider::GetFile(const char* aP
       }
     }
   }
@ -68,26 +69,26 @@ diff -up firefox-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-91.0/tool
   if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
   if (ensureFilePermissions) {
-@@ -827,6 +843,16 @@ nsresult nsXREDirProvider::GetFilesInter
+@@ -874,6 +890,16 @@ nsresult nsXREDirProvider::GetFilesInter
       LoadDirIntoArray(mXULAppDir, kAppendBackgroundTasksPrefDir, directories);
     }
 #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)) {
+      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)) {
-diff -up firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h
+     // NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
--- firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2021-07-27 23:31:38.000000000 +0200
+diff -up firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h
-+++ firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h	2021-07-29 16:20:44.168514012 +0200
+--- 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 \
--- 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-bmo1005535.patch
+++ b/SOURCES/mozilla-bmo1005535.patch
@ -1,7 +1,20 @@
-diff -up firefox-78.0/gfx/skia/skia/src/gpu/GrColor.h.mozilla.bmo1005535 firefox-78.0/gfx/skia/skia/src/gpu/GrColor.h
+# HG changeset patch
--- firefox-78.0/gfx/skia/skia/src/gpu/GrColor.h.mozilla.bmo1005535	2020-06-25 16:16:34.459083304 +0200
+# User Steve Singer <steve@ssinger.info>
-+++ firefox-78.0/gfx/skia/skia/src/gpu/GrColor.h	2020-06-25 16:17:00.968174743 +0200
+# Date 1558451540 -7200
-@@ -64,7 +64,7 @@ static inline GrColor GrColorPackRGBA(un
+#      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"
  */
@ -10,3 +23,8 @@ diff -up firefox-78.0/gfx/skia/skia/src/gpu/GrColor.h.mozilla.bmo1005535 firefox
 /** 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
@ -1,7 +1,16 @@
-diff -up firefox-78.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 firefox-78.0/gfx/2d/DrawTargetSkia.cpp
+# HG changeset patch
--- firefox-78.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1	2020-06-17 04:18:58.000000000 +0200
+# Parent  b5471d23321d16a0bacc25b7afd27d2e16adba1a
-+++ firefox-78.0/gfx/2d/DrawTargetSkia.cpp	2020-06-25 16:52:29.824532769 +0200
+Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
-@@ -135,8 +135,7 @@ static IntRect CalculateSurfaceBounds(co
+
 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);
 }
@ -11,10 +20,20 @@ diff -up firefox-78.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 firefox
 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
+   if (aFormat != SurfaceFormat::B8G8R8X8 || aSize.IsEmpty()) {
--- firefox-78.0/gfx/2d/Types.h.mozilla-bmo1504834-part1	2020-06-25 16:52:29.826532776 +0200
+     return true;
-+++ firefox-78.0/gfx/2d/Types.h	2020-06-25 16:55:02.942063616 +0200
+   }
-@@ -90,15 +90,8 @@ enum class SurfaceFormat : int8_t {
+   // 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.
@ -30,10 +49,20 @@ 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
+   // TODO(aosmond): When everything blocking bug 1581828 has been resolved, we
--- firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo1504834-part1	2020-06-17 04:18:58.000000000 +0200
+   // can make this use R8B8G8A8 and R8B8G8X8 for non-Windows platforms.
-+++ firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc	2020-06-25 16:54:02.993855444 +0200
+   OS_RGBA = A8R8G8B8_UINT32,
-@@ -30,6 +30,8 @@
+   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
@ -42,17 +71,27 @@ diff -up firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo150483
 #endif
 // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
-@@ -280,20 +282,28 @@ enum {
+ // 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)
 -    return _byteswap_ushort(be);
 +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 +    return be;
- #else
+#else
 +    #if defined(_MSC_VER)
-+    return _byteswap_ushort(be);
+     return _byteswap_ushort(be);
 -#else
 +    #else
     return __builtin_bswap16(be);
 +    #endif
@ -63,15 +102,20 @@ diff -up firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo150483
     uint32_t be;
     memcpy(&be, ptr, sizeof(be));
 -#if defined(_MSC_VER)
 -    return _byteswap_ulong(be);
 +#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
 +    return be;
- #else
+#else
 +    #if defined(_MSC_VER)
-+    return _byteswap_ulong(be);
+     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-part2.patch
+++ b/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
--- a/SOURCES/mozilla-bmo1504834-part3.patch
+++ b/SOURCES/mozilla-bmo1504834-part3.patch
@ -1,12 +1,17 @@
 # HG changeset patch
-# Parent  aecb4600e5da17443b224c79eee178c1d8e155e3
+# 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 -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
+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	Tue Aug 20 09:46:55 2019 +0200
+--- a/gfx/skia/skia/include/private/SkNx.h
-+++ b/gfx/skia/skia/include/private/SkNx.h	Mon Sep 09 10:04:06 2019 +0200
+++ b/gfx/skia/skia/include/private/SkNx.h
-@@ -238,7 +238,18 @@
+@@ -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; }
@ -25,10 +30,20 @@ diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
     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
+     AI SkNx operator==(const SkNx& y) const { return FromBits(fVal == y.fVal ? ~0 : 0); }
--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Tue Aug 20 09:46:55 2019 +0200
+     AI SkNx operator!=(const SkNx& y) const { return FromBits(fVal != y.fVal ? ~0 : 0); }
-+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Mon Sep 09 10:04:06 2019 +0200
+     AI SkNx operator<=(const SkNx& y) const { return FromBits(fVal <= y.fVal ? ~0 : 0); }
-@@ -203,7 +203,13 @@
+     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)
@ -42,3 +57,8 @@ diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
                  + d.approxMulDiv255(aa.inv());
         };
         while (h --> 0) {
             Sk4px::MapDstAlpha(w, dst, mask, fn);
             dst  +=  dstRB / sizeof(*dst);
             mask += maskRB / sizeof(*mask);
         }
     }
--- a/SOURCES/mozilla-bmo1504834-part4.patch
+++ b/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);
--- a/SOURCES/mozilla-bmo1554971.patch
+++ b/SOURCES/mozilla-bmo1554971.patch
@ -1,12 +0,0 @@
 diff -up firefox-91.0/toolkit/components/extensions/schemas/runtime.json.mozilla-bmo1554971 firefox-91.0/toolkit/components/extensions/schemas/runtime.json
 --- firefox-91.0/toolkit/components/extensions/schemas/runtime.json.mozilla-bmo1554971	2021-07-29 17:20:08.523253193 +0200
 +++ firefox-91.0/toolkit/components/extensions/schemas/runtime.json	2021-07-29 17:21:23.517498581 +0200
@@ -64,7 +64,7 @@
       {
         "id": "PlatformArch",
         "type": "string",
 -        "enum": ["aarch64", "arm", "ppc64", "s390x", "sparc64", "x86-32", "x86-64"],
 +        "enum": ["aarch64", "arm", "ppc64", "ppc64le", "s390x", "sparc64", "x86-32", "x86-64"],
         "allowedContexts": ["content", "devtools"],
         "description": "The machine's processor architecture."
       },
--- a/SOURCES/mozilla-bmo1602730.patch
+++ b/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;
--- a/SOURCES/mozilla-bmo1626236.patch
+++ b/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 &&
--- a/SOURCES/mozilla-bmo849632.patch
+++ b/SOURCES/mozilla-bmo849632.patch
@ -1,16 +1,24 @@
 # 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
+diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
-+++ b/gfx/gl/GLContext.h    Wed Nov 13 17:13:04 2019 +0100
+--- a/gfx/gl/GLContext.h
-@@ -1551,6 +1551,13 @@
+++ 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
+#if MOZ_BIG_ENDIAN()
 +    uint8_t* itr = (uint8_t*)pixels;
 +    for (GLsizei i = 0; i < width * height; i++) {
 +      NativeEndian::swapToLittleEndianInPlace((uint32_t*)itr, 1);
@ -21,3 +29,7 @@ diff -r 6b017d3e9733 gfx/gl/GLContext.h
     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
@ -27,4 +27,3 @@ diff -r 506857dace0a -r 34676feac1a5 gfx/2d/FilterProcessing.h
 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
@ -3,16 +3,21 @@
 # Date 1558452408 -7200
 #      Tue May 21 17:26:48 2019 +0200
 # Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
-# Parent  a3cc550d25e3a04d906f516928cbcbe50efd585e
+# Parent  136e1f2c44a3099b3e49a576fa62c8ad77aa431e
 [mq]: mozilla-s390-context.patch
-diff -r a3cc550d25e3 -r 602e92722e76 js/src/wasm/WasmSignalHandlers.cpp
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
--- a/js/src/wasm/WasmSignalHandlers.cpp	Tue May 21 17:22:06 2019 +0200
+--- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp	Tue May 21 17:26:48 2019 +0200
+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -154,6 +154,10 @@
+@@ -157,16 +157,20 @@ using mozilla::DebugOnly;
 #    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(__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)
@ -20,17 +25,29 @@ diff -r a3cc550d25e3 -r 602e92722e76 js/src/wasm/WasmSignalHandlers.cpp
 #  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 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
@ -49,4 +49,3 @@ diff -r acf59ea86dd1 gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp
     }
 }
--- a/SOURCES/node-stdout-nonblocking-wrapper
+++ b/SOURCES/node-stdout-nonblocking-wrapper
@ -1,3 +1,2 @@
 #!/bin/sh
-#exec /usr/bin/node "$@" 2>&1 | cat -
+exec node "$@" 2>&1 | cat -
 exec $MOZ_NODEJS "$@" 2>&1 | cat -
--- 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/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
@ -12,19 +12,23 @@ 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 --update-channel=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
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
+++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
--- a/SOURCES/thunderbird.sh.in
+++ b/SOURCES/thunderbird.sh.in
@ -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
@ -126,20 +142,4 @@ 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 "$@"
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
`@ -27,4 +27,3 @@ diff -r 506857dace0a -r 34676feac1a5 gfx/2d/FilterProcessing.h`

	`class FilterProcessing {`	`class FilterProcessing {`
	`public:`	`public:`
`@ -49,4 +49,3 @@ diff -r acf59ea86dd1 gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp`
	`}`	`}`
	`}`	`}`