From 8087b2f69e1a7d9821a15e6d746617d35e6e4886 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 26 Aug 2025 13:37:43 +0000 Subject: [PATCH] Import from CS git --- .firefox.metadata | 4 +-- .gitignore | 4 +-- ...nHandled-for-IO-error-processhandler.patch | 29 +++++++++++++++++++ SPECS/firefox.spec | 16 +++++++--- 4 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 SOURCES/exceptionHandled-for-IO-error-processhandler.patch diff --git a/.firefox.metadata b/.firefox.metadata index c1f7307..0b5cf8d 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz -59e39b32cfe365d57b9af224646a82b5028958f9 SOURCES/firefox-128.13.0esr.processed-source.tar.xz -34fca97ea1deff0bc11bf8d6954dffb3a37ac1d8 SOURCES/firefox-langpacks-128.13.0esr-20250715.tar.xz +a99f3085eeab27ce1e53dc17f0a3a4d8b113f7b1 SOURCES/firefox-128.14.0esr.processed-source.tar.xz +a6e9221f524daf1c277987207ff1f700a5c9ac9b SOURCES/firefox-langpacks-128.14.0esr-20250815.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 diff --git a/.gitignore b/.gitignore index 47fb5d4..8601cb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-128.13.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-128.13.0esr-20250715.tar.xz +SOURCES/firefox-128.14.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-128.14.0esr-20250815.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 diff --git a/SOURCES/exceptionHandled-for-IO-error-processhandler.patch b/SOURCES/exceptionHandled-for-IO-error-processhandler.patch new file mode 100644 index 0000000..e6267a5 --- /dev/null +++ b/SOURCES/exceptionHandled-for-IO-error-processhandler.patch @@ -0,0 +1,29 @@ +diff -up firefox-140.1.0/testing/mozbase/mozprocess/mozprocess/processhandler.py.exceptionHandled-for-IO-error-processhandler firefox-140.1.0/testing/mozbase/mozprocess/mozprocess/processhandler.py +--- firefox-140.1.0/testing/mozbase/mozprocess/mozprocess/processhandler.py.exceptionHandled-for-IO-error-processhandler 2025-07-14 19:14:55.000000000 +0200 ++++ firefox-140.1.0/testing/mozbase/mozprocess/mozprocess/processhandler.py 2025-08-05 18:05:54.329479764 +0200 +@@ -1098,11 +1098,22 @@ class ProcessReader: + + def _read_stream(self, stream, queue, callback): + sentinel = "" if isinstance(stream, io.TextIOBase) else b"" +- for line in iter(stream.readline, sentinel): +- queue.put((line, callback)) ++ try: ++ for line in iter(stream.readline, sentinel): ++ queue.put((line, callback)) ++ except ValueError as e: ++ if "I/O operation on closed file" in str(e): ++ # Stream was closed by the process, this is normal ++ pass ++ else: ++ raise + # Give a chance to the reading loop to exit without a timeout. + queue.put((b"", None)) +- stream.close() ++ try: ++ stream.close() ++ except ValueError: ++ # Stream might already be closed ++ pass + + def start(self, proc): + queue = Queue() diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 51514a7..1f7fcc5 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -166,8 +166,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 128.13.0 -Release: 1%{?dist} +Version: 128.14.0 +Release: 2%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -197,7 +197,7 @@ ExcludeArch: aarch64 s390 ppc # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%%{version}%%{?pre_version}/source/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20250715.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20250815.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -250,7 +250,8 @@ Patch13: disable-vsync-for-kiosk.patch Patch14: rhbz-71999-fips-youtube.patch # -- Upstreamed patches -- -Patch51: mozilla-bmo1170092.patch +Patch51: mozilla-bmo1170092.patch +Patch52: exceptionHandled-for-IO-error-processhandler.patch # -- Submitted upstream, not merged -- Patch101: mozilla-bmo1636168-fscreen.patch @@ -1237,6 +1238,7 @@ export LIBCLANG_RT=`pwd`/wasi-sdk-20/build/compiler-rt/lib/wasi/libclang_rt.buil # -- Upstreamed patches -- %patch -P51 -p1 -b .mozilla-bmo1170092 +%patch -P52 -p1 -b .exceptionHandled-for-IO-error-processhandler # -- Submitted upstream, not merged -- %patch -P101 -p1 -b .mozilla-bmo1636168-fscreen @@ -1995,6 +1997,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Aug 15 2025 Jan Grulich - 128.14.0-2 +- Add missing translations + +* Tue Aug 12 2025 Jan Grulich - 128.14.0-1 +- Update to 128.14.0 build1 + * Tue Jul 15 2025 Eike Rathke - 128.13.0-1 - Update to 128.13.0 build1