.firefox.metadata

@@ -1,7 +1,8 @@
-af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
-a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm
-52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
-ad6fa8c1048c81bedd369efcb30642a8bea003d9 SOURCES/firefox-102.12.0esr.processed-source.tar.xz
-422709954a376fb2cb4d5f89310372e664cb2cf3 SOURCES/firefox-langpacks-102.12.0esr-20230531.tar.xz
-2dbf669fa4742e7065cc54cec19f96423032658b SOURCES/firefox-symbolic.svg
-da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz
+5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz
+2549991b68b27b820e92151e48f9f08da0cd55fb SOURCES/firefox-128.5.1esr.processed-source.tar.xz
+76f0794bac607a730ea03dff8f804e09c9e0c962 SOURCES/firefox-langpacks-128.5.1esr-20241202.tar.xz
+2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
+d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
+f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm
+0413d22a58ba1bba99acec9c3c2a4db56a4100c7 SOURCES/nss-3.101.0-7.el9_2.src.rpm
+0332862626d2148648ff749078c223dbd859d901 SOURCES/wasi-sdk-20.tar.gz

.gitignore

@@ -1,7 +1,8 @@
-SOURCES/nspr-4.34.0-3.el8_1.src.rpm
-SOURCES/nss-3.79.0-11.el8_1.src.rpm
 SOURCES/cbindgen-vendor.tar.xz
-SOURCES/firefox-102.12.0esr.processed-source.tar.xz
-SOURCES/firefox-langpacks-102.12.0esr-20230531.tar.xz
-SOURCES/firefox-symbolic.svg
+SOURCES/firefox-128.5.1esr.processed-source.tar.xz
+SOURCES/firefox-langpacks-128.5.1esr-20241202.tar.xz
 SOURCES/mochitest-python.tar.gz
+SOURCES/nspr-4.35.0-1.el8_1.src.rpm
+SOURCES/nss-3.101.0-7.el8_2.src.rpm
+SOURCES/nss-3.101.0-7.el9_2.src.rpm
+SOURCES/wasi-sdk-20.tar.gz

SOURCES/0001-GLIBCXX-fix-for-GCC-12.patch

@@ -1,44 +0,0 @@
-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
-

SOURCES/D110204-fscreen.diff

@@ -1,82 +0,0 @@
-diff -up firefox-102.2.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-102.2.0/widget/gtk/nsWindow.cpp
---- firefox-102.2.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff	2022-08-18 21:54:09.000000000 +0200
-+++ firefox-102.2.0/widget/gtk/nsWindow.cpp	2022-09-02 15:55:18.023843940 +0200
-@@ -96,6 +96,7 @@
- #include "ScreenHelperGTK.h"
- #include "SystemTimeConverter.h"
- #include "WidgetUtilsGtk.h"
-+#include "nsIBrowserHandler.h"
- 
- #ifdef ACCESSIBILITY
- #  include "mozilla/a11y/LocalAccessible.h"
-@@ -169,7 +170,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
-                      GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
-                      GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-                      GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
--                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
-+                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
-+                     GDK_FOCUS_CHANGE_MASK;
- 
- /* utility functions */
- static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX,
-@@ -408,7 +410,8 @@ nsWindow::nsWindow()
-       mMovedAfterMoveToRect(false),
-       mResizedAfterMoveToRect(false),
-       mConfiguredClearColor(false),
--      mGotNonBlankPaint(false) {
-+      mGotNonBlankPaint(false),
-+      mPendingFullscreen(false) {
-   mWindowType = eWindowType_child;
-   mSizeConstraints.mMaxSize = GetSafeWindowSize(mSizeConstraints.mMaxSize);
- 
-@@ -4814,6 +4817,19 @@ void nsWindow::OnWindowStateEvent(GtkWid
-       ClearTransparencyBitmap();
-     }
-   }
-+
-+  // Hack to ensure window switched to fullscreen - avoid to fail when starting
-+  // in kiosk mode
-+  if (mPendingFullscreen &&
-+      !(aEvent->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
-+    LOG(
-+        "  Window should be fullscreen, but it's not, retrying set to "
-+         "fullscreen.\n");
-+    MakeFullScreen(true);
-+  } else {
-+    LOG("  Window successfully switched to fullscreen, happy now\n");
-+    mPendingFullscreen = false;
-+  }
- }
- 
- void nsWindow::OnDPIChanged() {
-@@ -7042,6 +7058,19 @@ nsresult nsWindow::MakeFullScreen(bool a
-       }
-     }
- 
-+    // if in kiosk, ensure the fullscreen is called
-+    nsCOMPtr<nsIBrowserHandler> browserHandler =
-+        do_GetService("@mozilla.org/browser/clh;1");
-+    if (browserHandler) {
-+      bool isKiosk;
-+      browserHandler->GetKiosk(&isKiosk);
-+      if (isKiosk) {
-+        LOG("  is kiosk, ensure the window switch to fullscreen\n");
-+        mPendingFullscreen = true;
-+      }
-+    } else {
-+      LOG("  Cannot find the browserHandler service.\n");
-+    }
-     gtk_window_fullscreen(GTK_WINDOW(mShell));
-   } else {
-     mSizeMode = mLastSizeMode;
-diff -up firefox-102.2.0/widget/gtk/nsWindow.h.D110204-fscreen.diff firefox-102.2.0/widget/gtk/nsWindow.h
---- firefox-102.2.0/widget/gtk/nsWindow.h.D110204-fscreen.diff	2022-08-18 21:53:52.000000000 +0200
-+++ firefox-102.2.0/widget/gtk/nsWindow.h	2022-09-02 08:17:07.606010905 +0200
-@@ -712,6 +712,7 @@ class nsWindow final : public nsBaseWidg
-    * move-to-rect callback we set mMovedAfterMoveToRect/mResizedAfterMoveToRect.
-    */
-   bool mWaitingForMoveToRectCallback : 1;
-+  bool mPendingFullscreen : 1;
-   bool mMovedAfterMoveToRect : 1;
-   bool mResizedAfterMoveToRect : 1;
- 

SOURCES/D158770.diff

@@ -1,25 +0,0 @@
-diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c
---- a/parser/expat/lib/xmlparse.c
-+++ b/parser/expat/lib/xmlparse.c
-@@ -5652,12 +5652,18 @@
-   else
- #endif /* XML_DTD */
-   {
-     processor = contentProcessor;
-     /* see externalEntityContentProcessor vs contentProcessor */
--    return doContent(parser, parentParser ? 1 : 0, encoding, s, end,
--                     nextPtr, (XML_Bool)!ps_finalBuffer);
-+    result = doContent(parser, parser->m_parentParser ? 1 : 0,
-+                       parser->m_encoding, s, end, nextPtr,
-+                       (XML_Bool)! parser->m_parsingStatus.finalBuffer);
-+    if (result == XML_ERROR_NONE) {
-+      if (! storeRawNames(parser))
-+        return XML_ERROR_NO_MEMORY;
-+    }
-+    return result;
-   }
- }
- 
- static enum XML_Error PTRCALL
- errorProcessor(XML_Parser parser,
-

SOURCES/D224587.1728128070.diff

@@ -0,0 +1,50 @@
+diff --git a/dom/media/webrtc/transport/nricectx.cpp b/dom/media/webrtc/transport/nricectx.cpp
+--- a/dom/media/webrtc/transport/nricectx.cpp
++++ b/dom/media/webrtc/transport/nricectx.cpp
+@@ -124,23 +124,30 @@
+ static int nr_crypto_nss_hmac(UCHAR* key, size_t keyl, UCHAR* buf, size_t bufl,
+                               UCHAR* result) {
+   CK_MECHANISM_TYPE mech = CKM_SHA_1_HMAC;
+   PK11SlotInfo* slot = nullptr;
+   MOZ_ASSERT(keyl > 0);
+-  SECItem keyi = {siBuffer, key, static_cast<unsigned int>(keyl)};
++  CK_KEY_DERIVATION_STRING_DATA idkey = {key, keyl};
++  SECItem keyi = {siBuffer, (unsigned char*)&idkey, sizeof(idkey)};
++  PK11SymKey* tmpKey = nullptr;
+   PK11SymKey* skey = nullptr;
+   PK11Context* hmac_ctx = nullptr;
+   SECStatus status;
+   unsigned int hmac_len;
+   SECItem param = {siBuffer, nullptr, 0};
+   int err = R_INTERNAL;
+ 
+   slot = PK11_GetInternalKeySlot();
+   if (!slot) goto abort;
+ 
+-  skey = PK11_ImportSymKey(slot, mech, PK11_OriginUnwrap, CKA_SIGN, &keyi,
+-                           nullptr);
++  // HMAC is used for hash calculation only so use derive instead of import
++  // to be FIPS compliant.
++  tmpKey = PK11_KeyGen(slot, mech, NULL, keyl, nullptr);
++  if (!tmpKey) goto abort;
++
++  skey = PK11_Derive(tmpKey, CKM_CONCATENATE_DATA_AND_BASE, &keyi, mech,
++                     CKA_SIGN, keyl);
+   if (!skey) goto abort;
+ 
+   hmac_ctx = PK11_CreateContextBySymKey(mech, CKA_SIGN, skey, &param);
+   if (!hmac_ctx) goto abort;
+ 
+@@ -157,10 +164,11 @@
+ 
+   err = 0;
+ 
+ abort:
+   if (hmac_ctx) PK11_DestroyContext(hmac_ctx, PR_TRUE);
++  if (tmpKey) PK11_FreeSymKey(tmpKey);
+   if (skey) PK11_FreeSymKey(skey);
+   if (slot) PK11_FreeSlot(slot);
+ 
+   return err;
+ }
+

SOURCES/D224588.1728128098.diff

@@ -0,0 +1,224 @@
+diff --git a/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c b/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c
+--- a/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c
++++ b/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c
+@@ -54,10 +54,11 @@
+ #include "crypto_types.h"
+ #include "cipher_types.h"
+ #include "cipher_test_cases.h"
+ #include <secerr.h>
+ #include <nspr.h>
++#include "nss_fips.h"
+ 
+ srtp_debug_module_t srtp_mod_aes_gcm = {
+     0,            /* debugging is off by default */
+     "aes gcm nss" /* printable module name       */
+ };
+@@ -211,12 +212,17 @@
+     if (!slot) {
+         return (srtp_err_status_cipher_fail);
+     }
+ 
+     SECItem key_item = { siBuffer, (unsigned char *)key, c->key_size };
+-    c->key = PK11_ImportSymKey(slot, CKM_AES_GCM, PK11_OriginUnwrap,
+-                               CKA_ENCRYPT, &key_item, NULL);
++    if (PK11_IsFIPS()) {
++      c->key = PK11_ImportSymKey_FIPS(slot, CKM_AES_GCM, PK11_OriginUnwrap,
++                                 CKA_ENCRYPT, &key_item, NULL);
++    } else {
++      c->key = PK11_ImportSymKey(slot, CKM_AES_GCM, PK11_OriginUnwrap,
++                                 CKA_ENCRYPT, &key_item, NULL);
++    }
+     PK11_FreeSlot(slot);
+ 
+     if (!c->key) {
+         return (srtp_err_status_cipher_fail);
+     }
+diff --git a/third_party/libsrtp/src/crypto/cipher/aes_icm_nss.c b/third_party/libsrtp/src/crypto/cipher/aes_icm_nss.c
+--- a/third_party/libsrtp/src/crypto/cipher/aes_icm_nss.c
++++ b/third_party/libsrtp/src/crypto/cipher/aes_icm_nss.c
+@@ -51,10 +51,11 @@
+ #include "crypto_types.h"
+ #include "err.h" /* for srtp_debug */
+ #include "alloc.h"
+ #include "cipher_types.h"
+ #include "cipher_test_cases.h"
++#include "nss_fips.h"
+ 
+ srtp_debug_module_t srtp_mod_aes_icm = {
+     0,            /* debugging is off by default */
+     "aes icm nss" /* printable module name       */
+ };
+@@ -252,12 +253,17 @@
+     if (!slot) {
+         return srtp_err_status_bad_param;
+     }
+ 
+     SECItem keyItem = { siBuffer, (unsigned char *)key, c->key_size };
+-    c->key = PK11_ImportSymKey(slot, CKM_AES_CTR, PK11_OriginUnwrap,
+-                               CKA_ENCRYPT, &keyItem, NULL);
++    if (PK11_IsFIPS()) {
++      c->key = PK11_ImportSymKey_FIPS(slot, CKM_AES_CTR, PK11_OriginUnwrap,
++                                 CKA_ENCRYPT, &keyItem, NULL);
++    } else {
++      c->key = PK11_ImportSymKey(slot, CKM_AES_CTR, PK11_OriginUnwrap,
++                                 CKA_ENCRYPT, &keyItem, NULL);
++    }
+     PK11_FreeSlot(slot);
+ 
+     if (!c->key) {
+         return srtp_err_status_cipher_fail;
+     }
+diff --git a/third_party/libsrtp/src/crypto/include/nss_fips.h b/third_party/libsrtp/src/crypto/include/nss_fips.h
+new file mode 100644
+--- /dev/null
++++ b/third_party/libsrtp/src/crypto/include/nss_fips.h
+@@ -0,0 +1,148 @@
++/*
++ * Copyright (c) 2024, Red Hat, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ *   Redistributions of source code must retain the above copyright
++ *   notice, this list of conditions and the following disclaimer.
++ *
++ *   Redistributions in binary form must reproduce the above
++ *   copyright notice, this list of conditions and the following
++ *   disclaimer in the documentation and/or other materials provided
++ *   with the distribution.
++ *
++ *   Neither the name of the Red Hat, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
++ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
++ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
++ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
++ * OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++/*
++  Adapted from Red Hat Ceph patch by
++  Radoslaw Zarzynski <rzarzyns@redhat.com>
++
++  PK11_ImportSymKey() is a part of NSS API that becomes unavailable
++  in the FIPS mode. Apparently NSS targets stricter restrictions
++  than those coming from Level 1 of FIPS 140-2. In the consequence,
++  loading a symmetric key from plain keyring or key db fails.
++
++  A raw crypto key is in-memory wrapped with fresh, random wrapping
++  key just before being imported via PK11_UnwrapSymKey(). Of course,
++  this effectively lowers to FIPS level 1. Still, this would be no
++  different from what OpenSSL gives in the matter.
++*/
++
++#ifndef NSS_FIPS_H
++#define NSS_FIPS_H
++
++static PK11SymKey *PK11_ImportSymKey_FIPS(
++    PK11SlotInfo * const slot,
++    const CK_MECHANISM_TYPE type,
++    const PK11Origin origin,
++    const CK_ATTRIBUTE_TYPE operation,
++    SECItem * const raw_key,
++    void * const wincx)
++{
++  PK11SymKey* wrapping_key = NULL;
++  PK11Context *wrap_key_crypt_context = NULL;
++  SECItem *raw_key_aligned = NULL;
++  CK_MECHANISM_TYPE wrap_mechanism = 0;
++
++  struct {
++    unsigned char data[256];
++    int len;
++  } wrapped_key;
++
++  #define SCOPE_DATA_FREE()                               \
++  {                                                       \
++    PK11_FreeSymKey(wrapping_key);                        \
++    PK11_DestroyContext(wrap_key_crypt_context, PR_TRUE); \
++    SECITEM_FreeItem(raw_key_aligned, PR_TRUE);           \
++  }
++
++  if(raw_key->len > sizeof(wrapped_key.data)) {
++    return NULL;
++  }
++
++  // getting 306 on my system which is CKM_DES3_ECB.
++  wrap_mechanism = PK11_GetBestWrapMechanism(slot);
++
++  // Generate a wrapping key. It will be used exactly twice over the scope:
++  //   * to encrypt raw_key giving wrapped_key,
++  //   * to decrypt wrapped_key in the internals of PK11_UnwrapSymKey().
++  wrapping_key = PK11_KeyGen(slot, wrap_mechanism, NULL,
++                             PK11_GetBestKeyLength(slot, wrap_mechanism), NULL);
++  if (wrapping_key == NULL) {
++    return NULL;
++  }
++
++  // Prepare a PK11 context for the raw_key -> wrapped_key encryption.
++  SECItem tmp_sec_item;
++  memset(&tmp_sec_item, 0, sizeof(tmp_sec_item));
++  wrap_key_crypt_context = PK11_CreateContextBySymKey(
++   wrap_mechanism,
++   CKA_ENCRYPT,
++   wrapping_key,
++   &tmp_sec_item);
++  if (wrap_key_crypt_context == NULL) {
++    SCOPE_DATA_FREE();
++    return NULL;
++  }
++
++  // Finally wrap the key. Important note is that the wrapping mechanism
++  // selection (read: just grabbing a cipher) offers, at least in my NSS
++  // copy, mostly CKM_*_ECB ciphers (with 3DES as the leading one, see
++  // wrapMechanismList[] in pk11mech.c). There is no CKM_*_*_PAD variant
++  // which means that plaintext we are providing to PK11_CipherOp() must
++  // be aligned to cipher's block size. For 3DES it's 64 bits.
++  raw_key_aligned = PK11_BlockData(raw_key, PK11_GetBlockSize(wrap_mechanism, NULL));
++  if (raw_key_aligned == NULL) {
++    SCOPE_DATA_FREE();
++    return NULL;
++  }
++
++  if (PK11_CipherOp(wrap_key_crypt_context, wrapped_key.data, &wrapped_key.len,
++      sizeof(wrapped_key.data), raw_key_aligned->data,
++      raw_key_aligned->len) != SECSuccess) {
++    SCOPE_DATA_FREE();
++    return NULL;
++  }
++
++  if (PK11_Finalize(wrap_key_crypt_context) != SECSuccess) {
++    SCOPE_DATA_FREE();
++    return NULL;
++  }
++
++  // Key is wrapped now so we can acquire the ultimate PK11SymKey through
++  // unwrapping it. Of course these two opposite operations form NOP with
++  // a side effect: FIPS level 1 compatibility.
++  memset(&tmp_sec_item, 0, sizeof(tmp_sec_item));
++
++  SECItem wrapped_key_item;
++  memset(&wrapped_key_item, 0, sizeof(wrapped_key_item));
++  wrapped_key_item.data = wrapped_key.data;
++  wrapped_key_item.len = wrapped_key.len;
++
++  PK11SymKey *ret = PK11_UnwrapSymKey(wrapping_key, wrap_mechanism,
++                                      &tmp_sec_item, &wrapped_key_item, type,
++                                      operation, raw_key->len);
++  SCOPE_DATA_FREE();
++  return ret;
++ }
++
++#endif // NSS_FIPS_H
+

SOURCES/build-aarch64-skia.patch

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

SOURCES/build-arm-libaom.patch

@@ -1,12 +0,0 @@
-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

SOURCES/build-arm-libopus.patch

@@ -1,12 +0,0 @@
-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"
- 

SOURCES/build-ascii-decode-fail-rhel7.patch

@@ -1,45 +0,0 @@
-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:

SOURCES/build-disable-elfhack.patch

@@ -1,12 +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",
+diff -up firefox-128.0/toolkit/moz.configure.disable-elfhack firefox-128.0/toolkit/moz.configure
+--- firefox-128.0/toolkit/moz.configure.disable-elfhack	2024-06-19 17:24:29.964976617 +0200
++++ firefox-128.0/toolkit/moz.configure	2024-06-19 17:24:53.015843805 +0200
+@@ -1553,7 +1553,7 @@ with only_when("--enable-compile-environ
+     @depends(host, target)
+     def has_elfhack(host, target):
+         return (
+-            target.kernel == "Linux"
++            False and target.kernel == "Linux"
+             and host.kernel == "Linux"
+             and target.cpu in ("arm", "aarch64", "x86", "x86_64")
          )
- 
--        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)

SOURCES/build-disable-gamepad.patch

@@ -0,0 +1,12 @@
+diff -up firefox-128.0/dom/gamepad/moz.build.gamepad firefox-128.0/dom/gamepad/moz.build
+--- firefox-128.0/dom/gamepad/moz.build.gamepad	2024-07-30 16:24:07.326519645 +0200
++++ firefox-128.0/dom/gamepad/moz.build	2024-07-30 16:24:15.817492673 +0200
+@@ -60,7 +60,7 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "wi
+ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
+     UNIFIED_SOURCES += ["android/AndroidGamepad.cpp"]
+ elif CONFIG["OS_ARCH"] in ("Linux", "FreeBSD", "DragonFly"):
+-    UNIFIED_SOURCES += ["linux/LinuxGamepad.cpp"]
++    UNIFIED_SOURCES += ["fallback/FallbackGamepad.cpp"]
+ else:
+     UNIFIED_SOURCES += ["fallback/FallbackGamepad.cpp"]
+ 

SOURCES/build-ffvpx.patch

@@ -0,0 +1,24 @@
+diff -up thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c.build-ffvpx thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c
+--- thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c.build-ffvpx	2024-06-24 22:43:40.000000000 +0200
++++ thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c	2024-07-10 11:20:23.200948767 +0200
+@@ -887,7 +887,7 @@ static av_cold int av1_decode_init(AVCod
+         ff_cbs_fragment_reset(&s->current_obu);
+     }
+ 
+-    s->dovi.logctx = avctx;
++    s->dovi.logctx = (AVContext *) avctx;
+     s->dovi.dv_profile = 10; // default for AV1
+     sd = ff_get_coded_side_data(avctx, AV_PKT_DATA_DOVI_CONF);
+     if (sd && sd->size > 0)
+diff -up thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c.build-ffvpx thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c
+--- thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c.build-ffvpx	2024-07-10 12:46:57.005539959 +0200
++++ thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c	2024-07-10 12:47:19.067507705 +0200
+@@ -289,7 +289,7 @@ static av_cold int libdav1d_init(AVCodec
+     c->delay = res > 1 ? res : 0;
+ #endif
+ 
+-    dav1d->dovi.logctx = c;
++    dav1d->dovi.logctx = (AVContext *) c;
+     dav1d->dovi.dv_profile = 10; // default for AV1
+     sd = ff_get_coded_side_data(c, AV_PKT_DATA_DOVI_CONF);
+     if (sd && sd->size > 0)

SOURCES/build-libaom.patch

@@ -0,0 +1,20 @@
+diff -up firefox-128.0/config/external/moz.build.libaom firefox-128.0/config/external/moz.build
+--- firefox-128.0/config/external/moz.build.libaom	2024-07-31 15:32:39.460374047 +0200
++++ firefox-128.0/config/external/moz.build	2024-07-31 15:34:41.646064796 +0200
+@@ -39,8 +39,8 @@ if CONFIG["MOZ_VORBIS"]:
+ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
+     external_dirs += ["media/libvpx"]
+ 
++external_dirs += ["media/libaom"]
+ if CONFIG["MOZ_AV1"]:
+-    external_dirs += ["media/libaom"]
+     external_dirs += ["media/libdav1d"]
+ 
+ if not CONFIG["MOZ_SYSTEM_PNG"]:
+diff -up firefox-128.0/third_party/aom/third_party/fastfeat/README.libaom firefox-128.0/third_party/aom/third_party/fastfeat/README
+diff -up firefox-128.0/third_party/aom/third_party/googletest/README.libaom firefox-128.0/third_party/aom/third_party/googletest/README
+diff -up firefox-128.0/third_party/aom/third_party/libwebm/README.libaom firefox-128.0/third_party/aom/third_party/libwebm/README
+diff -up firefox-128.0/third_party/aom/third_party/libyuv/README.libaom firefox-128.0/third_party/aom/third_party/libyuv/README
+diff -up firefox-128.0/third_party/aom/third_party/SVT-AV1/README.libaom firefox-128.0/third_party/aom/third_party/SVT-AV1/README
+diff -up firefox-128.0/third_party/aom/third_party/vector/README.libaom firefox-128.0/third_party/aom/third_party/vector/README
+diff -up firefox-128.0/third_party/aom/third_party/x86inc/README.libaom firefox-128.0/third_party/aom/third_party/x86inc/README

SOURCES/build-ppc64-abiv2.patch

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

SOURCES/build-remove-dav1d-from-wayland-dep.patch

@@ -1,49 +0,0 @@
-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'
-         ]
- 

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

@@ -1,11 +1,11 @@
---- firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version	2022-10-10 17:55:56.000000000 +0200
-+++ firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py	2022-10-17 14:57:47.476182627 +0200
+--- firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version	2024-02-12 21:53:56.000000000 +0200
++++ firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py	2024-02-14 16:48:12.476182627 +0200
 @@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
- from mozfile import which
+ from packaging.version import Version
  from six import PY3
  
--NODE_MIN_VERSION = StrictVersion("10.24.1")
-+NODE_MIN_VERSION = StrictVersion("10.24.0")
- NPM_MIN_VERSION = StrictVersion("6.14.12")
+-NODE_MIN_VERSION = Version("12.22.12")
++NODE_MIN_VERSION = Version("10.24.0")
+ NPM_MIN_VERSION = Version("6.14.16")
  
  

SOURCES/disable-pipewire.patch

@@ -0,0 +1,274 @@
+diff -up firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild.disable-pipewire firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild
+--- firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild.disable-pipewire	2024-07-17 14:01:36.290603114 +0200
++++ firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild	2024-07-17 14:52:02.039208338 +0200
+@@ -31,7 +31,7 @@ if CONFIG["MOZ_WEBRTC"]:
+                 and CONFIG["TARGET_CPU"].startswith("mips")
+             )
+         ):
+-            DEFINES["WEBRTC_USE_PIPEWIRE"] = True
++            DEFINES["WEBRTC_USE_PIPEWIRE"] = False
+     elif CONFIG["OS_TARGET"] == "Darwin":
+         DEFINES["WEBRTC_MAC"] = True
+     elif CONFIG["OS_TARGET"] == "WINNT":
+diff -up firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build.disable-pipewire firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
+--- firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build.disable-pipewire	2024-07-17 14:01:36.291603109 +0200
++++ firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build	2024-07-17 14:56:35.419826494 +0200
+@@ -241,102 +241,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-    LOCAL_INCLUDES += [
+-        "/gfx/angle/checkout/include/",
+-        "/third_party/drm/drm/",
+-        "/third_party/drm/drm/include/",
+-        "/third_party/drm/drm/include/libdrm/",
+-        "/third_party/gbm/gbm/",
+-        "/third_party/libepoxy/libepoxy/include/",
+-        "/third_party/pipewire/"
+-    ]
+-
+-    SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+-    ]
+-
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+-    ]
+-
+-if CONFIG["TARGET_CPU"] == "mips32":
+-
+-    DEFINES["MIPS32_LE"] = True
+-    DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-    LOCAL_INCLUDES += [
+-        "/gfx/angle/checkout/include/",
+-        "/third_party/drm/drm/",
+-        "/third_party/drm/drm/include/",
+-        "/third_party/drm/drm/include/libdrm/",
+-        "/third_party/gbm/gbm/",
+-        "/third_party/libepoxy/libepoxy/include/",
+-        "/third_party/pipewire/"
+-    ]
+-
+-    SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+-    ]
+-
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+-    ]
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-    LOCAL_INCLUDES += [
+-        "/gfx/angle/checkout/include/",
+-        "/third_party/drm/drm/",
+-        "/third_party/drm/drm/include/",
+-        "/third_party/drm/drm/include/libdrm/",
+-        "/third_party/gbm/gbm/",
+-        "/third_party/libepoxy/libepoxy/include/",
+-        "/third_party/pipewire/"
+-    ]
+-
+-    SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+-    ]
+-
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+-    ]
+-
+ if CONFIG["TARGET_CPU"] == "ppc64":
+ 
+     DEFINES["USE_X11"] = "1"
+@@ -389,35 +293,6 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-    LOCAL_INCLUDES += [
+-        "/gfx/angle/checkout/include/",
+-        "/third_party/drm/drm/",
+-        "/third_party/drm/drm/include/",
+-        "/third_party/drm/drm/include/libdrm/",
+-        "/third_party/gbm/gbm/",
+-        "/third_party/libepoxy/libepoxy/include/",
+-        "/third_party/pipewire/"
+-    ]
+-
+-    SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+-    ]
+-
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+-    ]
+-
+ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+ 
+     DEFINES["USE_X11"] = "1"
+@@ -446,95 +321,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CO
+         "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
+-
+-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-    LOCAL_INCLUDES += [
+-        "/gfx/angle/checkout/include/",
+-        "/third_party/drm/drm/",
+-        "/third_party/drm/drm/include/",
+-        "/third_party/drm/drm/include/libdrm/",
+-        "/third_party/gbm/gbm/",
+-        "/third_party/libepoxy/libepoxy/include/",
+-        "/third_party/pipewire/"
+-    ]
+-
+-    SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+-    ]
+-
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-    LOCAL_INCLUDES += [
+-        "/gfx/angle/checkout/include/",
+-        "/third_party/drm/drm/",
+-        "/third_party/drm/drm/include/",
+-        "/third_party/drm/drm/include/libdrm/",
+-        "/third_party/gbm/gbm/",
+-        "/third_party/libepoxy/libepoxy/include/",
+-        "/third_party/pipewire/"
+-    ]
+-
+-    SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc"
+-    ]
+-
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc"
+-    ]
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_USE_X11"] = True
+-
+-    OS_LIBS += [
+-        "X11",
+-        "Xcomposite",
+-        "Xdamage",
+-        "Xext",
+-        "Xfixes",
+-        "Xrandr",
+-        "Xrender"
+-    ]
+-
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc",
+-        "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
+-    ]
+ 
+ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+ 
+diff -up firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build.disable-pipewire firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build
+--- firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build.disable-pipewire	2024-07-04 18:20:41.000000000 +0200
++++ firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build	2024-07-17 14:01:36.291603109 +0200
+@@ -27,7 +27,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+ DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["WEBRTC_USE_PIPEWIRE"] = True
++DEFINES["WEBRTC_USE_PIPEWIRE"] = False
+ DEFINES["_FILE_OFFSET_BITS"] = "64"
+ DEFINES["_GNU_SOURCE"] = True
+ DEFINES["_LARGEFILE64_SOURCE"] = True
+diff -up firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build.disable-pipewire firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
+--- firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build.disable-pipewire	2024-07-04 18:20:41.000000000 +0200
++++ firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build	2024-07-17 14:01:36.291603109 +0200
+@@ -25,7 +25,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+ DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+-DEFINES["WEBRTC_USE_PIPEWIRE"] = True
++DEFINES["WEBRTC_USE_PIPEWIRE"] = False
+ DEFINES["_FILE_OFFSET_BITS"] = "64"
+ DEFINES["_GNU_SOURCE"] = True
+ DEFINES["_LARGEFILE64_SOURCE"] = True

SOURCES/distribution.ini

@@ -1,9 +0,0 @@
-[Global]
-id=fedora
-version=1.0
-about=Mozilla Firefox for Fedora
-
-[Preferences]
-app.distributor=fedora
-app.distributor.channel=fedora
-app.partner.fedora=fedora

SOURCES/distribution.ini.in

@@ -0,0 +1,9 @@
+[Global]
+id=__ID__
+version=1.0
+about=Mozilla Firefox for __NAME__
+
+[Preferences]
+app.distributor=__ID__
+app.distributor.channel=__ID__
+app.partner.__ID__=__ID__

SOURCES/fedora-shebang-build.patch

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

SOURCES/firefox-enable-addons.patch

@@ -1,10 +1,10 @@
-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"
+diff -up firefox-128.0/browser/app/profile/firefox.js.addons firefox-128.0/browser/app/profile/firefox.js
+--- firefox-128.0/browser/app/profile/firefox.js.addons	2024-06-13 11:47:04.255428350 +0200
++++ firefox-128.0/browser/app/profile/firefox.js	2024-06-13 11:53:00.442837371 +0200
+@@ -56,7 +56,8 @@ pref("extensions.systemAddon.update.enab
  
  // 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.
+ // See the SCOPE constants in AddonManager.sys.mjs for values to use here.
 -pref("extensions.autoDisableScopes", 15);
 +pref("extensions.autoDisableScopes", 0);
 +pref("extensions.showMismatchUI", false);

SOURCES/firefox-mozconfig

@@ -1,28 +1,29 @@
 . $topsrcdir/browser/config/mozconfig
 
-ac_add_options --with-system-zlib
-ac_add_options --disable-strip
-#ac_add_options --enable-libnotify
-ac_add_options --enable-necko-wifi
-ac_add_options --disable-updater
-ac_add_options --enable-chrome-format=omni
-ac_add_options --enable-pulseaudio
-ac_add_options --enable-av1
-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 --disable-crashreporter
+ac_add_options --disable-strip
+ac_add_options --disable-updater
+ac_add_options --enable-av1
+ac_add_options --enable-chrome-format=omni
+ac_add_options --enable-js-shell
+ac_add_options --enable-necko-wifi
+ac_add_options --enable-official-branding
+ac_add_options --enable-pulseaudio
+ac_add_options --enable-release
+ac_add_options --enable-system-ffi
+ac_add_options --without-system-icu
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-unsigned-addon-scopes=app,system
+
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_UPDATE_CHANNEL=release
 export MOZ_APP_REMOTINGNAME=firefox
+mk_add_options MOZ_TELEMETRY_REPORTING=
+mk_add_options MOZ_NORMANDY=
+mk_add_options MOZ_SERVICES_HEALTHREPORT=
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir

SOURCES/firefox-nss-version.patch

@@ -1,11 +0,0 @@
---- firefox-102.6.0/build/moz.configure/nss.configure.firefox-nss-version	2022-12-06 19:14:59.439978420 +0100
-+++ firefox-102.6.0/build/moz.configure/nss.configure	2022-12-06 19:18:23.299471634 +0100
-@@ -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.2", 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")

SOURCES/firefox-redhat-default-prefs.js

@@ -14,8 +14,8 @@ pref("browser.shell.checkDefaultBrowser",   false);
 pref("network.manage-offline-status",       true);
 pref("extensions.shownSelectionUI",         true);
 pref("ui.SpellCheckerUnderlineStyle",       1);
-pref("startup.homepage_override_url",       "http://www.almalinux.org");
-pref("startup.homepage_welcome_url",        "http://www.almalinux.org");
+pref("startup.homepage_override_url",       "%HOMEPAGE%");
+pref("startup.homepage_welcome_url",        "%HOMEPAGE%");
 pref("browser.startup.homepage",            "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html");
 pref("media.gmp-gmpopenh264.autoupdate",true);
 pref("media.gmp-gmpopenh264.enabled",false);
@@ -36,6 +36,7 @@ pref("browser.gnome-search-provider.enabled",true);
 pref("media.navigator.mediadatadecoder_vpx_enabled", true);
 /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */
 pref("storage.nfs_filesystem", true);
-pref("datareporting.healthreport.uploadEnabled", false);
-pref("datareporting.policy.dataSubmissionEnabled", false);
-pref("toolkit.telemetry.archive.enabled", false);
+/* Disable Private Attribution collection and submission */
+pref("dom.private-attribution.submission.enabled", false);
+/* ECH is not supported in the system nss */
+pref("security.tls.ech.grease_probability", 0);

SOURCES/firefox-tests-xpcshell-freeze.patch

@@ -1,14 +0,0 @@
-diff -up firefox-88.0/testing/xpcshell/runxpcshelltests.py.old firefox-88.0/testing/xpcshell/runxpcshelltests.py
---- firefox-88.0/testing/xpcshell/runxpcshelltests.py.old	2021-04-30 10:45:14.466616224 +0200
-+++ firefox-88.0/testing/xpcshell/runxpcshelltests.py	2021-04-30 10:45:21.339525085 +0200
-@@ -1382,8 +1382,8 @@ class XPCShellTests(object):
-                         self.log.info("Process %s" % label)
-                     self.log.info(msg)
- 
--            dumpOutput(proc.stdout, "stdout")
--            dumpOutput(proc.stderr, "stderr")
-+            #dumpOutput(proc.stdout, "stdout")
-+            #dumpOutput(proc.stderr, "stderr")
-         self.nodeProc = {}
- 
-     def startHttp3Server(self):

SOURCES/firefox.sh.in

@@ -64,7 +64,6 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox"
 MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
 MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
 MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
-MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"
 GETENFORCE_FILE="/usr/sbin/getenforce"
 
 ##
@@ -247,35 +246,6 @@ fi
 NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
 export NSS_SSL_CBC_RANDOM_IV
 
-# Prepare command line arguments
-script_args=""
-pass_arg_count=0
-while [ $# -gt $pass_arg_count ]
-do
-  case "$1" in
-    -g | --debug)
-      script_args="$script_args -g"
-      debugging=1
-      shift
-      ;;
-    -d | --debugger)
-      if [ $# -gt 1 ]; then
-        script_args="$script_args -d $2"
-        shift 2
-      else
-        shift
-      fi
-      ;;
-    *)
-      # Move the unrecognized argument to the end of the list.
-      arg="$1"
-      shift
-      set -- "$@" "$arg"
-      pass_arg_count=`expr $pass_arg_count + 1`
-      ;;
-  esac
-done
-
 # Flatpak specific environment variables
 %FLATPAK_ENV_VARS%
 
@@ -286,7 +256,7 @@ export MOZ_ALLOW_DOWNGRADE=1
 debugging=0
 if [ $debugging = 1 ]
 then
-  echo $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@"
+  echo $MOZ_PROGRAM "$@"
 fi
 
-exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@"
+exec $MOZ_PROGRAM "$@"

SOURCES/mozilla-1516803.patch

@@ -1,15 +0,0 @@
-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()

SOURCES/mozilla-1669639.patch

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

SOURCES/mozilla-1670333.patch

@@ -1,68 +0,0 @@
-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();

SOURCES/mozilla-1775202.patch

@@ -1,17 +0,0 @@
-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":
-

SOURCES/mozilla-1833330.patch

@@ -1,632 +0,0 @@
-diff --git a/security/manager/locales/en-US/security/certificates/certManager.ftl b/security/manager/locales/en-US/security/certificates/certManager.ftl
---- a/security/manager/locales/en-US/security/certificates/certManager.ftl
-+++ b/security/manager/locales/en-US/security/certificates/certManager.ftl
-@@ -51,9 +51,6 @@ certmgr-cert-name =
- certmgr-cert-server =
-     .label = Server
- 
--certmgr-override-lifetime =
--    .label = Lifetime
--
- certmgr-token-name =
-     .label = Security Device
- 
-@@ -69,6 +66,9 @@ certmgr-email =
- certmgr-serial =
-     .label = Serial Number
- 
-+certmgr-fingerprint-sha-256 =
-+    .label = SHA-256 Fingerprint
-+
- certmgr-view =
-     .label = View…
-     .accesskey = V
-diff --git a/security/manager/pki/resources/content/certManager.js b/security/manager/pki/resources/content/certManager.js
---- a/security/manager/pki/resources/content/certManager.js
-+++ b/security/manager/pki/resources/content/certManager.js
-@@ -64,22 +64,16 @@ var serverRichList = {
- 
-   buildRichList() {
-     let overrides = overrideService.getOverrides().map(item => {
--      let cert = null;
--      if (item.dbKey !== "") {
--        cert = certdb.findCertByDBKey(item.dbKey);
--      }
-       return {
-         hostPort: item.hostPort,
--        dbKey: item.dbKey,
-         asciiHost: item.asciiHost,
-         port: item.port,
-         originAttributes: item.originAttributes,
--        isTemporary: item.isTemporary,
--        displayName: cert !== null ? cert.displayName : "",
-+        fingerprint: item.fingerprint,
-       };
-     });
-     overrides.sort((a, b) => {
--      let criteria = ["hostPort", "displayName"];
-+      let criteria = ["hostPort", "fingerprint"];
-       for (let c of criteria) {
-         let res = a[c].localeCompare(b[c]);
-         if (res !== 0) {
-@@ -106,10 +100,10 @@ var serverRichList = {
-   _richBoxAddItem(item) {
-     let richlistitem = document.createXULElement("richlistitem");
- 
--    richlistitem.setAttribute("dbKey", item.dbKey);
-     richlistitem.setAttribute("host", item.asciiHost);
-     richlistitem.setAttribute("port", item.port);
-     richlistitem.setAttribute("hostPort", item.hostPort);
-+    richlistitem.setAttribute("fingerprint", item.fingerprint);
-     richlistitem.setAttribute(
-       "originAttributes",
-       JSON.stringify(item.originAttributes)
-@@ -120,18 +114,7 @@ var serverRichList = {
-     hbox.setAttribute("equalsize", "always");
- 
-     hbox.appendChild(createRichlistItem({ raw: item.hostPort }));
--    hbox.appendChild(
--      createRichlistItem(
--        item.displayName !== ""
--          ? { raw: item.displayName }
--          : { l10nid: "no-cert-stored-for-override" }
--      )
--    );
--    hbox.appendChild(
--      createRichlistItem({
--        l10nid: item.isTemporary ? "temporary-override" : "permanent-override",
--      })
--    );
-+    hbox.appendChild(createRichlistItem({ raw: item.fingerprint }));
- 
-     richlistitem.appendChild(hbox);
- 
-@@ -170,32 +153,6 @@ var serverRichList = {
-     }
-   },
- 
--  viewSelectedRichListItem() {
--    let selectedItem = this.richlist.selectedItem;
--    if (!selectedItem) {
--      return;
--    }
--
--    let dbKey = selectedItem.getAttribute("dbKey");
--    if (dbKey) {
--      let cert = certdb.findCertByDBKey(dbKey);
--      viewCertHelper(window, cert);
--    }
--  },
--
--  exportSelectedRichListItem() {
--    let selectedItem = this.richlist.selectedItem;
--    if (!selectedItem) {
--      return;
--    }
--
--    let dbKey = selectedItem.getAttribute("dbKey");
--    if (dbKey) {
--      let cert = certdb.findCertByDBKey(dbKey);
--      exportToFile(window, cert);
--    }
--  },
--
-   addException() {
-     let retval = {
-       exceptionAdded: false,
-@@ -212,16 +169,8 @@ var serverRichList = {
-   },
- 
-   _setButtonState() {
--    let websiteViewButton = document.getElementById("websites_viewButton");
--    let websiteExportButton = document.getElementById("websites_exportButton");
-     let websiteDeleteButton = document.getElementById("websites_deleteButton");
--
--    let certKey = this.richlist.selectedItem?.getAttribute("dbKey");
--    let cert = certKey && certdb.findCertByDBKey(certKey);
--
-     websiteDeleteButton.disabled = this.richlist.selectedIndex < 0;
--    websiteExportButton.disabled = !cert;
--    websiteViewButton.disabled = websiteExportButton.disabled;
-   },
- };
- /**
-diff --git a/security/manager/pki/resources/content/certManager.xhtml b/security/manager/pki/resources/content/certManager.xhtml
---- a/security/manager/pki/resources/content/certManager.xhtml
-+++ b/security/manager/pki/resources/content/certManager.xhtml
-@@ -157,18 +157,13 @@
-
-            <listheader equalsize="always">
-              <treecol id="sitecol" data-l10n-id="certmgr-cert-server" primary="true" flex="1"/>
--             <treecol id="certcol" data-l10n-id="certmgr-cert-name" flex="1"/>
--             <treecol id="lifetimecol" data-l10n-id="certmgr-override-lifetime" flex="1"/>
-+            <treecol id="sha256col" data-l10n-id="certmgr-fingerprint-sha-256" flex="1"/>
-            </listheader>
-            <richlistbox ondblclick="serverRichList.viewSelectedRichListItem();" class="certManagerRichlistBox" id="serverList" flex="1" selected="false"/>
-
-           <separator class="thin"/>
-
-           <hbox>
--            <button id="websites_viewButton"
--                    data-l10n-id="certmgr-view" oncommand="serverRichList.viewSelectedRichListItem();"/>
--            <button id="websites_exportButton"
--                    data-l10n-id="certmgr-export" oncommand="serverRichList.exportSelectedRichListItem();"/>
-             <button id="websites_deleteButton"
-                     data-l10n-id="certmgr-delete" oncommand="serverRichList.deleteSelectedRichListItem();"/>
-             <button id="websites_exceptionButton"
-diff --git a/security/manager/ssl/nsCertOverrideService.cpp b/security/manager/ssl/nsCertOverrideService.cpp
---- a/security/manager/ssl/nsCertOverrideService.cpp
-+++ b/security/manager/ssl/nsCertOverrideService.cpp
-@@ -106,8 +106,8 @@ nsCertOverride::GetAsciiHost(/*out*/ nsA
- }
- 
- NS_IMETHODIMP
--nsCertOverride::GetDbKey(/*out*/ nsACString& aDBKey) {
--  aDBKey = mDBKey;
-+nsCertOverride::GetFingerprint(/*out*/ nsACString& aFingerprint) {
-+  aFingerprint = mFingerprint;
-   return NS_OK;
- }
- 
-@@ -118,12 +118,6 @@ nsCertOverride::GetPort(/*out*/ int32_t*
- }
- 
- NS_IMETHODIMP
--nsCertOverride::GetIsTemporary(/*out*/ bool* aIsTemporary) {
--  *aIsTemporary = mIsTemporary;
--  return NS_OK;
--}
--
--NS_IMETHODIMP
- nsCertOverride::GetHostPort(/*out*/ nsACString& aHostPort) {
-   nsCertOverrideService::GetHostWithPort(mAsciiHost, mPort, aHostPort);
-   return NS_OK;
-@@ -274,7 +268,6 @@ void nsCertOverrideService::RemoveAllTem
-   for (auto iter = mSettingsTable.Iter(); !iter.Done(); iter.Next()) {
-     nsCertOverrideEntry* entry = iter.Get();
-     if (entry->mSettings->mIsTemporary) {
--      entry->mSettings->mCert = nullptr;
-       iter.Remove();
-     }
-   }
-@@ -297,18 +297,11 @@
-   nsAutoCString buffer;
-   bool isMore = true;
- 
--  /* file format is:
--   *
--   * host:port:originattributes \t fingerprint-algorithm \t fingerprint \t
--   * override-mask \t dbKey
--   *
--   *   where override-mask is a sequence of characters,
--   *     M meaning hostname-Mismatch-override
--   *     U meaning Untrusted-override
--   *     T meaning Time-error-override (expired/not yet valid)
--   *
--   * if this format isn't respected we move onto the next line in the file.
--   */
-+  // Each line is of the form:
-+  // host:port:originAttributes \t sSHA256OIDString \t fingerprint \t
-+  // There may be some "bits" identifiers and "dbKey" after the `fingerprint`
-+  // field in 'fingerprint \t \t dbKey' format, but these are now ignored.
-+  // Lines that don't match this form are silently dropped.
- 
-   while (isMore && NS_SUCCEEDED(lineInputStream->ReadLine(buffer, &isMore))) {
-     if (buffer.IsEmpty() || buffer.First() == '#') {
-@@ -350,23 +343,10 @@
-         fingerprint.Length() == 0) {
-       continue;
-     }
--    nsDependentCSubstring bitsString;
--    if (!parser.ReadUntil(Tokenizer::Token::Whitespace(), bitsString) ||
--        bitsString.Length() == 0) {
--      continue;
--    }
--    nsDependentCSubstring dbKey;
--    if (!parser.ReadUntil(Tokenizer::Token::EndOfFile(), dbKey) ||
--        dbKey.Length() == 0) {
--      continue;
--    }
--    nsCertOverride::OverrideBits bits;
--    nsCertOverride::convertStringToBits(bitsString, bits);
- 
-     AddEntryToList(host, port, attributes,
--                   nullptr,  // don't have the cert
--                   false,    // not temporary
--                   fingerprint, bits, dbKey, aProofOfLock);
-+                   false,  // not temporary
-+                   fingerprint, aProofOfLock);
-   }
- 
-   return NS_OK;
-@@ -412,9 +392,8 @@
-     output.Append(kTab);
-     output.Append(settings->mFingerprint);
-     output.Append(kTab);
--    output.Append(bitsString);
--    output.Append(kTab);
--    output.Append(settings->mDBKey);
-+    // the "bits" string used to go here, but it no longer exists
-+    // the "\t dbKey" string used to go here, but it no longer exists
-     output.Append(NS_LINEBREAK);
-   }
- 
-@@ -462,42 +441,16 @@
-     return NS_ERROR_FAILURE;
-   }
- 
--  nsAutoCString nickname;
--  nsresult rv = DefaultServerNicknameForCert(nsscert.get(), nickname);
--  if (!aTemporary && NS_SUCCEEDED(rv)) {
--    UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
--    if (!slot) {
--      return NS_ERROR_FAILURE;
--    }
--
--    // This can fail (for example, if we're in read-only mode). Luckily, we
--    // don't even need it to succeed - we always match on the stored hash of the
--    // certificate rather than the full certificate. It makes the display a bit
--    // less informative (since we won't have a certificate to display), but it's
--    // better than failing the entire operation.
--    Unused << PK11_ImportCert(slot.get(), nsscert.get(), CK_INVALID_HANDLE,
--                              nickname.get(), false);
--  }
--
-   nsAutoCString fpStr;
--  rv = GetCertSha256Fingerprint(aCert, fpStr);
--  if (NS_FAILED(rv)) {
--    return rv;
--  }
--
--  nsAutoCString dbkey;
--  rv = aCert->GetDbKey(dbkey);
-+  nsresult rv = GetCertSha256Fingerprint(aCert, fpStr);
-   if (NS_FAILED(rv)) {
-     return rv;
-   }
- 
-   {
-     MutexAutoLock lock(mMutex);
--    AddEntryToList(aHostName, aPort, aOriginAttributes,
--                   aTemporary ? aCert : nullptr,
--                   // keep a reference to the cert for temporary overrides
--                   aTemporary, fpStr,
--                   (nsCertOverride::OverrideBits)aOverrideBits, dbkey, lock);
-+    AddEntryToList(aHostName, aPort, aOriginAttributes, aTemporary, fpStr,
-+                   lock);
-     if (!aTemporary) {
-       Write(lock);
-     }
-@@ -532,10 +485,8 @@
- 
-   MutexAutoLock lock(mMutex);
-   AddEntryToList(aHostName, aPort, aOriginAttributes,
--                 nullptr,  // No cert to keep alive
-                  true,     // temporary
--                 aCertFingerprint, (nsCertOverride::OverrideBits)aOverrideBits,
--                 ""_ns,  // dbkey
-+                 aCertFingerprint,
-                  lock);
- 
-   return NS_OK;
-@@ -632,10 +583,8 @@
- 
- nsresult nsCertOverrideService::AddEntryToList(
-     const nsACString& aHostName, int32_t aPort,
--    const OriginAttributes& aOriginAttributes, nsIX509Cert* aCert,
--    const bool aIsTemporary, const nsACString& fingerprint,
--    nsCertOverride::OverrideBits ob, const nsACString& dbKey,
--    const MutexAutoLock& aProofOfLock) {
-+    const OriginAttributes& aOriginAttributes, const bool aIsTemporary,
-+    const nsACString& fingerprint, const MutexAutoLock& aProofOfLock) {
-   mMutex.AssertCurrentThreadOwns();
-   nsAutoCString keyString;
-   GetKeyString(aHostName, aPort, aOriginAttributes, keyString);
-@@ -656,11 +605,6 @@
-   settings->mOriginAttributes = aOriginAttributes;
-   settings->mIsTemporary = aIsTemporary;
-   settings->mFingerprint = fingerprint;
--  settings->mOverrideBits = ob;
--  settings->mDBKey = dbKey;
--  // remove whitespace from stored dbKey for backwards compatibility
--  settings->mDBKey.StripWhitespace();
--  settings->mCert = aCert;
-   entry->mSettings = settings;
- 
-   return NS_OK;
-diff --git a/security/manager/ssl/nsCertOverrideService.h b/security/manager/ssl/nsCertOverrideService.h
---- a/security/manager/ssl/nsCertOverrideService.h
-+++ b/security/manager/ssl/nsCertOverrideService.h
-@@ -43,8 +43,6 @@
-   bool mIsTemporary;  // true: session only, false: stored on disk
-   nsCString mFingerprint;
-   OverrideBits mOverrideBits;
--  nsCString mDBKey;
--  nsCOMPtr<nsIX509Cert> mCert;
- 
-   static void convertBitsToString(OverrideBits ob, nsACString& str);
-   static void convertStringToBits(const nsACString& str, OverrideBits& ob);
-@@ -145,10 +143,8 @@
-   nsresult Write(const mozilla::MutexAutoLock& aProofOfLock);
-   nsresult AddEntryToList(const nsACString& host, int32_t port,
-                           const OriginAttributes& aOriginAttributes,
--                          nsIX509Cert* aCert, const bool aIsTemporary,
-+                          const bool aIsTemporary,
-                           const nsACString& fingerprint,
--                          nsCertOverride::OverrideBits ob,
--                          const nsACString& dbKey,
-                           const mozilla::MutexAutoLock& aProofOfLock);
- 
-   // Set in constructor only
-diff --git a/security/manager/ssl/SSLServerCertVerification.cpp b/security/manager/ssl/SSLServerCertVerification.cpp
---- a/security/manager/ssl/SSLServerCertVerification.cpp
-+++ b/security/manager/ssl/SSLServerCertVerification.cpp
-@@ -791,8 +791,8 @@
-           aHostName, aPort, aOriginAttributes, aCert, &overrideBits,
-           &isTemporaryOverride, &haveOverride);
-       if (NS_SUCCEEDED(rv) && haveOverride) {
--        // remove the errors that are already overriden
--        remainingDisplayErrors &= ~overrideBits;
-+        // remove all the errors
-+        remainingDisplayErrors = 0;
-       }
-     }
-
-diff --git a/security/manager/ssl/nsICertOverrideService.idl b/security/manager/ssl/nsICertOverrideService.idl
---- a/security/manager/ssl/nsICertOverrideService.idl
-+++ b/security/manager/ssl/nsICertOverrideService.idl
-@@ -33,17 +33,6 @@ interface nsICertOverride : nsISupports 
-   readonly attribute int32_t port;
- 
-   /**
--  *   Whether or not the override is only used for this
--  *   session (true) or stored persistently (false)
--  */
--  readonly attribute boolean isTemporary;
--
--  /**
--  *   The database key for the associated certificate.
--  */
--  readonly attribute ACString dbKey;
--
--  /**
-   *   A combination of hostname and port in the form host:port.
-   *   Since the port can be -1 which is equivalent to port 433 we use an
-   *   existing function of nsCertOverrideService to create this property.
-@@ -51,6 +40,11 @@ interface nsICertOverride : nsISupports 
-   readonly attribute ACString hostPort;
- 
-   /**
-+  *   The fingerprint for the associated certificate.
-+  */
-+  readonly attribute ACString fingerprint;
-+
-+  /**
-   *   The origin attributes associated with this override.
-   */
-   [implicit_jscontext]
-diff --git a/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js b/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js
---- a/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js
-+++ b/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js
-@@ -27,9 +27,7 @@ async function checkServerCertificates(w
- 
-   expectedValues.forEach((item, i) => {
-     let hostPort = labels[i * 3].value;
--    let certString = labels[i * 3 + 1].value || labels[i * 3 + 1].textContent;
--    let isTemporaryString =
--      labels[i * 3 + 2].value || labels[i * 3 + 2].textContent;
-+    let fingerprint = labels[i * 3 + 1].value || labels[i * 3 + 1].textContent;
- 
-     Assert.equal(
-       hostPort,
-@@ -38,15 +36,9 @@ async function checkServerCertificates(w
-     );
- 
-     Assert.equal(
--      certString,
--      item.certName,
--      `Expected override to have field ${item.certName}`
--    );
--
--    Assert.equal(
--      isTemporaryString,
--      item.isTemporary ? "Temporary" : "Permanent",
--      `Expected override to be ${item.isTemporary ? "Temporary" : "Permanent"}`
-+      fingerprint,
-+      item.fingerprint,
-+      `Expected override to have field ${item.fingerprint}`
-     );
-   });
- }
-@@ -73,41 +73,6 @@
-   );
- }
- 
--async function testViewButton(win) {
--  win.document.getElementById("serverList").selectedIndex = 1;
--
--  Assert.ok(
--    win.document.getElementById("websites_viewButton").disabled,
--    "View button should be disabled for override without cert"
--  );
--
--  win.document.getElementById("serverList").selectedIndex = 0;
--
--  Assert.ok(
--    !win.document.getElementById("websites_viewButton").disabled,
--    "View button should be enabled for override with cert"
--  );
--
--  let loaded = BrowserTestUtils.waitForNewTab(gBrowser, null, true);
--
--  win.document.getElementById("websites_viewButton").click();
--
--  let newTab = await loaded;
--  let spec = newTab.linkedBrowser.documentURI.spec;
--
--  Assert.ok(
--    spec.startsWith("about:certificate"),
--    "about:certificate should habe been opened"
--  );
--
--  let newUrl = new URL(spec);
--  let certEncoded = newUrl.searchParams.get("cert");
--  let certDecoded = decodeURIComponent(certEncoded);
--  Assert.ok(certDecoded, "should have some certificate as cert url param");
--
--  gBrowser.removeCurrentTab();
--}
--
- add_task(async function test_cert_manager_server_tab() {
-   let win = await openCertManager();
- 
-@@ -134,48 +99,13 @@
-   await checkServerCertificates(win, [
-     {
-       hostPort: "example.com:443",
--      certName: "md5-ee",
--      isTemporary: false,
--    },
--  ]);
--
--  win.document.getElementById("certmanager").acceptDialog();
--  await BrowserTestUtils.windowClosed(win);
--
--  certOverrideService.rememberTemporaryValidityOverrideUsingFingerprint(
--    "example.com",
--    9999,
--    {},
--    "40:20:3E:57:FB:82:95:0D:3F:62:D7:04:39:F6:32:CC:B2:2F:70:9F:3E:66:C5:35:64:6E:49:2A:F1:02:75:9F",
--    Ci.nsICertOverrideService.ERROR_UNTRUSTED
--  );
--
--  win = await openCertManager();
--
--  await checkServerCertificates(win, [
--    {
--      hostPort: "example.com:443",
--      certName: "md5-ee",
--      isTemporary: false,
--    },
--    {
--      hostPort: "example.com:9999",
--      certName: "(Not Stored)",
--      isTemporary: true,
-+      fingerprint: cert.sha256Fingerprint,
-     },
-   ]);
- 
--  await testViewButton(win);
--
--  await deleteOverride(win, 2);
-+  await deleteOverride(win, 1);
- 
--  await checkServerCertificates(win, [
--    {
--      hostPort: "example.com:9999",
--      certName: "(Not Stored)",
--      isTemporary: true,
--    },
--  ]);
-+  await checkServerCertificates(win, []);
- 
-   win.document.getElementById("certmanager").acceptDialog();
-   await BrowserTestUtils.windowClosed(win);
-diff --git a/security/manager/ssl/tests/unit/test_cert_override_read.js b/security/manager/ssl/tests/unit/test_cert_override_read.js
---- a/security/manager/ssl/tests/unit/test_cert_override_read.js
-+++ b/security/manager/ssl/tests/unit/test_cert_override_read.js
-@@ -11,19 +11,16 @@ function run_test() {
-   let cert1 = {
-     sha256Fingerprint:
-       "E9:3A:91:F6:15:11:FB:DD:02:76:DD:45:8C:4B:F4:9B:D1:14:13:91:2E:96:4B:EC:D2:4F:90:D5:F4:BB:29:5C",
--    dbKey: "This isn't relevant for this test.",
-   };
-   // bad_certs/selfsigned.pem
-   let cert2 = {
-     sha256Fingerprint:
-       "51:BC:41:90:C1:FD:6E:73:18:19:B0:60:08:DD:A3:3D:59:B2:5B:FB:D0:3D:DD:89:19:A5:BB:C6:2B:5A:72:A7",
--    dbKey: "This isn't relevant for this test.",
-   };
-   // bad_certs/noValidNames.pem
-   let cert3 = {
-     sha256Fingerprint:
-       "C3:A3:61:02:CA:64:CC:EC:45:1D:24:B6:A0:69:DB:DB:F0:D8:58:76:FC:50:36:52:5A:E8:40:4C:55:72:08:F4",
--    dbKey: "This isn't relevant for this test.",
-   };
- 
-   let profileDir = do_get_profile();
-@@ -35,58 +35,42 @@
-     "# This is a generated file!  Do not edit.",
-     "test.example.com:443:^privateBrowsingId=1\tOID.2.16.840.1.101.3.4.2.1\t" +
-       cert1.sha256Fingerprint +
--      "\tM\t" +
--      cert1.dbKey,
-+      "\t",
-     "test.example.com:443:^privateBrowsingId=2\tOID.2.16.840.1.101.3.4.2.1\t" +
-       cert1.sha256Fingerprint +
-+      "\t",
-+    "test.example.com:443:^privateBrowsingId=3\tOID.2.16.840.1.101.3.4.2.1\t" + // includes bits and dbKey (now obsolete)
-+      cert1.sha256Fingerprint +
-       "\tM\t" +
--      cert1.dbKey,
-+      "AAAAAAAAAAAAAAACAAAAFjA5MBQxEjAQBgNVBAMMCWxvY2FsaG9zdA==",
-     "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" +
-       cert2.sha256Fingerprint +
--      "\tU\t" +
--      cert2.dbKey,
-+      "\t",
-     "[::1]:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // IPv6
-       cert2.sha256Fingerprint +
--      "\tM\t" +
--      cert2.dbKey,
-+      "\t",
-     "old.example.com:443\tOID.2.16.840.1.101.3.4.2.1\t" + // missing attributes (defaulted)
-       cert1.sha256Fingerprint +
--      "\tM\t" +
--      cert1.dbKey,
-+      "\t",
-     ":443:\tOID.2.16.840.1.101.3.4.2.1\t" + // missing host name
-       cert3.sha256Fingerprint +
--      "\tU\t" +
--      cert3.dbKey,
-+      "\t",
-     "example.com::\tOID.2.16.840.1.101.3.4.2.1\t" + // missing port
-       cert3.sha256Fingerprint +
--      "\tU\t" +
--      cert3.dbKey,
--    "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // wrong fingerprint/dbkey
-+      "\t",
-+    "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // wrong fingerprint
-       cert2.sha256Fingerprint +
--      "\tU\t" +
--      cert3.dbKey,
-+      "\t",
-     "example.com:443:\tOID.0.00.000.0.000.0.0.0.0\t" + // bad OID
-       cert3.sha256Fingerprint +
--      "\tU\t" +
--      cert3.dbKey,
-+      "\t",
-     "example.com:443:\t.0.0.0.0\t" + // malformed OID
-       cert3.sha256Fingerprint +
--      "\tU\t" +
--      cert3.dbKey,
-+      "\t",
-     "example.com:443:\t\t" + // missing OID
-       cert3.sha256Fingerprint +
--      "\tU\t" +
--      cert3.dbKey,
--    "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // missing fingerprint
--      "\tU\t" +
--      cert3.dbKey,
--    "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // missing override bits
--      cert3.sha256Fingerprint +
--      "\t\t" +
--      cert3.dbKey,
--    "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t" + // missing dbkey
--      cert3.sha256Fingerprint +
--      "\tU\t",
-+      "\t",
-+    "example.com:443:\tOID.2.16.840.1.101.3.4.2.1\t", // missing fingerprint
-   ];
-   writeLinesAndClose(lines, outputStream);
-   let overrideService = Cc["@mozilla.org/security/certoverride;1"].getService(

SOURCES/mozilla-bmo1005535.patch

@@ -1,30 +0,0 @@
-# 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. */

SOURCES/mozilla-bmo1170092.patch

@@ -1,7 +1,7 @@
-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
+diff -up firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp
+--- firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092	2023-07-10 21:08:53.000000000 +0200
++++ firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp	2023-07-17 10:33:23.443355156 +0200
+@@ -263,8 +263,20 @@ nsresult nsReadConfig::openAndEvaluateJS
      if (NS_FAILED(rv)) return rv;
  
      rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
@@ -23,10 +23,10 @@ diff -up firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
    } 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
+diff -up firefox-115.0.2/modules/libpref/Preferences.cpp.1170092 firefox-115.0.2/modules/libpref/Preferences.cpp
+--- firefox-115.0.2/modules/libpref/Preferences.cpp.1170092	2023-07-10 21:09:00.000000000 +0200
++++ firefox-115.0.2/modules/libpref/Preferences.cpp	2023-07-17 10:33:23.444355156 +0200
+@@ -4825,6 +4825,9 @@ nsresult Preferences::InitInitialObjects
    //
    // Thus, in the omni.jar case, we always load app-specific default
    // preferences from omni.jar, whether or not `$app == $gre`.
@@ -36,10 +36,10 @@ diff -up firefox-87.0/modules/libpref/Preferences.cpp.1170092 firefox-87.0/modul
  
    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 @@
+diff -up firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp
+--- firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp.1170092	2023-07-10 22:57:20.000000000 +0200
++++ firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp	2023-07-17 10:56:25.309692121 +0200
+@@ -72,6 +72,7 @@
  #endif
  #ifdef XP_UNIX
  #  include <ctype.h>
@@ -47,13 +47,11 @@ diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/tool
  #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)) {
+@@ -478,6 +479,17 @@ nsXREDirProvider::GetFile(const char* aP
+     rv = file->AppendNative(nsLiteralCString(PREF_OVERRIDE_DIRNAME));
+     NS_ENSURE_SUCCESS(rv, rv);
+     rv = EnsureDirectoryExists(file);
++  } else if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
 +    nsCString sysConfigDir = nsLiteralCString("/etc/");
 +    nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
 +    if (!appInfo)
@@ -62,14 +60,12 @@ diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/tool
 +    appInfo->GetName(appName);
 +    ToLowerCase(appName);
 +    sysConfigDir.Append(appName);
-+    return NS_NewNativeLocalFile(sysConfigDir, false, aFile);
-+  }
-+#endif
-+
-   if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
- 
-   if (ensureFilePermissions) {
-@@ -874,6 +890,16 @@ nsresult nsXREDirProvider::GetFilesInter
++    NS_NewNativeLocalFile(sysConfigDir, false, getter_AddRefs(file));
++    rv = EnsureDirectoryExists(file);
+   } else {
+     // We don't know anything about this property. Fail without warning, because
+     // otherwise we'll get too much warning spam due to
+@@ -694,6 +706,16 @@ nsXREDirProvider::GetFiles(const char* a
      }
  #endif
  
@@ -86,10 +82,10 @@ diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/tool
      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 @@
+diff -up firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h
+--- firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h.1170092	2023-07-10 21:09:13.000000000 +0200
++++ firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h	2023-07-17 10:33:23.444355156 +0200
+@@ -58,6 +58,7 @@
  #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
  #define NS_APP_PREFS_OVERRIDE_DIR \
    "PrefDOverride"  // Directory for per-profile defaults

SOURCES/mozilla-bmo1504834-part1.patch

@@ -1,43 +1,31 @@
-# 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;
+diff -up firefox-128.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 firefox-128.0/gfx/2d/DrawTargetSkia.cpp
+--- firefox-128.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1	2024-06-12 15:02:55.000000000 +0200
++++ firefox-128.0/gfx/2d/DrawTargetSkia.cpp	2024-06-13 11:36:54.550728034 +0200
+@@ -156,8 +156,8 @@ static IntRect CalculateSurfaceBounds(co
  }
  
-   return surfaceBounds.Intersect(bounds);
- }
- 
--static const int kARGBAlphaOffset =
+ static const int kARGBAlphaOffset =
 -    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
-+static const int kARGBAlphaOffset = 0;  // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
- 
+-
++    0;  // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 ==
++        // SurfaceFormat::B8G8R8A8 ? 3 : 0;
  static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
                               const int32_t aStride, SurfaceFormat aFormat) {
    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,
- 
+diff -up firefox-128.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 firefox-128.0/gfx/2d/Types.h
+--- firefox-128.0/gfx/2d/Types.h.mozilla-bmo1504834-part1	2024-06-12 15:02:56.000000000 +0200
++++ firefox-128.0/gfx/2d/Types.h	2024-06-13 11:36:54.551728036 +0200
+@@ -89,18 +89,11 @@ enum class SurfaceFormat : int8_t {
    // This represents the unknown format.
-   UNKNOWN,
+   UNKNOWN,  // TODO: Replace uses with Maybe<SurfaceFormat>.
  
- // The following values are endian-independent synonyms. The _UINT32 suffix
- // indicates that the name reflects the layout when viewed as a uint32_t
- // value.
+-// The following values are endian-independent synonyms. The _UINT32 suffix
+-// indicates that the name reflects the layout when viewed as a uint32_t
+-// value.
 -#if MOZ_LITTLE_ENDIAN()
++  // The following values are endian-independent synonyms. The _UINT32 suffix
++  // indicates that the name reflects the layout when viewed as a uint32_t
++  // value.
    A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
    X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
 -#elif MOZ_BIG_ENDIAN()
@@ -49,20 +37,10 @@ diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
  
    // 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>
+diff -up firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc.mozilla-bmo1504834-part1 firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc
+--- firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc.mozilla-bmo1504834-part1	2024-06-12 15:02:57.000000000 +0200
++++ firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc	2024-06-13 11:38:45.377835856 +0200
+@@ -31,6 +31,8 @@
          #include <avx512fintrin.h>
          #include <avx512dqintrin.h>
      #endif
@@ -70,30 +48,21 @@ diff --git a/gfx/skia/skia/third_party/skcms/skcms.cc b/gfx/skia/skia/third_part
 +    #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,
- };
- 
+ using namespace skcms_private;
+@@ -324,20 +326,28 @@ enum {
  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
+-    return __builtin_bswap16(be);
 +    #if defined(_MSC_VER)
-     return _byteswap_ushort(be);
--#else
++     return _byteswap_ushort(be);
 +    #else
-     return __builtin_bswap16(be);
++     return __builtin_bswap16(be);
 +    #endif
  #endif
  }
@@ -102,20 +71,16 @@ diff --git a/gfx/skia/skia/third_party/skcms/skcms.cc b/gfx/skia/skia/third_part
      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
+-    return __builtin_bswap32(be);
 +    #if defined(_MSC_VER)
-     return _byteswap_ulong(be);
--#else
++     return _byteswap_ulong(be);
 +    #else
-     return __builtin_bswap32(be);
++     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) {

SOURCES/mozilla-bmo1504834-part3.patch

@@ -1,64 +1,17 @@
 # HG changeset patch
-# Parent  d1d66f7e4d0e7fd45e91e4fcee07555e72046d48
+# Parent  09cd4ac2cc607e85aa572425b824fbab386af607
 For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
 right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
 
-diff --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)
+@@ -210,6 +210,8 @@ namespace SK_OPTS_NS {
              //   ~~~>
              // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
              // c = 0*aa + d(1-1*aa) =      d(1-aa)
-+
-+            // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
-+#ifdef SK_CPU_BENDIAN
-+            return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
-+#else
-             return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
-+#endif
++            // TODO: Check this for endian-issues!
++            //       Do we need to switch 255 to the front for all of those tuples?
+             return (aa & Sk4px(skvx::byte16{0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255}))
                   + d.approxMulDiv255(aa.inv());
          };
-         while (h --> 0) {
-             Sk4px::MapDstAlpha(w, dst, mask, fn);
-             dst  +=  dstRB / sizeof(*dst);
-             mask += maskRB / sizeof(*mask);
-         }
-     }

SOURCES/mozilla-bmo1636168-fscreen.patch

@@ -0,0 +1,62 @@
+diff -up firefox-128.0/widget/gtk/nsWindow.cpp.mozilla-bmo1636168-fscreen firefox-128.0/widget/gtk/nsWindow.cpp
+--- firefox-128.0/widget/gtk/nsWindow.cpp.mozilla-bmo1636168-fscreen	2024-07-04 18:20:43.000000000 +0200
++++ firefox-128.0/widget/gtk/nsWindow.cpp	2024-07-16 14:54:21.026716936 +0200
+@@ -174,7 +174,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
+                      GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
+                      GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                      GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
+-                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
++                     GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
++                     GDK_FOCUS_CHANGE_MASK;
+ 
+ /* utility functions */
+ static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX,
+@@ -430,7 +431,8 @@ nsWindow::nsWindow()
+       mResizedAfterMoveToRect(false),
+       mConfiguredClearColor(false),
+       mGotNonBlankPaint(false),
+-      mNeedsToRetryCapturingMouse(false) {
++      mNeedsToRetryCapturingMouse(false),
++      mPendingFullscreen(false) {
+   mWindowType = WindowType::Child;
+   mSizeConstraints.mMaxSize = GetSafeWindowSize(mSizeConstraints.mMaxSize);
+ 
+@@ -5374,6 +5376,19 @@ void nsWindow::OnWindowStateEvent(GtkWid
+       ClearTransparencyBitmap();
+     }
+   }
++
++  // Hack to ensure window switched to fullscreen - avoid to fail when starting
++  // in kiosk mode
++  if (mPendingFullscreen &&
++      !(aEvent->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
++    LOG(
++        "  Window should be fullscreen, but it's not, retrying set to "
++         "fullscreen.\n");
++    MakeFullScreen(true);
++  } else {
++    LOG("  Window successfully switched to fullscreen, happy now\n");
++    mPendingFullscreen = false;
++  }
+ }
+ 
+ void nsWindow::OnDPIChanged() {
+@@ -7526,6 +7541,7 @@ nsresult nsWindow::MakeFullScreen(bool a
+ 
+     if (mKioskMonitor.isSome()) {
+       KioskLockOnMonitor();
++      mPendingFullscreen = true;
+     } else {
+       gtk_window_fullscreen(GTK_WINDOW(mShell));
+     }
+diff -up firefox-128.0/widget/gtk/nsWindow.h.mozilla-bmo1636168-fscreen firefox-128.0/widget/gtk/nsWindow.h
+--- firefox-128.0/widget/gtk/nsWindow.h.mozilla-bmo1636168-fscreen	2024-07-04 18:20:43.000000000 +0200
++++ firefox-128.0/widget/gtk/nsWindow.h	2024-07-16 14:25:51.636952919 +0200
+@@ -758,6 +758,7 @@ class nsWindow final : public nsBaseWidg
+    * move-to-rect callback we set mMovedAfterMoveToRect/mResizedAfterMoveToRect.
+    */
+   bool mWaitingForMoveToRectCallback : 1;
++  bool mPendingFullscreen : 1;
+   bool mMovedAfterMoveToRect : 1;
+   bool mResizedAfterMoveToRect : 1;
+ 

SOURCES/mozilla-bmo1670333.patch

@@ -0,0 +1,66 @@
+diff -up firefox-128.0/dom/media/mp4/MP4Demuxer.cpp.mozilla-bmo1670333 firefox-128.0/dom/media/mp4/MP4Demuxer.cpp
+--- firefox-128.0/dom/media/mp4/MP4Demuxer.cpp.mozilla-bmo1670333	2024-07-04 18:20:27.000000000 +0200
++++ firefox-128.0/dom/media/mp4/MP4Demuxer.cpp	2024-07-16 13:49:10.475630426 +0200
+@@ -33,6 +33,8 @@ mozilla::LogModule* GetDemuxerLog() { re
+   DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
+             __func__, ##__VA_ARGS__)
+ 
++extern bool gUseKeyframeFromContainer;
++
+ namespace mozilla {
+ 
+ using TimeUnit = media::TimeUnit;
+@@ -419,6 +421,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-128.0/dom/media/platforms/PDMFactory.cpp.mozilla-bmo1670333 firefox-128.0/dom/media/platforms/PDMFactory.cpp
+--- firefox-128.0/dom/media/platforms/PDMFactory.cpp.mozilla-bmo1670333	2024-07-04 18:20:26.000000000 +0200
++++ firefox-128.0/dom/media/platforms/PDMFactory.cpp	2024-07-16 14:16:04.635809901 +0200
+@@ -62,6 +62,8 @@
+ 
+ #include <functional>
+ 
++bool gUseKeyframeFromContainer = false;
++
+ using DecodeSupport = mozilla::media::DecodeSupport;
+ using DecodeSupportSet = mozilla::media::DecodeSupportSet;
+ using MediaCodec = mozilla::media::MediaCodec;
+@@ -543,7 +545,7 @@ void PDMFactory::CreateRddPDMs() {
+ #ifdef MOZ_FFMPEG
+   if (StaticPrefs::media_ffmpeg_enabled() &&
+       StaticPrefs::media_rdd_ffmpeg_enabled() &&
+-      !StartupPDM(FFmpegRuntimeLinker::CreateDecoder())) {
++      !(mFFmpegUsed = StartupPDM(FFmpegRuntimeLinker::CreateDecoder()))) {
+     mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
+         FFmpegRuntimeLinker::LinkStatusCode());
+   }
+@@ -719,7 +721,7 @@ void PDMFactory::CreateDefaultPDMs() {
+   StartupPDM(AgnosticDecoderModule::Create(),
+              StaticPrefs::media_prefer_non_ffvpx());
+ 
+-  if (StaticPrefs::media_gmp_decoder_enabled() &&
++  if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
+       !StartupPDM(GMPDecoderModule::Create(),
+                   StaticPrefs::media_gmp_decoder_preferred())) {
+     mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
+diff -up firefox-128.0/dom/media/platforms/PDMFactory.h.mozilla-bmo1670333 firefox-128.0/dom/media/platforms/PDMFactory.h
+--- firefox-128.0/dom/media/platforms/PDMFactory.h.mozilla-bmo1670333	2024-07-04 18:20:26.000000000 +0200
++++ firefox-128.0/dom/media/platforms/PDMFactory.h	2024-07-16 13:49:10.476630421 +0200
+@@ -98,6 +98,7 @@ class PDMFactory final {
+   RefPtr<PlatformDecoderModule> mNullPDM;
+ 
+   DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
++  bool mFFmpegUsed = false;
+ 
+   friend class RemoteVideoDecoderParent;
+   static void EnsureInit();

SOURCES/mozilla-bmo1789216-disable-av1.patch

@@ -0,0 +1,73 @@
+diff -up firefox-128.0/media/ffvpx/libavcodec/allcodecs.c.mozilla-bmo1789216-disable-av1 firefox-128.0/media/ffvpx/libavcodec/allcodecs.c
+--- firefox-128.0/media/ffvpx/libavcodec/allcodecs.c.mozilla-bmo1789216-disable-av1	2024-06-12 15:03:01.000000000 +0200
++++ firefox-128.0/media/ffvpx/libavcodec/allcodecs.c	2024-06-13 11:44:10.637215674 +0200
+@@ -764,8 +764,11 @@ extern const FFCodec ff_libaribb24_decod
+ extern const FFCodec ff_libcelt_decoder;
+ extern const FFCodec ff_libcodec2_encoder;
+ extern const FFCodec ff_libcodec2_decoder;
++#if CONFIG_MOZ_AV1
+ extern const FFCodec ff_libdav1d_decoder;
+ extern const FFCodec ff_libdavs2_decoder;
++extern const FFCodec ff_libuavs3d_decoder;
++#endif
+ extern const FFCodec ff_libfdk_aac_encoder;
+ extern const FFCodec ff_libfdk_aac_decoder;
+ extern const FFCodec ff_libgsm_encoder;
+@@ -793,7 +796,6 @@ extern const FFCodec ff_libspeex_decoder
+ extern const FFCodec ff_libsvtav1_encoder;
+ extern const FFCodec ff_libtheora_encoder;
+ extern const FFCodec ff_libtwolame_encoder;
+-extern const FFCodec ff_libuavs3d_decoder;
+ extern const FFCodec ff_libvo_amrwbenc_encoder;
+ extern const FFCodec ff_libvorbis_encoder;
+ extern const FFCodec ff_libvorbis_decoder;
+diff -up firefox-128.0/media/ffvpx/libavcodec/codec_list.c.mozilla-bmo1789216-disable-av1 firefox-128.0/media/ffvpx/libavcodec/codec_list.c
+--- firefox-128.0/media/ffvpx/libavcodec/codec_list.c.mozilla-bmo1789216-disable-av1	2024-06-13 11:40:12.668924117 +0200
++++ firefox-128.0/media/ffvpx/libavcodec/codec_list.c	2024-06-13 11:44:41.411253372 +0200
+@@ -11,12 +11,14 @@ static const FFCodec * const codec_list[
+ #if CONFIG_MP3_DECODER
+     &ff_mp3_decoder,
+ #endif
++#if CONFIG_MOZ_AV1
+ #if CONFIG_LIBDAV1D
+     &ff_libdav1d_decoder,
+ #endif
+ #if CONFIG_AV1_DECODER
+     &ff_av1_decoder,
+ #endif
++#endif    
+ #if CONFIG_LIBVORBIS_DECODER
+     &ff_libvorbis_decoder,
+ #endif
+diff -up firefox-128.0/media/ffvpx/libavcodec/moz.build.mozilla-bmo1789216-disable-av1 firefox-128.0/media/ffvpx/libavcodec/moz.build
+--- firefox-128.0/media/ffvpx/libavcodec/moz.build.mozilla-bmo1789216-disable-av1	2024-06-13 11:40:12.669924118 +0200
++++ firefox-128.0/media/ffvpx/libavcodec/moz.build	2024-06-13 11:45:22.867304151 +0200
+@@ -94,7 +94,6 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
+         'imgconvert.c',
+         'libaom.c',
+         'libaomenc.c',
+-        'libdav1d.c',
+         'libvpxdec.c',
+         'libvpxenc.c',
+         'mathtables.c',
+@@ -119,10 +118,16 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
+         'vp9recon.c',
+         'vpx_rac.c',
+     ]
+-    USE_LIBS += [
+-        'dav1d',
+-        'media_libdav1d_asm',
+-    ]
++    if CONFIG['MOZ_AV1']:
++        USE_LIBS += [
++            'dav1d',
++            'media_libdav1d_asm',
++        ]
++        SOURCES += [
++            'libdav1d.c',
++        ]
++
++
+     if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+         LOCAL_INCLUDES += ['/media/mozva']
+         SOURCES += [

SOURCES/mozilla-bmo849632.patch

@@ -6,15 +6,11 @@ Solution: Problem is with skia once again. Output of webgl seems endian-correct,
           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) {
+Index: firefox-115.0/gfx/gl/GLContext.h
+===================================================================
+--- firefox-115.0.orig/gfx/gl/GLContext.h
++++ firefox-115.0/gfx/gl/GLContext.h
+@@ -1560,6 +1560,13 @@ class GLContext : public GenericAtomicRe
      BEFORE_GL_CALL;
      mSymbols.fReadPixels(x, y, width, height, format, type, pixels);
      OnSyncCall();
@@ -28,8 +24,3 @@ diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
      AFTER_GL_CALL;
      mHeavyGLCallsSinceLastFlush = true;
    }
- 
-   void fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
-                    GLenum format, GLenum type, GLvoid* pixels);
- 
-  public:

SOURCES/mozilla-build-arm.patch

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

SOURCES/mozilla-s390x-skia-gradient.patch

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

SOURCES/nss-setup-flags-env.inc

@@ -4,4 +4,4 @@ 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"
+export PATH="%{_buildrootdir}%{bundled_install_path}/bin:$PATH"

SOURCES/pgo.patch

@@ -1,115 +0,0 @@
-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

SOURCES/print-error-reftest

@@ -1,13 +0,0 @@
-#!/usr/bin/bash
-# Print reftest failures and compose them to html
-
-TEST_DIR="$1"
-TEST_FLAVOUR="$2"
-OUTPUT_FILE="failures-reftest$TEST_FLAVOUR.html"
-
-grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" -e "IMAGE 1 (TEST):" -e "IMAGE 2 (REFERENCE):" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > $OUTPUT_FILE
-sed -i '/REFTEST   IMAGE 1/a ">' $OUTPUT_FILE
-sed -i '/REFTEST   IMAGE 2/a "><BR><BR>' $OUTPUT_FILE
-sed -i '/REFTEST TEST/a <BR>' $OUTPUT_FILE
-sed -i -e 's/^REFTEST   IMAGE 1 (TEST): /<img border=2 src="/' $OUTPUT_FILE
-sed -i -e 's/^REFTEST   IMAGE 2 (REFERENCE): /<img border=2 src="/' $OUTPUT_FILE

SOURCES/print-errors

@@ -1,9 +0,0 @@
-#!/usr/bin/bash
-# Print failed tests
-
-TEST_DIR=$1
-TEST_FLAVOUR=$2
-
-grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR 2>&1 > failures-mochitest$TEST_FLAVOUR.txt
-grep --text -e "  FAIL " -e "  TIMEOUT " $TEST_DIR/xpcshell$TEST_FLAVOUR 2>&1 > failures-xpcshell$TEST_FLAVOUR.txt
-grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > failures-reftest$TEST_FLAVOUR.txt

SOURCES/print_failures

@@ -1,9 +0,0 @@
-#!/usr/bin/bash
-# Analyze and print test failures
-
-export TEST_DIR="test_results"
-
-#./print-errors $TEST_DIR ""
-./print-errors $TEST_DIR "-wr"
-#./print-error-reftest $TEST_DIR ""
-./print-error-reftest $TEST_DIR "-wr"

SOURCES/print_results

@@ -1,10 +0,0 @@
-#!/usr/bin/bash
-# Analyze and print general test results
-
-export TEST_DIR="test_results"
-
-echo "Test results"
-#echo "Basic compositor"
-#./psummary $TEST_DIR ""
-echo "WebRender"
-./psummary $TEST_DIR "-wr"

SOURCES/process-official-tarball

@@ -12,6 +12,11 @@ rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cur
 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
+# A forbidden code point was found in:
+rm -vf ./process-tarball-dir/*/mobile/android/android-components/components/browser/errorpages/src/main/res/values-ar/strings.xml
+rm -vf ./process-tarball-dir/*/mobile/android/android-components/components/feature/addons/src/main/res/values-ur/strings.xml
+rm -vf ./process-tarball-dir/*/third_party/webkit/PerformanceTests/Speedometer3/resources/editors/dist/assets/codemirror-521de7ab.js
+rm -vf ./process-tarball-dir/*/third_party/python/pip/pip-24.0.dist-info/AUTHORS.txt
 
 processed_tarball=${1/source/processed-source}
 

SOURCES/psummary

@@ -1,23 +0,0 @@
-#!/usr/bin/bash
-# Analyze and print specialized (basic/webrender) test results
-
-TEST_DIR=$1
-TEST_FLAVOUR=$2
-
-MPASS=`grep "TEST_END: Test OK" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
-MERR=`grep "TEST_END: Test ERROR" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
-MUNEX=`grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR | wc  -l`
-echo "Mochitest   PASSED: $MPASS FAILED: $MERR UNEXPECTED-FAILURES: $MUNEX"
-
-XPCPASS=`grep --text "Expected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
-XPCFAIL=`grep --text "Unexpected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
-echo "XPCShell:   PASSED: $XPCPASS FAILED: $XPCFAIL"
-
-CRPASS=`grep "REFTEST INFO | Successful:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
-CRFAIL=`grep "^REFTEST INFO | Unexpected:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
-echo "Crashtest:  PASSED: $CRPASS FAILED: $CRFAIL"
-
-RFPASS=`grep --text "REFTEST INFO | Successful:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
-RFUN=`grep --text "^REFTEST INFO | Unexpected:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
-RFKNOWN=`grep --text "REFTEST INFO | Known problems:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 6`
-echo "Reftest:    PASSED: $RFPASS FAILED: $RFUN Known issues: $RFKNOWN"

SOURCES/rhbz-1219542-s390-build.patch

@@ -1,23 +0,0 @@
-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

SOURCES/run-tests-wayland

@@ -1,80 +0,0 @@
-#!/usr/bin/bash
-# usage: run-tests-wayland [test flavour]
-
-set -x
-
-RUN_XPCSHELL_TEST=1
-RUN_REFTEST=1
-RUN_MOCHITEST=1
-RUN_CRASHTEST=1
-
-while (( "$#" )); do
-  SELECTED_TEST=$1
-  if [ "$SELECTED_TEST" = "xpcshell" ] ; then
-    RUN_XPCSHELL_TEST=1
-  elif [ "$SELECTED_TEST" = "reftest" ] ; then
-    RUN_REFTEST=1
-  elif [ "$SELECTED_TEST" = "mochitest" ] ; then
-    RUN_MOCHITEST=1
-  elif [ "$SELECTED_TEST" = "crashtest" ] ; then
-    RUN_CRASHTEST=1
-  fi
-  shift
-done
-
-export MACH_USE_SYSTEM_PYTHON=1
-export MOZ_NODE_PATH=/usr/bin/node
-
-MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
-TEST_DIR="test_results"
-mkdir $TEST_DIR
-
-env | grep "DISPLAY"
-
-# Fix for system nss
-ln -s /usr/bin/certutil objdir/dist/bin/certutil
-ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
-
-NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-
-export MOZ_ENABLE_WAYLAND=1
-
-if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then
-#  ./mach xpcshell-test 2>&1 | cat - | tee $TEST_DIR/xpcshell
-  ./mach xpcshell-test --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
-  sleep 60
-fi
-
-# Basic render testing
-export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.wayland.test-workarounds.enabled=true"
-#export TEST_FLAVOUR=""
-#if [ $RUN_REFTEST -ne 0 ] ; then
-#  ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-#fi
-#if [ $RUN_CRASHTEST -ne 0 ] ; then
-#  ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-#fi
-#if [ $RUN_MOCHITEST -ne 0 ] ; then
-#  ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
-#fi
-
-# WebRender testing
-export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
-export TEST_FLAVOUR="-wr"
-# Use dom/base/test or dom/base/test/chrome for short version
-export MOCHITEST_DIR='dom'
-if [ $RUN_REFTEST -ne 0 ] ; then
-  ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-  sleep 60
-fi
-if [ $RUN_CRASHTEST -ne 0 ] ; then
-  ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-  sleep 60
-fi
-if [ $RUN_MOCHITEST -ne 0 ] ; then
-  ./mach mochitest $MOCHITEST_DIR $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
-  sleep 60
-fi
-
-rm -f  objdir/dist/bin/certutil
-rm -f  objdir/dist/bin/pk12util

SOURCES/run-tests-x11

@@ -1,39 +0,0 @@
-#!/usr/bin/bash
-set -x
-
-export MACH_USE_SYSTEM_PYTHON=1
-export MOZ_NODE_PATH=/usr/bin/node
-export X_PARAMS="-screen 0 1600x1200x24"
-export MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
-export TEST_DIR="test_results"
-
-# Fix for system nss
-ln -s /usr/bin/certutil objdir/dist/bin/certutil
-ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
-
-NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
-
-# Basic render testing
-export TEST_PARAMS=""
-export TEST_FLAVOUR=""
-#xvfb-run -s "$X_PARAMS" -n 91 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
-#xvfb-run -s "$X_PARAMS" -n 92 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-#xvfb-run -s "$X_PARAMS" -n 93 ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-#xvfb-run -s "$X_PARAMS" -n 94 ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
-
-# WebRender testing
-export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
-export TEST_FLAVOUR="-wr"
-#xvfb-run -s "$X_PARAMS" -n 95 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
-#sleep 60
-#xvfb-run -s "$X_PARAMS" -n 96 ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-#sleep 60
-#xvfb-run -s "$X_PARAMS" -n 97 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-#sleep 60
-#export DISPLAY=:0
-#./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
-export DISPLAY=:98
-xvfb-run -s "$X_PARAMS" -n 98 ./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
-
-rm -f  objdir/dist/bin/certutil
-rm -f  objdir/dist/bin/pk12util

SOURCES/run-wayland-compositor

@@ -1,50 +0,0 @@
-#!/usr/bin/bash
-# Run wayland compositor and set WAYLAND_DISPLAY env variable
-
-set -x
-
-echo export DESKTOP_SESSION=gnome > $HOME/.xsessionrc
-echo export XDG_CURRENT_DESKTOP=GNOME > $HOME/.xsessionrc
-echo export XDG_SESSION_TYPE=wayland >> $HOME/.xsessionrc
-
-# Turn off the screen saver and screen locking
-gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-gsettings set org.gnome.desktop.screensaver lock-delay 3600
-
-# Disable the screen saver
-# This starts the gnome-keyring-daemon with an unlocked login keyring. libsecret uses this to
-# store secrets. Firefox uses libsecret to store a key that protects sensitive information like
-# credit card numbers.
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-    # if not found, launch a new one
-    eval `dbus-launch --sh-syntax`
-fi
-eval `echo '' | /usr/bin/gnome-keyring-daemon -r -d --unlock --components=secrets`
-
-if [ -z "$XDG_RUNTIME_DIR" ]; then
-  export XDG_RUNTIME_DIR=$HOME
-fi
-
-. xvfb-run -s "-screen 0 1600x1200x24" -n 80 mutter --display=:80 --wayland --nested &
-export DISPLAY=:80
-
-if [ -z "$WAYLAND_DISPLAY" ] ; then
-  export WAYLAND_DISPLAY=wayland-0
-else
-  export WAYLAND_DISPLAY=wayland-1
-fi
-sleep 10
-retry_count=0
-max_retries=5
-until [ $retry_count -gt $max_retries ]; do
-  if [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
-    retry_count=$(($max_retries + 1))
-  else
-    retry_count=$(($retry_count + 1))
-    echo "Waiting for Mutter, retry: $retry_count"
-    sleep 2
-  fi
-done
-
-env | grep "DISPLAY"

SOURCES/rust-bindgen-2319-2339.patch

@@ -1,154 +0,0 @@
---- firefox-102.11.1/third_party/rust/bindgen/.cargo-checksum.json.rust-bindgen-2319-2339	2023-05-24 00:50:52.000000000 +0200
-+++ firefox-102.11.1/third_party/rust/bindgen/.cargo-checksum.json	2023-06-07 01:11:35.838302019 +0200
-@@ -1 +1 @@
--{"files":{"Cargo.lock":"836e8f8431bd4ebdac9b1251676f6afa755757e401455259fe659e7280be8230","Cargo.toml":"3a585a6e27a177f08dedcb21f7d555e9db58fa158203273b228db91ebee4e6b3","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"29fe30d7a2729922b13a578bc8f5eedc808fd0f2ef67a3f12017548baf8f293a","build.rs":"3fe1e534c99df4ee207606794f133fb187c0948e055389f74c904994ecaed38a","csmith-fuzzing/README.md":"7107b70fedb0c0a0cadb3c439a49c1bd0119a6d38dc63b1aecc74d1942256ef2","src/callbacks.rs":"1e5a118b94977938751758ac0495b1d41ce5e280c066614a4a7cbd930f326350","src/clang.rs":"aa0644278a8319506be08904c0f6706fbcdcd72eb1e85564b8c7488bd810e126","src/codegen/bitfield_unit.rs":"a8fb1a2d97a99685106fcaac87d2013f79d2690d6a46ff05ad1e3629b6075664","src/codegen/bitfield_unit_tests.rs":"dd252134118450800b516e375c872e17b4c1aee63a7b8adbe5b2cd53434bbc7e","src/codegen/dyngen.rs":"15149bc927e5b2706f93e52a6b26ef55384b3baf40bfc9bc4343e9820479f26b","src/codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","src/codegen/helpers.rs":"ea83104addb8af31736aaeb850e10c694cd434befe7ffaaa206208f722d72c58","src/codegen/impl_debug.rs":"1ff9ec754b610c98c757b114c6509473ead0e1a9375e9089a7fa40a41a753709","src/codegen/impl_partialeq.rs":"5e526fd88dd15dd1f04addd3c6ecea1d3da92293fadf04346d6c716791f436f9","src/codegen/mod.rs":"19fd11feefab0ff9ecaf8a01583583008269adce805508fb61b9a8acc49da586","src/codegen/struct_layout.rs":"b62c3569dcfb011daa4d09f1aa9eb732da69546c3deb9f247fa8ce7114dbc7b9","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"fafb85510b1dfc9a41ed71f7d765fca49b236deb4ee567e00204e751362aaf23","src/ir/analysis/derive.rs":"ff4821d810961696008a57ae496f95ebcdc14b4c439fe87d78a84817442fa759","src/ir/analysis/has_destructor.rs":"d9a3a24bd4cabc87cddb0c76d27da1691f8f37ffb8eadf5b5975a1c44dea99c2","src/ir/analysis/has_float.rs":"5242cc07ec4d4bdf5a792e1f8ee5758a87838314917d42dbb9dcfc19620520ce","src/ir/analysis/has_type_param_in_array.rs":"ec3fb67f782abb4c866da91bce3f7ee6f8e2310c47a54065282431b909233f7d","src/ir/analysis/has_vtable.rs":"63e2d0f62171811893615c11453bc7b39438d0d83c3eb444dec2346140d86efe","src/ir/analysis/mod.rs":"2c54f0cd6f3d86cf3fcb07d9d0be06cde839cab4170671c80d806a3f27820faf","src/ir/analysis/sizedness.rs":"17f1f2b6affd025f73853b9b5a76b3f157b5f9e563e9eaa374735fcb84c13308","src/ir/analysis/template_params.rs":"da949976a7fd04d6fc564ea6a77dfdbf4f5bf05db64687ed7a0616cba598a42d","src/ir/annotations.rs":"1c931d7bbba1e1613e9cccaab58d14f75e79b831b5c881e41f5b5257a9cbced7","src/ir/comment.rs":"31d64a49ae3d9c3c348fa2539e03306ca3a23fae429cab452e42b31ecf632145","src/ir/comp.rs":"abaa90e27dc6416f1b8db003f87888e7651d5b46c4d4526153980e5621612e54","src/ir/context.rs":"3a76458a5aa74075a60a5cd752ed59ad3943054f55b017700389f78072935215","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"e25ff72ac174a798894c9673d81bdfb86fa9f4228b34a14ce0dc741a186a52bd","src/ir/enum_ty.rs":"e49e3c6ffc0289584e2f836fe56a4b7ebf6ca3f8b602248141d67b9f533770cc","src/ir/function.rs":"aa454ace56bda8074b2865933282aa124624310c8bc0c994d454f5799f4e88be","src/ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","src/ir/item.rs":"a71bdacc7419ec86d52ac534158cf4bfa4600e9cbc214c0075766700f5b053b0","src/ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","src/ir/layout.rs":"755e3787c262de434a53a8c326f0e825f95415ed6b0f925c1cddf208ca8e3bc4","src/ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","src/ir/module.rs":"70cf6ddfeabe6cdc13fdc767c783216c073404848d827e85fc6c2de3a19b5c3f","src/ir/objc.rs":"195fb2a3e4371b90244f3a8f295fd80cc77e0f2daf8fd27e3d8e5b78bd6b55d6","src/ir/template.rs":"44bd7214cf1e7f70e60694115082aac5b8a6c1687fff584cd08cdcfadabc5734","src/ir/traversal.rs":"5ac088277f4dfe2918d81b9294aaee41fd83db8e46def66a05f89de078bf4c49","src/ir/ty.rs":"8f2b970da76850685c4d334289af6dede7742862d7a81f2236115afaa1a92fa9","src/ir/var.rs":"86e9f19403fb9231ba60dec0a04e5b56fe28a37c7a5e6f676c978789c9d93c5a","src/lib.rs":"ed2d0aeb48b28b4a96b8e76a10e00b10cb6cc32c0a686d536f9021463b7ee0e8","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"74e582c37b146090332b1496f5b4bca02c7629d03a4ae40302cb4a723f08e445","src/options.rs":"119358b741601dafc13560856f6e4b4f78b6cd2b19067893c2672ba8f5dc6de1","src/parse.rs":"4ffc54415eadb622ee488603862788c78361ef2c889de25259441a340c2a010f","src/regex_set.rs":"6c46357fb1ee68250e5e017cbf691f340041489ae78599eee7a5665a6ddce27f","src/time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"}
-\ No newline at end of file
-+{"files":{"Cargo.lock":"836e8f8431bd4ebdac9b1251676f6afa755757e401455259fe659e7280be8230","Cargo.toml":"3a585a6e27a177f08dedcb21f7d555e9db58fa158203273b228db91ebee4e6b3","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"29fe30d7a2729922b13a578bc8f5eedc808fd0f2ef67a3f12017548baf8f293a","build.rs":"3fe1e534c99df4ee207606794f133fb187c0948e055389f74c904994ecaed38a","csmith-fuzzing/README.md":"7107b70fedb0c0a0cadb3c439a49c1bd0119a6d38dc63b1aecc74d1942256ef2","src/callbacks.rs":"1e5a118b94977938751758ac0495b1d41ce5e280c066614a4a7cbd930f326350","src/clang.rs":"30fdc473ff70dcbc394927d6fb674d70a62c1a3847e855becd988dc476997815","src/codegen/bitfield_unit.rs":"a8fb1a2d97a99685106fcaac87d2013f79d2690d6a46ff05ad1e3629b6075664","src/codegen/bitfield_unit_tests.rs":"dd252134118450800b516e375c872e17b4c1aee63a7b8adbe5b2cd53434bbc7e","src/codegen/dyngen.rs":"15149bc927e5b2706f93e52a6b26ef55384b3baf40bfc9bc4343e9820479f26b","src/codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","src/codegen/helpers.rs":"ea83104addb8af31736aaeb850e10c694cd434befe7ffaaa206208f722d72c58","src/codegen/impl_debug.rs":"1ff9ec754b610c98c757b114c6509473ead0e1a9375e9089a7fa40a41a753709","src/codegen/impl_partialeq.rs":"5e526fd88dd15dd1f04addd3c6ecea1d3da92293fadf04346d6c716791f436f9","src/codegen/mod.rs":"19fd11feefab0ff9ecaf8a01583583008269adce805508fb61b9a8acc49da586","src/codegen/struct_layout.rs":"b62c3569dcfb011daa4d09f1aa9eb732da69546c3deb9f247fa8ce7114dbc7b9","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"fafb85510b1dfc9a41ed71f7d765fca49b236deb4ee567e00204e751362aaf23","src/ir/analysis/derive.rs":"ff4821d810961696008a57ae496f95ebcdc14b4c439fe87d78a84817442fa759","src/ir/analysis/has_destructor.rs":"d9a3a24bd4cabc87cddb0c76d27da1691f8f37ffb8eadf5b5975a1c44dea99c2","src/ir/analysis/has_float.rs":"5242cc07ec4d4bdf5a792e1f8ee5758a87838314917d42dbb9dcfc19620520ce","src/ir/analysis/has_type_param_in_array.rs":"ec3fb67f782abb4c866da91bce3f7ee6f8e2310c47a54065282431b909233f7d","src/ir/analysis/has_vtable.rs":"63e2d0f62171811893615c11453bc7b39438d0d83c3eb444dec2346140d86efe","src/ir/analysis/mod.rs":"2c54f0cd6f3d86cf3fcb07d9d0be06cde839cab4170671c80d806a3f27820faf","src/ir/analysis/sizedness.rs":"17f1f2b6affd025f73853b9b5a76b3f157b5f9e563e9eaa374735fcb84c13308","src/ir/analysis/template_params.rs":"da949976a7fd04d6fc564ea6a77dfdbf4f5bf05db64687ed7a0616cba598a42d","src/ir/annotations.rs":"1c931d7bbba1e1613e9cccaab58d14f75e79b831b5c881e41f5b5257a9cbced7","src/ir/comment.rs":"31d64a49ae3d9c3c348fa2539e03306ca3a23fae429cab452e42b31ecf632145","src/ir/comp.rs":"232300be66abbbc3d7ef948c24f000dd8a50d78e72aa0e4b2cc43ffd4f800226","src/ir/context.rs":"3a76458a5aa74075a60a5cd752ed59ad3943054f55b017700389f78072935215","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"e25ff72ac174a798894c9673d81bdfb86fa9f4228b34a14ce0dc741a186a52bd","src/ir/enum_ty.rs":"e49e3c6ffc0289584e2f836fe56a4b7ebf6ca3f8b602248141d67b9f533770cc","src/ir/function.rs":"aa454ace56bda8074b2865933282aa124624310c8bc0c994d454f5799f4e88be","src/ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","src/ir/item.rs":"a71bdacc7419ec86d52ac534158cf4bfa4600e9cbc214c0075766700f5b053b0","src/ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","src/ir/layout.rs":"755e3787c262de434a53a8c326f0e825f95415ed6b0f925c1cddf208ca8e3bc4","src/ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","src/ir/module.rs":"70cf6ddfeabe6cdc13fdc767c783216c073404848d827e85fc6c2de3a19b5c3f","src/ir/objc.rs":"195fb2a3e4371b90244f3a8f295fd80cc77e0f2daf8fd27e3d8e5b78bd6b55d6","src/ir/template.rs":"44bd7214cf1e7f70e60694115082aac5b8a6c1687fff584cd08cdcfadabc5734","src/ir/traversal.rs":"5ac088277f4dfe2918d81b9294aaee41fd83db8e46def66a05f89de078bf4c49","src/ir/ty.rs":"8d7e7883316245c54e5dfa2fd150df1be2dc559c7df0828da736dd6b18d2165b","src/ir/var.rs":"1e7be8eedba72effa995b48c581504e61e407867d8794a8528975688742b0420","src/lib.rs":"ed2d0aeb48b28b4a96b8e76a10e00b10cb6cc32c0a686d536f9021463b7ee0e8","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"74e582c37b146090332b1496f5b4bca02c7629d03a4ae40302cb4a723f08e445","src/options.rs":"119358b741601dafc13560856f6e4b4f78b6cd2b19067893c2672ba8f5dc6de1","src/parse.rs":"4ffc54415eadb622ee488603862788c78361ef2c889de25259441a340c2a010f","src/regex_set.rs":"6c46357fb1ee68250e5e017cbf691f340041489ae78599eee7a5665a6ddce27f","src/time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"}
-\ No newline at end of file
---- firefox-102.11.1/third_party/rust/bindgen/src/clang.rs.rust-bindgen-2319-2339	2023-05-24 00:50:51.000000000 +0200
-+++ firefox-102.11.1/third_party/rust/bindgen/src/clang.rs	2023-06-07 00:59:18.845709213 +0200
-@@ -54,6 +54,11 @@ impl Cursor {
-         unsafe { clang_isDeclaration(self.kind()) != 0 }
-     }
- 
-+    /// Is this cursor's referent an anonymous record or so?
-+    pub fn is_anonymous(&self) -> bool {
-+        unsafe { clang_Cursor_isAnonymous(self.x) != 0 }
-+    }
-+
-     /// Get this cursor's referent's spelling.
-     pub fn spelling(&self) -> String {
-         unsafe { cxstring_into_string(clang_getCursorSpelling(self.x)) }
---- firefox-102.11.1/third_party/rust/bindgen/src/ir/comp.rs.rust-bindgen-2319-2339	2023-05-24 00:50:52.000000000 +0200
-+++ firefox-102.11.1/third_party/rust/bindgen/src/ir/comp.rs	2023-06-07 00:59:18.846709211 +0200
-@@ -1372,8 +1372,7 @@ impl CompInfo {
- 
-                     // A declaration of an union or a struct without name could
-                     // also be an unnamed field, unfortunately.
--                    if cur.spelling().is_empty() &&
--                        cur.kind() != CXCursor_EnumDecl
-+                    if cur.is_anonymous() && cur.kind() != CXCursor_EnumDecl
-                     {
-                         let ty = cur.cur_type();
-                         let offset = cur.offset_of_field().ok();
---- firefox-102.11.1/third_party/rust/bindgen/src/ir/ty.rs.rust-bindgen-2319-2339	2023-05-24 00:50:52.000000000 +0200
-+++ firefox-102.11.1/third_party/rust/bindgen/src/ir/ty.rs	2023-06-07 00:59:18.847709209 +0200
-@@ -737,7 +737,12 @@ impl Type {
- 
-         let layout = ty.fallible_layout(ctx).ok();
-         let cursor = ty.declaration();
--        let mut name = cursor.spelling();
-+        let is_anonymous = cursor.is_anonymous();
-+        let mut name = if is_anonymous {
-+            None
-+        } else {
-+            Some(cursor.spelling()).filter(|n| !n.is_empty())
-+        };
- 
-         debug!(
-             "from_clang_ty: {:?}, ty: {:?}, loc: {:?}",
-@@ -771,7 +776,7 @@ impl Type {
-             if is_canonical_objcpointer && is_template_type_param {
-                 // Objective-C generics are just ids with fancy name.
-                 // To keep it simple, just name them ids
--                name = "id".to_owned();
-+                name = Some("id".to_owned());
-             }
-         }
- 
-@@ -900,7 +905,7 @@ impl Type {
-                                         return Err(ParseError::Recurse);
-                                     }
-                                 } else {
--                                    name = location.spelling();
-+                                    name = Some(location.spelling());
-                                 }
- 
-                                 let complex = CompInfo::from_ty(
-@@ -942,7 +947,7 @@ impl Type {
-                                                 CXType_Typedef
-                                             );
- 
--                                            name = current.spelling();
-+                                            name = Some(location.spelling());
- 
-                                             let inner_ty = cur
-                                                 .typedef_type()
-@@ -1126,10 +1131,10 @@ impl Type {
-                 CXType_Enum => {
-                     let enum_ = Enum::from_ty(ty, ctx).expect("Not an enum?");
- 
--                    if name.is_empty() {
-+                    if !is_anonymous {
-                         let pretty_name = ty.spelling();
-                         if clang::is_valid_identifier(&pretty_name) {
--                            name = pretty_name;
-+                            name = Some(pretty_name);
-                         }
-                     }
- 
-@@ -1144,12 +1149,12 @@ impl Type {
-                     )
-                     .expect("Not a complex type?");
- 
--                    if name.is_empty() {
-+                    if !is_anonymous {
-                         // The pretty-printed name may contain typedefed name,
-                         // but may also be "struct (anonymous at .h:1)"
-                         let pretty_name = ty.spelling();
-                         if clang::is_valid_identifier(&pretty_name) {
--                            name = pretty_name;
-+                            name = Some(pretty_name);
-                         }
-                     }
- 
-@@ -1189,7 +1194,9 @@ impl Type {
-                 CXType_ObjCClass | CXType_ObjCInterface => {
-                     let interface = ObjCInterface::from_ty(&location, ctx)
-                         .expect("Not a valid objc interface?");
--                    name = interface.rust_name();
-+                    if !is_anonymous {
-+                        name = Some(interface.rust_name());
-+                    }
-                     TypeKind::ObjCInterface(interface)
-                 }
-                 CXType_Dependent => {
-@@ -1207,7 +1214,7 @@ impl Type {
-             }
-         };
- 
--        let name = if name.is_empty() { None } else { Some(name) };
-+        name = name.filter(|n| !n.is_empty());
- 
-         let is_const = ty.is_const() ||
-             (ty.kind() == CXType_ConstantArray &&
---- firefox-102.11.1/third_party/rust/bindgen/src/ir/ty.rs.rust-bindgen-2319-2339
-+++ firefox-102.11.1/third_party/rust/bindgen/src/ir/ty.rs
-@@ -1145,8 +1145,7 @@ impl Type {
-                         location,
-                         None,
-                         ctx,
--                    )
--                    .expect("Not able to resolve vector element?");
-+                    )?;
-                     TypeKind::Vector(inner, ty.num_elements().unwrap())
-                 }
-                 CXType_ConstantArray => {
---- firefox-102.11.1/third_party/rust/bindgen/src/ir/var.rs.rust-bindgen-2319-2339
-+++ firefox-102.11.1/third_party/rust/bindgen/src/ir/var.rs
-@@ -293,11 +293,11 @@ impl ClangSubItemParser for Var {
-                 let ty = match Item::from_ty(&ty, cursor, None, ctx) {
-                     Ok(ty) => ty,
-                     Err(e) => {
--                        assert_eq!(
--                            ty.kind(),
--                            CXType_Auto,
-+                        assert!(
-+                            matches!(ty.kind(), CXType_Auto | CXType_Unexposed),
-                             "Couldn't resolve constant type, and it \
--                             wasn't an nondeductible auto type!"
-+                             wasn't an nondeductible auto type or unexposed \
-+                             type!"
-                         );
-                         return Err(e);
-                     }

SOURCES/testing.sh

@@ -0,0 +1,260 @@
+#!/usr/bin/bash
+
+
+function run_tests_wayland {
+  # usage: run-tests-wayland [test flavour]
+
+  set -x
+
+  RUN_XPCSHELL_TEST=1
+  RUN_REFTEST=1
+  RUN_MOCHITEST=1
+  RUN_CRASHTEST=1
+
+  while (( "$#" )); do
+    SELECTED_TEST=$1
+    if [ "$SELECTED_TEST" = "xpcshell" ] ; then
+      RUN_XPCSHELL_TEST=1
+    elif [ "$SELECTED_TEST" = "reftest" ] ; then
+      RUN_REFTEST=1
+    elif [ "$SELECTED_TEST" = "mochitest" ] ; then
+      RUN_MOCHITEST=1
+    elif [ "$SELECTED_TEST" = "crashtest" ] ; then
+      RUN_CRASHTEST=1
+    fi
+    shift
+  done
+
+  export MACH_USE_SYSTEM_PYTHON=1
+  export MOZ_NODE_PATH=/usr/bin/node
+
+  MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
+  TEST_DIR="test_results"
+  mkdir $TEST_DIR
+
+  env | grep "DISPLAY"
+
+  # Fix for system nss
+  ln -s /usr/bin/certutil objdir/dist/bin/certutil
+  ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
+
+  NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+
+  export MOZ_ENABLE_WAYLAND=1
+
+  if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then
+  #  ./mach xpcshell-test 2>&1 | cat - | tee $TEST_DIR/xpcshell
+    ./mach xpcshell-test --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
+    sleep 60
+  fi
+
+  # Basic render testing
+  export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.wayland.test-workarounds.enabled=true"
+  #export TEST_FLAVOUR=""
+  #if [ $RUN_REFTEST -ne 0 ] ; then
+  #  ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+  #fi
+  #if [ $RUN_CRASHTEST -ne 0 ] ; then
+  #  ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+  #fi
+  #if [ $RUN_MOCHITEST -ne 0 ] ; then
+  #  ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+  #fi
+
+  # WebRender testing
+  export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
+  export TEST_FLAVOUR="-wr"
+  # Use dom/base/test or dom/base/test/chrome for short version
+  export MOCHITEST_DIR='dom'
+  if [ $RUN_REFTEST -ne 0 ] ; then
+    ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+    sleep 60
+  fi
+  if [ $RUN_CRASHTEST -ne 0 ] ; then
+    ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+    sleep 60
+  fi
+  if [ $RUN_MOCHITEST -ne 0 ] ; then
+    ./mach mochitest $MOCHITEST_DIR $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+    sleep 60
+  fi
+
+  rm -f  objdir/dist/bin/certutil
+  rm -f  objdir/dist/bin/pk12util
+}
+
+function run_tests_x11() {
+  set -x
+
+  export MACH_USE_SYSTEM_PYTHON=1
+  export MOZ_NODE_PATH=/usr/bin/node
+  export X_PARAMS="-screen 0 1600x1200x24"
+  export MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4"
+  export TEST_DIR="test_results"
+
+  # Fix for system nss
+  ln -s /usr/bin/certutil objdir/dist/bin/certutil
+  ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
+
+  NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+
+  # Basic render testing
+  export TEST_PARAMS=""
+  export TEST_FLAVOUR=""
+  #xvfb-run -s "$X_PARAMS" -n 91 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
+  #xvfb-run -s "$X_PARAMS" -n 92 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+  #xvfb-run -s "$X_PARAMS" -n 93 ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+  #xvfb-run -s "$X_PARAMS" -n 94 ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+
+  # WebRender testing
+  export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
+  export TEST_FLAVOUR="-wr"
+  #xvfb-run -s "$X_PARAMS" -n 95 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
+  #sleep 60
+  #xvfb-run -s "$X_PARAMS" -n 96 ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+  #sleep 60
+  #xvfb-run -s "$X_PARAMS" -n 97 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+  #sleep 60
+  #export DISPLAY=:0
+  #./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+  export DISPLAY=:98
+  xvfb-run -s "$X_PARAMS" -n 98 ./mach mochitest dom/base/test/ $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+
+  rm -f  objdir/dist/bin/certutil
+  rm -f  objdir/dist/bin/pk12util
+}
+
+function run_wayland_compositor() {
+  # Run wayland compositor and set WAYLAND_DISPLAY env variable
+  set -x
+
+  echo export DESKTOP_SESSION=gnome > $HOME/.xsessionrc
+  echo export XDG_CURRENT_DESKTOP=GNOME > $HOME/.xsessionrc
+  echo export XDG_SESSION_TYPE=wayland >> $HOME/.xsessionrc
+
+  # Turn off the screen saver and screen locking
+  gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
+  gsettings set org.gnome.desktop.screensaver lock-enabled false
+  gsettings set org.gnome.desktop.screensaver lock-delay 3600
+
+  # Disable the screen saver
+  # This starts the gnome-keyring-daemon with an unlocked login keyring. libsecret uses this to
+  # store secrets. Firefox uses libsecret to store a key that protects sensitive information like
+  # credit card numbers.
+  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+      # if not found, launch a new one
+      eval `dbus-launch --sh-syntax`
+  fi
+  eval `echo '' | /usr/bin/gnome-keyring-daemon -r -d --unlock --components=secrets`
+
+  if [ -z "$XDG_RUNTIME_DIR" ]; then
+    export XDG_RUNTIME_DIR=$HOME
+  fi
+
+  . xvfb-run -s "-screen 0 1600x1200x24" -n 80 mutter --display=:80 --wayland --nested &
+  export DISPLAY=:80
+
+  if [ -z "$WAYLAND_DISPLAY" ] ; then
+    export WAYLAND_DISPLAY=wayland-0
+  else
+    export WAYLAND_DISPLAY=wayland-1
+  fi
+  sleep 10
+  retry_count=0
+  max_retries=5
+  until [ $retry_count -gt $max_retries ]; do
+    if [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
+      retry_count=$(($max_retries + 1))
+    else
+      retry_count=$(($retry_count + 1))
+      echo "Waiting for Mutter, retry: $retry_count"
+      sleep 2
+    fi
+  done
+
+  env | grep "DISPLAY"
+}
+
+function print_error_reftest() {
+  # Print reftest failures and compose them to html
+
+  TEST_DIR="$1"
+  TEST_FLAVOUR="$2"
+  OUTPUT_FILE="failures-reftest$TEST_FLAVOUR.html"
+
+  grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" -e "IMAGE 1 (TEST):" -e "IMAGE 2 (REFERENCE):" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > $OUTPUT_FILE
+  sed -i '/REFTEST   IMAGE 1/a ">' $OUTPUT_FILE
+  sed -i '/REFTEST   IMAGE 2/a "><BR><BR>' $OUTPUT_FILE
+  sed -i '/REFTEST TEST/a <BR>' $OUTPUT_FILE
+  sed -i -e 's/^REFTEST   IMAGE 1 (TEST): /<img border=2 src="/' $OUTPUT_FILE
+  sed -i -e 's/^REFTEST   IMAGE 2 (REFERENCE): /<img border=2 src="/' $OUTPUT_FILE
+}
+
+function print_errors() {
+  #!/usr/bin/bash
+  # Print failed tests
+
+  TEST_DIR=$1
+  TEST_FLAVOUR=$2
+
+  grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR 2>&1 > failures-mochitest$TEST_FLAVOUR.txt
+  grep --text -e "  FAIL " -e "  TIMEOUT " $TEST_DIR/xpcshell$TEST_FLAVOUR 2>&1 > failures-xpcshell$TEST_FLAVOUR.txt
+  grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > failures-reftest$TEST_FLAVOUR.txt
+}
+
+function print_failures() {
+  #!/usr/bin/bash
+  # Analyze and print test failures
+
+  export TEST_DIR="test_results"
+
+  #./print-errors $TEST_DIR ""
+  print_errors $TEST_DIR "-wr"
+  #./print-error-reftest $TEST_DIR ""
+  print_error_reftest $TEST_DIR "-wr"
+}
+
+function psummary() {
+  #!/usr/bin/bash
+  # Analyze and print specialized (basic/webrender) test results
+
+  TEST_DIR=$1
+  TEST_FLAVOUR=$2
+
+  MPASS=`grep "TEST_END: Test OK" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
+  MERR=`grep "TEST_END: Test ERROR" $TEST_DIR/mochitest$TEST_FLAVOUR | wc -l`
+  MUNEX=`grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR | wc  -l`
+  echo "Mochitest   PASSED: $MPASS FAILED: $MERR UNEXPECTED-FAILURES: $MUNEX"
+
+  XPCPASS=`grep --text "Expected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
+  XPCFAIL=`grep --text "Unexpected results:" $TEST_DIR/xpcshell$TEST_FLAVOUR | cut -d ' ' -f 3`
+  echo "XPCShell:   PASSED: $XPCPASS FAILED: $XPCFAIL"
+
+  CRPASS=`grep "REFTEST INFO | Successful:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
+  CRFAIL=`grep "^REFTEST INFO | Unexpected:" $TEST_DIR/crashtest$TEST_FLAVOUR | cut -d ' ' -f 5`
+  echo "Crashtest:  PASSED: $CRPASS FAILED: $CRFAIL"
+
+  RFPASS=`grep --text "REFTEST INFO | Successful:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
+  RFUN=`grep --text "^REFTEST INFO | Unexpected:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 5`
+  RFKNOWN=`grep --text "REFTEST INFO | Known problems:" $TEST_DIR/reftest$TEST_FLAVOUR | cut -d ' ' -f 6`
+  echo "Reftest:    PASSED: $RFPASS FAILED: $RFUN Known issues: $RFKNOWN"
+}
+
+function print_results() {
+  #!/usr/bin/bash
+  # Analyze and print general test results
+
+  export TEST_DIR="test_results"
+
+  echo "Test results"
+  #echo "Basic compositor"
+  #./psummary $TEST_DIR ""
+  echo "WebRender"
+  psummary $TEST_DIR "-wr"
+}
+
+set -x
+first=$1
+shift
+$first $*
+

SOURCES/wasi.patch

@@ -0,0 +1,12 @@
+diff -up firefox-121.0.1/toolkit/moz.configure.wasi firefox-121.0.1/toolkit/moz.configure
+--- firefox-121.0.1/toolkit/moz.configure.wasi	2024-02-01 09:14:33.816548952 +0100
++++ firefox-121.0.1/toolkit/moz.configure	2024-02-01 09:15:53.264684309 +0100
+@@ -2663,7 +2663,7 @@ with only_when(requires_wasm_sandboxing
+     def wasi_sysroot_flags(wasi_sysroot):
+         if wasi_sysroot:
+             log.info("Using wasi sysroot in %s", wasi_sysroot)
+-            return ["--sysroot=%s" % wasi_sysroot]
++            return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs",  "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/home/jhorak/rpmbuild/BUILDROOT/usr/share/wasi-sysroot/lib/libclang_rt.builtins-wasm32.a"]
+         return []
+ 
+     set_config("WASI_SYSROOT", wasi_sysroot)

SOURCES/wasi.patch.template

@@ -0,0 +1,12 @@
+diff -up firefox-121.0.1/toolkit/moz.configure.wasi firefox-121.0.1/toolkit/moz.configure
+--- firefox-121.0.1/toolkit/moz.configure.wasi	2024-02-01 09:14:33.816548952 +0100
++++ firefox-121.0.1/toolkit/moz.configure	2024-02-01 09:15:53.264684309 +0100
+@@ -2663,7 +2663,7 @@ with only_when(requires_wasm_sandboxing
+     def wasi_sysroot_flags(wasi_sysroot):
+         if wasi_sysroot:
+             log.info("Using wasi sysroot in %s", wasi_sysroot)
+-            return ["--sysroot=%s" % wasi_sysroot]
++            return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs",  "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "$LIBCLANG_RT"]
+         return []
+ 
+     set_config("WASI_SYSROOT", wasi_sysroot)