Sync changes to SLFO-1.2 branch

MozillaFirefox.spec

@@ -1,7 +1,6 @@
-#
 # spec file for package MozillaFirefox
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2006-2025 Wolfgang Rosenauer <wr@rosenauer.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -28,10 +27,10 @@
 # orig_suffix b3
 # major 69
 # mainver %%major.99
-%define major          141
+%define major          140
-%define mainver        %major.0.2
+%define mainver        %major.1.0
-%define orig_version   141.0.2
+%define orig_version   140.1.0
-%define orig_suffix    %{nil}
+%define orig_suffix    esr
 %define update_channel release
 %define branding       1
 %define devpkg         1
@@ -42,6 +41,9 @@
 # upstream default is clang (to use gcc for large parts set to 0)
 %define clang_build    0
 
+# PIE, full relro
+%define build_hardened 1
+
 %bcond_with only_print_mozconfig
 
 # define if ccache should be used or not
@@ -50,17 +52,10 @@
 # SLE-12 doesn't have this macro
 %{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d}
 
-# No i586 on SLE-12, as the rpmlints are broken and can't handle the big rpms resulting from this build.
+# We don't ship i586 anywhere anymore
-%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
 ExclusiveArch:  aarch64 ppc64le x86_64 s390x
-%else
+
-# Firefox only supports i686
+# Let mach set the appropriate LTO-flags for us, but correctly.
-%ifarch %ix86
-ExclusiveArch:  i586 i686
-BuildArch:      i686
-%{expand:%%global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic -msse2}
-%endif
-%endif
 %{expand:%%global optflags %(echo "%optflags"|sed -e s/-flto=auto//) }
 
 # general build definitions
@@ -74,6 +69,7 @@ BuildArch:      i686
 %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define __provides_exclude ^lib.*\\.so.*$
 %define __requires_exclude ^(libmoz.*|liblgpllibs.*|libxul.*|libgk.*)$
+
 %define localize 1
 %ifarch %ix86 x86_64
 %define crashreporter 1
@@ -114,12 +110,12 @@ BuildRequires:  libiw-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
 BuildRequires:  mozilla-nspr-devel >= 4.36
-BuildRequires:  mozilla-nss-devel >= 3.113
+BuildRequires:  mozilla-nss-devel >= 3.112
 BuildRequires:  nasm >= 2.14
-BuildRequires:  nodejs >= 12.22.12
+%if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 150000
-%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
+BuildRequires:  nodejs12 >= 12.22.12
 BuildRequires:  libXtst-devel
-BuildRequires:  python-libxml2
+#BuildRequires:  python-libxml2
 BuildRequires:  python39
 BuildRequires:  python39-curses
 BuildRequires:  python39-devel
@@ -137,11 +133,12 @@ BuildRequires:  python3-curses
 BuildRequires:  python3-devel
 %endif
 %endif
-BuildRequires:  rust-cbindgen >= 0.26
+BuildRequires:  rust-cbindgen >= 0.27
-%if 0%{?suse_version} > 1560
+%if 0%{?suse_version} > 1600
 BuildRequires:  translate-suse-desktop
 %endif
 BuildRequires:  unzip
+# BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-libXt-devel
 %if 0%{?do_profiling}
 BuildRequires:  xvfb-run
@@ -151,11 +148,7 @@ BuildRequires:  zip
 %if 0%{?suse_version} < 1550
 BuildRequires:  pkgconfig(gconf-2.0) >= 1.2.1
 %endif
-%if 0%{?suse_version} < 1599
 BuildRequires:  clang15-devel
-%else
-BuildRequires:  clang-devel
-%endif
 BuildRequires:  pkgconfig(glib-2.0) >= 2.22
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.14.0
@@ -213,6 +206,10 @@ Source20:       https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig
 Source21:       https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/KEY#/mozilla.keyring
 # Gecko/Toolkit
 Patch1:         mozilla-nongnome-proxies.patch
+# Use xdg-desktop-portal file picker on KDE on SLE-15
+%if 0%{?sle_version} > 150000 && 0%{?sle_version} <= 150700
+Patch2:         mozilla-kde-force-xdg-portal.patch
+%endif
 Patch3:         mozilla-ntlm-full-path.patch
 Patch4:         mozilla-aarch64-startup-crash.patch
 Patch6:         mozilla-s390-context.patch
@@ -223,7 +220,6 @@ Patch14:        mozilla-bmo849632.patch
 Patch15:        mozilla-bmo998749.patch
 Patch17:        mozilla-libavcodec58_91.patch
 Patch18:        mozilla-silence-no-return-type.patch
-Patch19:        mozilla-bmo531915.patch
 Patch20:        one_swizzle_to_rule_them_all.patch
 Patch21:        svg-rendering.patch
 Patch24:        mozilla-bmo1746799.patch
@@ -234,7 +230,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post): coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
 Requires:       %{name}-branding >= 68
+%if 0%{?suse_version} >= 1600 || 0%{?sle_version} >= 120500
 Requires:       xdg-desktop-portal
+%else
+Recommends:     xdg-desktop-portal
+%endif
 %requires_ge    mozilla-nspr
 %requires_ge    mozilla-nss
 %requires_ge    libfreetype6
@@ -333,7 +333,7 @@ fi
 %else
 %setup -q -n %{srcname}-%{orig_version}
 %endif
-%if 0%{?suse_version} > 1560
+%if 0%{?suse_version} > 1600
 cp %{SOURCE1} %{desktop_file_name}.desktop.in.in
 %else
 cp %{SOURCE5} %{desktop_file_name}.desktop
@@ -344,7 +344,7 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
 
 %build
 # desktop file
-%if 0%{?suse_version} > 1560
+%if 0%{?suse_version} > 1600
 sed "s:%%NAME:%{appname}:g
 s:%%EXEC:%{progname}:g
 s:%%ICON:%{progname}:g
@@ -369,6 +369,7 @@ find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIM
 
 # SLE-12 provides python39, but that package does not provide a python3 binary
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
+#sed -i "s/python3/python3.9/g" configure.in
 sed -i "s|/usr/bin/env python3|/usr/bin/env python3.9|" mach
 sed -i "s|potential_python_binary = f\"python3.{i}\"|potential_python_binary = f\"python3.9.{i}\"|" mach
 export PYTHON3=/usr/bin/python3.9
@@ -393,11 +394,11 @@ export BUILD_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 export CFLAGS="%{optflags}"
+%if 0%{?clang_build} == 0
 %if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150600
 export CC=gcc-13
 export CXX=g++-13
 %else
-%if 0%{?clang_build} == 0
 export CC=gcc
 export CXX=g++
 %endif
@@ -411,7 +412,9 @@ export CXX=g++
 # A lie to prevent -Wl,--gc-sections being set which requires more memory than 32bit can offer
 #export GC_SECTIONS_BREAKS_DEBUG_RANGES=yes
 %endif
+%if 0%{?build_hardened}
 export LDFLAGS="\$LDFLAGS -fPIC -Wl,-z,relro,-z,now"
+%endif
 %ifarch ppc64 ppc64le
 %endif
 %ifarch %ix86
@@ -428,6 +431,13 @@ source ./.obsenv.sh
 %limit_build -m 2500
 %endif
 
+# Mitigating OOM-errors on SLE-16
+%if 0%{?suse_version} == 1600
+%ifarch s390x
+%limit_build -m 2500
+%endif
+%endif
+
 # Generating mozconfig
 cat << EOF > $MOZCONFIG
 mk_add_options MOZILLA_OFFICIAL=1
@@ -449,12 +459,15 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
 %ifarch %ix86 %arm
 ac_add_options --disable-debug-symbols
 %else
-ac_add_options --enable-debug-symbols=-g0
+ac_add_options --enable-debug-symbols=-g1
 %endif
 ac_add_options --disable-install-strip
-%ifarch %ix86 %arm
+# We have to disable elf-hack on SLE-12 aarch64, because the autogenerated
-# OOM on 32-bit when ld passed -Wl,-z,pack-relative-relocs
+# code produces a "no return in non-void function"-error.
-# ac_add_options --enable-elf-hack
+%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
+%ifarch aarch64
+ac_add_options --disable-elf-hack
+%endif
 %endif
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -505,7 +518,7 @@ ac_add_options --enable-optimize="-O1"
 %endif
 %ifarch x86_64
 # LTO needs newer toolchain stack only (at least GCC 8.2.1 (r268506)
-%if 0%{?suse_version} > 1500
+%if 0%{?suse_version} > 1600
 ac_add_options --enable-lto
 %if 0%{?do_profiling}
 ac_add_options MOZ_PGO=1
@@ -551,6 +564,7 @@ ac_add_options --enable-official-branding
 EOF
 
 %if 0%{?suse_version} >= 1600
+# Needed for reproducible builds, only available for rpm version >= 4.19
 %define njobs ${RPM_BUILD_NCPUS:-0}
 %else
 %define njobs 0%{?jobs:%jobs}
@@ -733,9 +747,7 @@ exit 0
 %{progdir}/dependentlibs.list
 %{progdir}/*.so
 %{progdir}/glxtest
-%if 0%{wayland_supported}
 %{progdir}/vaapitest
-%endif
 %ifarch aarch64 riscv64 %arm
 %{progdir}/v4l2test
 %endif
@@ -744,8 +756,8 @@ exit 0
 %{progdir}/pingsender
 %{progdir}/platform.ini
 %if %crashreporter
-%{progdir}/crashhelper
 %{progdir}/crashreporter
+%{progdir}/crashhelper
 #%%{progdir}/crashreporter.ini
 #%%{progdir}/Throbber-small.gif
 #%%{progdir}/minidump-analyzer

_constraints

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <constraints>
   <hardware>
-    <jobs>4</jobs>
     <disk>
-      <size unit="G">26</size>
+      <size unit="G">50</size>
     </disk>
     <physicalmemory>
       <size unit="G">15</size>
@@ -24,7 +23,6 @@
       </physicalmemory>
     </hardware>
   </overwrite>
-  <!-- LTO disabled - less RAM -->
   <overwrite>
     <conditions>
       <arch>aarch64</arch>
@@ -33,9 +31,29 @@
       <cpu>
         <flag>asimdrdm</flag>
       </cpu>
-      <physicalmemory>
+      <memory>
-        <size unit="G">14</size>
+        <size unit="G">12</size>
-      </physicalmemory>
+      </memory>
+    </hardware>
+  </overwrite>
+  <overwrite>
+    <conditions>
+      <arch>i586</arch>
+    </conditions>
+    <hardware>
+      <memory>
+        <size unit="G">26</size>
+      </memory>
+    </hardware>
+  </overwrite>
+  <overwrite>
+    <conditions>
+      <arch>x86_64</arch>
+    </conditions>
+    <hardware>
+      <memory>
+        <size unit="G">26</size>
+      </memory>
     </hardware>
   </overwrite>
   <overwrite>
@@ -43,28 +61,18 @@
       <arch>ppc64le</arch>
     </conditions>
     <hardware>
-      <physicalmemory>
+      <memory>
         <size unit="G">12</size>
-      </physicalmemory>
+      </memory>
     </hardware>
   </overwrite>
   <overwrite>
     <conditions>
       <arch>s390x</arch>
     </conditions>
-    <hardware>
-      <physicalmemory>
-        <size unit="G">15</size>
-      </physicalmemory>
-    </hardware>
-  </overwrite>
-  <overwrite>
-    <conditions>
-      <arch>riscv64</arch>
-    </conditions>
     <hardware>
       <memory>
-        <size unit="G">25</size>
+        <size unit="G">14</size>
       </memory>
     </hardware>
   </overwrite>

firefox-140.1.0esr.source.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEECb7tY/NGKi3/qzuHXstkl8GiAlYFAmh1PNEACgkQXstkl8Gi
+AlZpnQ//UsQXZjG4TnhAQlRtHgByr7yYLpc/iQ+3QvwZsPBChKhgEqKPhX9J+Uan
+my6Th+tMUTfwFchfV+rKsiFXpEMQJvhmDLLPFJEQsLTunsO/73ci63GKM1pFAmUe
+Y1cp9ekuMi2a2+zQr6iZ1/hxEqphAx4YLv35rCik1yrA323GWVkzrHbhuyopf4XH
+UQ6Aj356vPXPW5HEl3w6GNP1nRfsKuEOfIfCLcsHD26DyYVcAowHnt9+PHkqFHxW
+w1rUkh/GmgFzPFSBBXNWIWzCUFe8MSEr2GMcwIga5HV+MvkPQk4deO4fbWOx0rpn
+WWb5rNW3wkqJ4HTxoMrFoW972d0E23qjYVnSwS1lQq8/TJnOtG2QqZKWgmYIapjy
+fLqjhKoOgq2gUUUKCFa+2WhLQckk8nhaFyYmos5ndqXOPIoeWH/6GGWtbbV1WBHo
+6XU8eS59y6XFcbYi00I7tTAeVB5d5xEfPMYvm/UifE0DX89sSD1XPTc0R46nHwHo
+zZlA4VIcrm9h6FRhRhw+qCf9O8D+1jKcDozutSDqSMXyOjGJFgT/qCQcQQ1/X4ai
+ZK/8yG5pKfkneiebhWLT12qy5FK40cXDVByW94CTQqd558GX3BG+kIKTWr9sgAkr
+a/Xa8gpGGCS6zMeI4gJMTrA7UN7SEtF4dqppeB4YeRCRG4rw41w=
+=H9wW
+-----END PGP SIGNATURE-----

firefox-141.0.2.source.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c33937fe2f6ad29af3de8f1a128c054afbd64821f702bf98d9f4079b97d37f3a
-size 649165560

firefox-141.0.2.source.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEECb7tY/NGKi3/qzuHXstkl8GiAlYFAmiQuvcACgkQXstkl8Gi
-AlYnLBAAt156r6IETZ4ZdSoKLIvpQGe04Py85rG/Kh+xlSBK0MRY/GRJeIMrJE+1
-MAipv+uRePs3bnOK+PChZeVQ5gQe9LvbYmmT6F7nuyPgC56DnJ6d1OoZdTPzh6Q3
-WhzoBDgi0lkYlBd4CF7PVhR/RGGJzTVnTTKkPWBSfD7Je3V2whu67q0LrLCHUR1o
-qyfi6ZRQ8//3TZI6ALBJ9tYjg6jgKolOdptCSjHmLQH1gj5VB4JyDDYRzygNvBZD
-O6DSShZHCOy3adHsfKy3H5d8fAP0cvUXTEUV9CRNlgIOkSS05idHEQthhaa9TAwP
-rxs7fPn+jqsp/XSmPpVrF5pFDBgBAPguhZ5E9Sba1H0EDH28aCKmK6ASQju2+kkz
-DehiWni7EZjr6A+Eh+q14YvdcHf62kD4nAIUyUzBX4km4Brf0URBxm8gYWHtY3gR
-B/2I+NceGC5EzvIZ5FbmSYby80yB/I8+Rc2mEgRgHAvwiRLJQt5k4RArxgeYLVqa
-vadXEtGIvoGnreXDziSQKj4HkNbOLWYbRltXj+iPWDJleCU0AhynrpnlhSMr8Lam
-5hY8xPz9TYS9NdBL2d5U5XmQx56Fpk4pULcxfLqLgeKyoQfKpxMRgl/iy5fY64T1
-z8b+0cBWdViDpwwguOgFRqgXYRuOcrE0vCv3UG6eXuatFI/NrIQ=
-=CK8g
------END PGP SIGNATURE-----

firefox-branded-icons.patch

@@ -1,16 +1,19 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
 # Parent  9309f1ac14b7173985576932c01874184be1dcf9
+---
+ browser/branding/branding-common.mozbuild |    3 +++
+ browser/installer/package-manifest.in     |    3 +++
+ 2 files changed, 6 insertions(+)
 
 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
+index a38663a3dc1e..c8c32bc298b9 100644
 --- a/browser/branding/branding-common.mozbuild
 +++ b/browser/branding/branding-common.mozbuild
-@@ -26,12 +26,15 @@ def FirefoxBranding():
+@@ -31,6 +31,9 @@ def FirefoxBranding():
-             "PrivateBrowsing_70.png",
-             "VisualElements_150.png",
-             "VisualElements_70.png",
-         ]
-     elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
          FINAL_TARGET_FILES.chrome.icons.default += [
              "default128.png",
              "default16.png",
@@ -20,16 +23,11 @@ diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/brandi
              "default32.png",
              "default48.png",
              "default64.png",
-         ]
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+index d06952934172..89000c77fe05 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -221,20 +221,23 @@
+@@ -223,10 +223,13 @@
- ; [Browser Chrome Files]
- @RESPATH@/browser/chrome.manifest
- @RESPATH@/browser/chrome/browser@JAREXT@
- @RESPATH@/browser/chrome/browser.manifest
- @RESPATH@/chrome/toolkit@JAREXT@
  @RESPATH@/chrome/toolkit.manifest
  #ifdef MOZ_GTK
  @RESPATH@/browser/chrome/icons/default/default16.png
@@ -43,8 +41,3 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
  #endif
  
  ; [DevTools Startup Files]
- @RESPATH@/browser/chrome/devtools-startup@JAREXT@
- @RESPATH@/browser/chrome/devtools-startup.manifest
- 
- ; DevTools
- @RESPATH@/browser/chrome/devtools@JAREXT@

l10n-141.0.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:368365388ffd3e0df0ba01a1ce204f352cbb56a4e84169b74c9673e6e5cc40b0
-size 38256992

mozilla-aarch64-startup-crash.patch

@@ -1,4 +1,7 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # User msirringhaus@suse.de
 # Date 1558442998 -7200
 #      Tue May 21 14:49:58 2019 +0200
@@ -6,11 +9,15 @@
 # Parent  76b747f7d113bddbb8593184d81e1bfe5fd51af0
 bsc#991344 - Rpi3: Firefox crashes after a few seconds of usage
 bmo#1302554 - ARM/AARCH64: Firefox crashes on NULL nsIChannel** result pointer in nsIOService::NewChannelFromURIWithProxyFlagsInternal()
+---
+ netwerk/base/nsIOService.cpp |    6 ++++++
+ 1 file changed, 6 insertions(+)
 
 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
+index 277e640509ca..569f2cecc076 100644
 --- a/netwerk/base/nsIOService.cpp
 +++ b/netwerk/base/nsIOService.cpp
-@@ -1159,7 +1159,13 @@ nsresult nsIOService::NewChannelFromURIW
+@@ -1253,7 +1253,13 @@ nsresult nsIOService::NewChannelFromURIWithProxyFlagsInternal(
      }
    }
  

mozilla-bmo1504834-part1.patch

@@ -1,16 +1,20 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # Parent  e31f5228a09ed69d7ac3c84e54f0faa6a5910ae0
 Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
+---
+ gfx/2d/DrawTargetSkia.cpp            |    3 ++-
+ gfx/2d/Types.h                       |   13 +++----------
+ gfx/skia/skia/modules/skcms/skcms.cc |   22 ++++++++++++++++------
+ 3 files changed, 21 insertions(+), 17 deletions(-)
 
 diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
+index 26ec951c7d11..610f6d11c6b6 100644
 --- a/gfx/2d/DrawTargetSkia.cpp
 +++ b/gfx/2d/DrawTargetSkia.cpp
-@@ -155,17 +155,18 @@ static IntRect CalculateSurfaceBounds(co
+@@ -160,7 +160,8 @@ static IntRect CalculateSurfaceBounds(const IntSize& aSize, const Rect* aBounds,
-   if (!sampledBounds.ToIntRect(&bounds)) {
-     return surfaceBounds;
-   }
- 
-   return surfaceBounds.Intersect(bounds);
  }
  
  static const int kARGBAlphaOffset =
@@ -20,20 +24,11 @@ diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
  
  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
+index b1053223d3b7..828cb5cf6a34 100644
 --- a/gfx/2d/Types.h
 +++ b/gfx/2d/Types.h
-@@ -94,28 +94,21 @@ enum class SurfaceFormat : int8_t {
+@@ -101,18 +101,11 @@ enum class SurfaceFormat : int8_t {
-               // this format.
-   HSV,
-   Lab,
-   Depth,
- 
    // This represents the unknown format.
    UNKNOWN,  // TODO: Replace uses with Maybe<SurfaceFormat>.
  
@@ -55,20 +50,11 @@ 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/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/skcms.cc
+index 703af72b74ea..97ff241325a7 100644
 --- a/gfx/skia/skia/modules/skcms/skcms.cc
 +++ b/gfx/skia/skia/modules/skcms/skcms.cc
-@@ -26,16 +26,18 @@
+@@ -31,6 +31,8 @@
-         // it'd be a lot slower.  But we want all those headers included so we
-         // can use their features after runtime checks later.
-         #include <smmintrin.h>
-         #include <avxintrin.h>
-         #include <avx2intrin.h>
          #include <avx512fintrin.h>
          #include <avx512dqintrin.h>
      #endif
@@ -77,17 +63,7 @@ diff --git a/gfx/skia/skia/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/
  #endif
  
  using namespace skcms_private;
- 
+@@ -324,20 +326,28 @@ enum {
- static bool sAllowRuntimeCPUDetection = true;
- 
- void skcms_DisableRuntimeCPUDetection() {
-     sAllowRuntimeCPUDetection = false;
-@@ -319,30 +321,38 @@ enum {
-     skcms_Signature_sf32 = 0x73663332,
-     // XYZ is also a PCS signature, so it's defined in skcms.h
-     // skcms_Signature_XYZ = 0x58595A20,
- };
- 
  static uint16_t read_big_u16(const uint8_t* ptr) {
      uint16_t be;
      memcpy(&be, ptr, sizeof(be));
@@ -122,8 +98,3 @@ diff --git a/gfx/skia/skia/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/
  #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) {

mozilla-bmo1746799.patch

@@ -1,28 +1,30 @@
-From 535dc3c97fd19a30a329a188786998ae00cdf017 Mon Sep 17 00:00:00 2001
+[PATCH] Map linearly from cubeb volume to pa volume
+
 From: andrew <andrew@arobeia.co.uk>
-Date: Thu, 23 Dec 2021 16:18:30 +0000
-Subject: [PATCH] Map linearly from cubeb volume to pa volume
 
 Fixes incorrect volume mapping.
 
 Rebased to current SUSE sources and updated checksums Wed Sep 04 00:00:00 2024
+---
+ third_party/rust/cubeb-pulse/.cargo-checksum.json  |    2 +-
+ third_party/rust/cubeb-pulse/src/backend/stream.rs |    4 ++--
+ third_party/rust/pulse-ffi/.cargo-checksum.json    |    2 +-
+ third_party/rust/pulse-ffi/src/ffi_types.rs        |    5 +++++
+ 4 files changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/third_party/rust/cubeb-pulse/.cargo-checksum.json b/third_party/rust/cubeb-pulse/.cargo-checksum.json
+index bc4918e2ea2c..a3b984934a73 100644
 --- a/third_party/rust/cubeb-pulse/.cargo-checksum.json
 +++ b/third_party/rust/cubeb-pulse/.cargo-checksum.json
-@@ -1,1 +1,1 @@
+@@ -1 +1 @@
 -{"files":{".editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858",".github/workflows/build.yml":"477366d58c9dc059dbe4a158a6e910f23a3e9ecac7411f73616e06375583b764","AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","Cargo.toml":"37491c1b911bcedf99e624fbfb100aa6ecaa357d0d048dc9ff0da341d35f687c","LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","README.md":"0079450bb4b013bac065ed1750851e461a3710ebad1f323817da1cb82db0bc4f","src/backend/context.rs":"c0db5f2447de1d6df5aa2812fa342a085e73156a072c221c7379b9a6a9b86786","src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","src/backend/mod.rs":"dfb30ec497d6215e4535e936fea8fe3a407ef24dc1cec43b52c0ffa923d9229c","src/backend/stream.rs":"dfe5b747e100cae4aeae36cf2ebb9dc4715b411b4116721a40eec2944eb0ec23","src/capi.rs":"fa0fa020f0d0efe55aa0fc3596405e8407bbe2cbe6c7a558345304e6da87994e","src/lib.rs":"b41bbdc562cbfb130ed7c1e53fe69944774f515705341d8ce48a2f82c8c0c2c5"},"package":null}
 \ No newline at end of file
 +{"files":{".editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858",".github/workflows/build.yml":"477366d58c9dc059dbe4a158a6e910f23a3e9ecac7411f73616e06375583b764","AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","Cargo.toml":"37491c1b911bcedf99e624fbfb100aa6ecaa357d0d048dc9ff0da341d35f687c","LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","README.md":"0079450bb4b013bac065ed1750851e461a3710ebad1f323817da1cb82db0bc4f","src/backend/context.rs":"c0db5f2447de1d6df5aa2812fa342a085e73156a072c221c7379b9a6a9b86786","src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","src/backend/intern.rs":"11ca424e4eb77f8eb9fd5a6717d1e791facf9743156a8534f0016fcf64d57b0f","src/backend/mod.rs":"dfb30ec497d6215e4535e936fea8fe3a407ef24dc1cec43b52c0ffa923d9229c","src/backend/stream.rs":"2dfc61c4eac69624558756d87283496d01f56f44bf311119eff0f1d124cd88f3","src/capi.rs":"fa0fa020f0d0efe55aa0fc3596405e8407bbe2cbe6c7a558345304e6da87994e","src/lib.rs":"b41bbdc562cbfb130ed7c1e53fe69944774f515705341d8ce48a2f82c8c0c2c5"},"package":null}
 diff --git a/third_party/rust/cubeb-pulse/src/backend/stream.rs b/third_party/rust/cubeb-pulse/src/backend/stream.rs
+index a1740eba6363..9042054017a0 100644
 --- a/third_party/rust/cubeb-pulse/src/backend/stream.rs
 +++ b/third_party/rust/cubeb-pulse/src/backend/stream.rs
-@@ -760,18 +760,18 @@ impl<'ctx> StreamOps for PulseStream<'ct
+@@ -765,8 +765,8 @@ impl<'ctx> StreamOps for PulseStream<'ctx> {
-                             _ => pulse::SinkFlags::empty(),
-                         }
-                     };
- 
-                     if flags.contains(pulse::SinkFlags::FLAT_VOLUME) {
                          self.volume = volume;
                      } else {
                          let channels = stm.get_sample_spec().channels;
@@ -33,27 +35,19 @@ diff --git a/third_party/rust/cubeb-pulse/src/backend/stream.rs b/third_party/ru
  
                          let index = stm.get_index();
  
-                         let context_ptr = self.context as *const _ as *mut _;
-                         if let Ok(o) = context.set_sink_input_volume(
-                             index,
-                             &cvol,
-                             context_success,
 diff --git a/third_party/rust/pulse-ffi/.cargo-checksum.json b/third_party/rust/pulse-ffi/.cargo-checksum.json
+index a0e236d5b745..66d0f9644f6b 100644
 --- a/third_party/rust/pulse-ffi/.cargo-checksum.json
 +++ b/third_party/rust/pulse-ffi/.cargo-checksum.json
-@@ -1,1 +1,1 @@
+@@ -1 +1 @@
 -{"files":{"Cargo.toml":"f8cc9775a76c5fa246bb44a6a603bd0e7b2f0f068b4d9f40b68bac9ba777dd83","src/ffi_funcs.rs":"a16646c5e7c49e94b907a7a404cfcadf3007688005c689cca936f0c2ee2e28e6","src/ffi_types.rs":"2ca56bc3638a40d331e53117a5dd175d0a6e102b1e0eccb9c2adc565c6861a33","src/lib.rs":"6aff308de11954a067d0f6ef95bf3126aabb6d928a5191e91d9a38ebadba91c2"},"package":null}
 \ No newline at end of file
 +{"files":{"Cargo.toml":"f8cc9775a76c5fa246bb44a6a603bd0e7b2f0f068b4d9f40b68bac9ba777dd83","src/ffi_funcs.rs":"a16646c5e7c49e94b907a7a404cfcadf3007688005c689cca936f0c2ee2e28e6","src/ffi_types.rs":"f39a27712b17256583331f7ce5722413d0c7b51d73d8def8f50e839e23dfb411","src/lib.rs":"6aff308de11954a067d0f6ef95bf3126aabb6d928a5191e91d9a38ebadba91c2"},"package":null}
 diff --git a/third_party/rust/pulse-ffi/src/ffi_types.rs b/third_party/rust/pulse-ffi/src/ffi_types.rs
+index 9a6a23d75722..747a46fe2530 100644
 --- a/third_party/rust/pulse-ffi/src/ffi_types.rs
 +++ b/third_party/rust/pulse-ffi/src/ffi_types.rs
-@@ -17,16 +17,21 @@ pub const PA_SAMPLE_S32BE: c_int = 8;
+@@ -22,6 +22,11 @@ pub const PA_SAMPLE_MAX: c_int = 13;
- pub const PA_SAMPLE_S24LE: c_int = 9;
- pub const PA_SAMPLE_S24BE: c_int = 10;
- pub const PA_SAMPLE_S24_32LE: c_int = 11;
- pub const PA_SAMPLE_S24_32BE: c_int = 12;
- pub const PA_SAMPLE_MAX: c_int = 13;
  pub const PA_SAMPLE_INVALID: c_int = -1;
  pub type pa_sample_format_t = c_int;
  
@@ -65,8 +59,3 @@ diff --git a/third_party/rust/pulse-ffi/src/ffi_types.rs b/third_party/rust/puls
  #[repr(C)]
  #[derive(Copy, Clone, Debug)]
  pub struct Struct_pa_sample_spec {
-     pub format: pa_sample_format_t,
-     pub rate: u32,
-     pub channels: u8,
- }
- 

mozilla-bmo531915.patch

@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent  fa8a5832a374ccd7af5db927b992b5d9f15273ef
-
-diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h
---- a/modules/fdlibm/src/math_private.h
-+++ b/modules/fdlibm/src/math_private.h
-@@ -25,19 +25,24 @@
- 
- #include "fdlibm.h"
- 
- /*
-  * Emulate FreeBSD internal double types.
-  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
-  */
- 
-+#ifdef __i386__
-+typedef long double __double_t;
-+typedef long double __float_t;
-+#else
- typedef double      __double_t;
-+typedef float       __float_t;
-+#endif
- typedef __double_t  double_t;
--typedef float       __float_t;
- 
- /*
-  * The original fdlibm code used statements like:
-  *	n0 = ((*(int*)&one)>>29)^1;		* index of high word *
-  *	ix0 = *(n0+(int*)&x);			* high word of x *
-  *	ix1 = *((1-n0)+(int*)&x);		* low word of x *
-  * to dig two 32 bit words out of the 64 bit IEEE floating point
-  * value.  That is non-ANSI, and, moreover, the gcc instruction

mozilla-bmo849632.patch

@@ -1,16 +1,22 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # Parent  3de59fe1b8708c01e134ce698c4232b8a854f617
 Problem:  webGL sites are displayed in the wrong color (usually blue-ish)
 Solution: Problem is with skia once again. Output of webgl seems endian-correct, but skia only
           knows how to deal with little endian.
           So we swizzle the output of webgl after reading it from readpixels()
 Note:     This does not fix all webGL sites, but is a step in the right direction
+---
+ gfx/gl/GLContext.h |    7 +++++++
+ 1 file changed, 7 insertions(+)
 
-Index: firefox-115.0/gfx/gl/GLContext.h
+diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
-===================================================================
+index 45c75e8b6ecf..5096d59b7e70 100644
---- firefox-115.0.orig/gfx/gl/GLContext.h
+--- a/gfx/gl/GLContext.h
-+++ firefox-115.0/gfx/gl/GLContext.h
++++ b/gfx/gl/GLContext.h
-@@ -1560,6 +1560,13 @@ class GLContext : public GenericAtomicRe
+@@ -1595,6 +1595,13 @@ class GLContext : public GenericAtomicRefCounted, public SupportsWeakPtr {
      BEFORE_GL_CALL;
      mSymbols.fReadPixels(x, y, width, height, format, type, pixels);
      OnSyncCall();

mozilla-bmo998749.patch

@@ -1,14 +1,21 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # User msirringhaus@suse.de
 # Date 1583738770 -3600
 #      Mon Mar 09 08:26:10 2020 +0100
 # Node ID 34676feac1a542e409e22acf5b98735f8313b1ce
 # Parent  506857dace0a08d1c9685e3ac264646590b3e27f
 [mq]: mozilla-bmo998749.patch
+---
+ gfx/2d/FilterProcessing.h |    7 +++++++
+ 1 file changed, 7 insertions(+)
 
-diff -r 506857dace0a -r 34676feac1a5 gfx/2d/FilterProcessing.h
+diff --git a/gfx/2d/FilterProcessing.h b/gfx/2d/FilterProcessing.h
---- a/gfx/2d/FilterProcessing.h	Fri Feb 28 12:31:51 2020 +0100
+index d6beb626119f..1f609c8e5006 100644
-+++ b/gfx/2d/FilterProcessing.h	Mon Mar 09 08:26:10 2020 +0100
+--- a/gfx/2d/FilterProcessing.h
++++ b/gfx/2d/FilterProcessing.h
 @@ -13,10 +13,17 @@
  namespace mozilla {
  namespace gfx {

mozilla-kde-force-xdg-portal.patch

@@ -0,0 +1,20 @@
+The Firefox pref `widget.use-xdg-desktop-portal.file-picker` is a tristate with the states:
+0 - Never
+1 - Always
+2 - Auto
+where Auto means "yes" if Firefox detects that is run inside a flatpak, or if a certain env-variable is set, "no" otherwise.
+With this patch, we flip the auto-state also to "yes" (for the file-picker only!), if we are running KDE.
+
+diff --git a/widget/gtk/WidgetUtilsGtk.cpp b/widget/gtk/WidgetUtilsGtk.cpp
+index afa392d0d5a1f..c7621c1d0c0a2 100644
+--- a/widget/gtk/WidgetUtilsGtk.cpp
++++ b/widget/gtk/WidgetUtilsGtk.cpp
+@@ -294,6 +294,8 @@ bool ShouldUsePortal(PortalKind aPortalKind) {
+   const int32_t pref = [&] {
+     switch (aPortalKind) {
+       case PortalKind::FilePicker:
++        // We want to use the FilePicker-Portal on KDE, if possible
++        autoBehavior |= IsKdeDesktopEnvironment();
+         return StaticPrefs::widget_use_xdg_desktop_portal_file_picker();
+       case PortalKind::MimeHandler:
+         // Mime portal breaks default browser handling, see bug 1516290.

mozilla-libavcodec58_91.patch

@@ -1,15 +1,17 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # Parent  fdc16b43f28c2e974929ca702563aaac52799654
+---
+ dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp |    2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
+index 042218af04f4..814ef7d750fe 100644
 --- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
 +++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-@@ -44,16 +44,18 @@ static const char* sLibs[] = {
+@@ -50,6 +50,8 @@ static const char* sLibs[] = {
-   "libavcodec.53.dylib",
- #elif defined(XP_OPENBSD)
-   "libavcodec.so", // OpenBSD hardly controls the major/minor library version
-                    // of ffmpeg and update it regulary on ABI/API changes
- #else
    "libavcodec.so.61",
    "libavcodec.so.60",
    "libavcodec.so.59",
@@ -18,8 +20,3 @@ diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/plat
    "libavcodec.so.58",
    "libavcodec-ffmpeg.so.58",
    "libavcodec-ffmpeg.so.57",
-   "libavcodec-ffmpeg.so.56",
-   "libavcodec.so.57",
-   "libavcodec.so.56",
-   "libavcodec.so.55",
-   "libavcodec.so.54",

mozilla-nongnome-proxies.patch

@@ -1,19 +1,22 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # User Wolfgang Rosenauer
 # Date 1558442915 -7200
 #      Tue May 21 14:48:35 2019 +0200
 # Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5
 # Parent  715f01d61df8627117e6aefca540f0c1bba45011
 Do not use gconf for proxy settings if not running within Gnome
-Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+---
-===================================================================
+ .../system/unixproxy/nsUnixSystemProxySettings.cpp |   11 +++++++----
-RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v
+ 1 file changed, 7 insertions(+), 4 deletions(-)
-retrieving revision 1.1
 
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+index 3d8435f9827f..4b87fc5a1914 100644
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -52,10 +52,13 @@ nsUnixSystemProxySettings::GetMainThread
+@@ -52,10 +52,13 @@ nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
  }
  
  void nsUnixSystemProxySettings::Init() {

mozilla-ntlm-full-path.patch

@@ -1,18 +1,20 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # User Petr Cerny <pcerny@novell.com>
 # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6
 # Parent  3399aced682c232525633755ff79b37a0be75548
 Bug 634334 - call to the ntlm_auth helper fails
+---
+ extensions/auth/nsAuthSambaNTLM.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
+index c3b66fbfcc07..13df3d82849b 100644
 --- a/extensions/auth/nsAuthSambaNTLM.cpp
 +++ b/extensions/auth/nsAuthSambaNTLM.cpp
-@@ -148,17 +148,17 @@ nsresult nsAuthSambaNTLM::SpawnNTLMAuthH
+@@ -153,7 +153,7 @@ nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() {
-     }
- 
-     base::LaunchOptions options;
-     options.fds_to_remap.push_back(
-         std::pair{toChildPipeRead.get(), STDIN_FILENO});
      options.fds_to_remap.push_back(
          std::pair{fromChildPipeWrite.get(), STDOUT_FILENO});
  
@@ -21,8 +23,3 @@ diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNT
                                       "ntlmssp-client-1", "--use-cached-creds",
                                       "--username",       username};
  
-     auto result = base::LaunchApp(argvVec, std::move(options), &mChildPID);
-     if (result.isErr()) {
-       return NS_ERROR_FAILURE;
-     }
- 

mozilla-pgo.patch

@@ -1,12 +1,22 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 # Parent  9959fe2a13a39cbeb98ca1bef2e21caba16717bd
+---
+ build/moz.configure/lto-pgo.configure          |    6 +++---
+ build/pgo/profileserver.py                     |   25 ++++++++++++++++++++----
+ build/unix/mozconfig.unix                      |    9 +++++++++
+ extensions/spellcheck/src/moz.build            |    2 ++
+ toolkit/components/terminator/nsTerminator.cpp |    5 +++++
+ 5 files changed, 40 insertions(+), 7 deletions(-)
 
-Index: firefox-115.0/build/moz.configure/lto-pgo.configure
+diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
-===================================================================
+index eb0f87400885..257a71a4e5df 100644
---- firefox-115.0.orig/build/moz.configure/lto-pgo.configure
+--- a/build/moz.configure/lto-pgo.configure
-+++ firefox-115.0/build/moz.configure/lto-pgo.configure
++++ b/build/moz.configure/lto-pgo.configure
-@@ -251,8 +251,8 @@ def lto(
+@@ -347,8 +347,8 @@ def lto(
              cflags.append("-flto")
              ldflags.append("-flto")
          else:
@@ -17,7 +27,7 @@ Index: firefox-115.0/build/moz.configure/lto-pgo.configure
  
          if target.os == "Android" and "cross" in values:
              # Work around https://github.com/rust-lang/rust/issues/90088
-@@ -268,7 +268,7 @@ def lto(
+@@ -364,7 +364,7 @@ def lto(
          if "full" in values:
              cflags.append("-flto")
          else:
@@ -26,10 +36,10 @@ Index: firefox-115.0/build/moz.configure/lto-pgo.configure
          # 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")
-Index: firefox-115.0/build/pgo/profileserver.py
+diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
-===================================================================
+index 6017810c873f..64c76af933ea 100755
---- firefox-115.0.orig/build/pgo/profileserver.py
+--- a/build/pgo/profileserver.py
-+++ firefox-115.0/build/pgo/profileserver.py
++++ b/build/pgo/profileserver.py
 @@ -11,7 +11,7 @@ import subprocess
  import sys
  
@@ -39,7 +49,7 @@ Index: firefox-115.0/build/pgo/profileserver.py
  from mozfile import TemporaryDirectory
  from mozhttpd import MozHttpd
  from mozprofile import FirefoxProfile, Preferences
-@@ -87,9 +87,22 @@ if __name__ == "__main__":
+@@ -97,9 +97,22 @@ if __name__ == "__main__":
      locations = ServerLocations()
      locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
  
@@ -65,7 +75,7 @@ Index: firefox-115.0/build/pgo/profileserver.py
  
      with TemporaryDirectory() as profilePath:
          # TODO: refactor this into mozprofile
-@@ -213,6 +226,10 @@ if __name__ == "__main__":
+@@ -229,6 +242,10 @@ if __name__ == "__main__":
              print("Firefox exited successfully, but produced a crashreport")
              sys.exit(1)
  
@@ -76,10 +86,10 @@ Index: firefox-115.0/build/pgo/profileserver.py
          llvm_profdata = env.get("LLVM_PROFDATA")
          if llvm_profdata:
              profraw_files = glob.glob("*.profraw")
-Index: firefox-115.0/build/unix/mozconfig.unix
+diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix
-===================================================================
+index 05bf666b3925..de449359b01f 100644
---- firefox-115.0.orig/build/unix/mozconfig.unix
+--- a/build/unix/mozconfig.unix
-+++ firefox-115.0/build/unix/mozconfig.unix
++++ b/build/unix/mozconfig.unix
 @@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
      CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
      CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
@@ -96,21 +106,21 @@ Index: firefox-115.0/build/unix/mozconfig.unix
      # 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:$MOZ_FETCHES_DIR/binutils/bin:$PATH"
-Index: firefox-115.0/extensions/spellcheck/src/moz.build
+diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build
-===================================================================
+index c4ce09efca34..ee64cb1f48fa 100644
---- firefox-115.0.orig/extensions/spellcheck/src/moz.build
+--- a/extensions/spellcheck/src/moz.build
-+++ firefox-115.0/extensions/spellcheck/src/moz.build
++++ b/extensions/spellcheck/src/moz.build
-@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
+@@ -26,3 +26,5 @@ EXPORTS.mozilla += [
      "mozInlineSpellChecker.h",
      "mozSpellChecker.h",
  ]
 +
 +CXXFLAGS += ['-fno-devirtualize']
-Index: firefox-115.0/toolkit/components/terminator/nsTerminator.cpp
+diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp
-===================================================================
+index 8c456b142a4f..cb8109f7f966 100644
---- firefox-115.0.orig/toolkit/components/terminator/nsTerminator.cpp
+--- a/toolkit/components/terminator/nsTerminator.cpp
-+++ firefox-115.0/toolkit/components/terminator/nsTerminator.cpp
++++ b/toolkit/components/terminator/nsTerminator.cpp
-@@ -460,6 +460,11 @@ void nsTerminator::StartWatchdog() {
+@@ -330,6 +330,11 @@ void nsTerminator::StartWatchdog() {
    }
  #endif
  

mozilla-reduce-rust-debuginfo.patch

@@ -1,10 +1,17 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # Parent  135d931b3e674a670473f69f8c079e741ac63643
+---
+ build/moz.configure/rust.configure |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+index b92c26dcab0c..0db45298648e 100644
 --- a/build/moz.configure/rust.configure
 +++ b/build/moz.configure/rust.configure
-@@ -668,7 +668,7 @@ def rust_compile_flags(
+@@ -679,7 +679,7 @@ def rust_compile_flags(
          debug_assertions = False
  
      if debug_symbols:

mozilla-s390-context.patch

@@ -1,15 +1,22 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # User msirringhaus@suse.de
 # Date 1558452408 -7200
 #      Tue May 21 17:26:48 2019 +0200
 # Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
 # Parent  783ceb006fcdabe5ad23bd561362e721c7ed5f8c
 [mq]: mozilla-s390-context.patch
+---
+ js/src/wasm/WasmSignalHandlers.cpp |    8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
+index 06954b3dd560..3e198159affd 100644
 --- a/js/src/wasm/WasmSignalHandlers.cpp
 +++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -174,6 +174,10 @@ using mozilla::DebugOnly;
+@@ -172,6 +172,10 @@ using namespace js::wasm;
  #      define FP_sig(p) ((p)->uc_mcontext.gregs[REG_FPRS])
  #      define SP_sig(p) ((p)->uc_mcontext.gregs[REG_SP])
  #    endif
@@ -20,7 +27,7 @@ diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers
  #  elif defined(__NetBSD__)
  #    define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
  #    define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
-@@ -416,6 +420,10 @@ struct macos_aarch64_context {
+@@ -414,6 +418,10 @@ struct macos_aarch64_context {
  #    define FP_sig(p) RFP_sig(p)
  #    define SP_sig(p) R03_sig(p)
  #    define LR_sig(p) RRA_sig(p)

one_swizzle_to_rule_them_all.patch

@@ -1,15 +1,21 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # User M. Sirringhaus <msirringhaus@suse.de>
 # Date 1645518286 -3600
 #      Tue Feb 22 09:24:46 2022 +0100
 # Node ID 494640792b4677f6462e95b90a54a4e22aeb738b
 # Parent  81832d035e101471dcf52dd91de287268add7a91
 imported patch one_swizzle_to_rule_them_all.patch
+---
+ gfx/webrender_bindings/RenderCompositorSWGL.cpp |    8 ++++++++
+ 1 file changed, 8 insertions(+)
 
-Index: firefox-115.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
+diff --git a/gfx/webrender_bindings/RenderCompositorSWGL.cpp b/gfx/webrender_bindings/RenderCompositorSWGL.cpp
-===================================================================
+index 664416a407a8..2b0e9e16adb7 100644
---- firefox-115.0.orig/gfx/webrender_bindings/RenderCompositorSWGL.cpp
+--- a/gfx/webrender_bindings/RenderCompositorSWGL.cpp
-+++ firefox-115.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
++++ b/gfx/webrender_bindings/RenderCompositorSWGL.cpp
 @@ -7,6 +7,7 @@
  #include "RenderCompositorSWGL.h"
  
@@ -18,7 +24,7 @@ Index: firefox-115.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
  #include "mozilla/widget/CompositorWidget.h"
  
  #ifdef MOZ_WIDGET_GTK
-@@ -242,6 +243,13 @@ void RenderCompositorSWGL::CommitMappedB
+@@ -240,6 +241,13 @@ void RenderCompositorSWGL::CommitMappedBuffer(bool aDirty) {
    }
    mDT->Flush();
  

svg-rendering.patch

@@ -1,15 +1,22 @@
 # HG changeset patch
+
+From: Martin Sirringhaus <martin.sirringhaus@suse.com>
+
 # User M. Sirringhaus <msirringhaus@suse.de>
 # Date 1645518286 -3600
 #      Tue Feb 22 09:24:46 2022 +0100
 # Node ID 81832d035e101471dcf52dd91de287268add7a91
 # Parent  66f7ce16eb4965108687280e5443edd610631efb
 imported patch svg-rendering.patch
+---
+ image/imgFrame.cpp |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
 
 diff --git a/image/imgFrame.cpp b/image/imgFrame.cpp
+index 95f23479df9a..a6963a02e1ff 100644
 --- a/image/imgFrame.cpp
 +++ b/image/imgFrame.cpp
-@@ -372,6 +372,17 @@ nsresult imgFrame::InitWithDrawable(gfxD
+@@ -382,6 +382,17 @@ nsresult imgFrame::InitWithDrawable(gfxDrawable* aDrawable,
      return NS_ERROR_OUT_OF_MEMORY;
    }
  

tar_stamps

@@ -1,10 +1,10 @@
 PRODUCT="firefox"
 CHANNEL="release"
-VERSION="141.0.2"
+VERSION="140.1.0"
-VERSION_SUFFIX=""
+VERSION_SUFFIX="esr"
-PREV_VERSION="141.0"
+PREV_VERSION="140.0.0"
-PREV_VERSION_SUFFIX=""
+PREV_VERSION_SUFFIX="esr"
 #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
-RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release"
+RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-esr140"
-RELEASE_TAG="45460851be2c4cdc6f397489275c2f7aa83443fc"
+RELEASE_TAG="0c53463d0e61c036c08be46403e896e174f2182e"
-RELEASE_TIMESTAMP="20250804082849"
+RELEASE_TIMESTAMP="20250714132824"