Import from CS git

This commit is contained in:
eabdullin 2026-05-20 12:56:21 +00:00
parent 6038e0ee68
commit 4e6c96d9cb
5 changed files with 89 additions and 9 deletions

View File

@ -1,6 +1,6 @@
bc4adac8f38f5103d8f88564a1545063dd8d6402 SOURCES/cbindgen-vendor.tar.xz
480a296464dd537d8fdd161f74c0322ac9fd97ce SOURCES/firefox-140.10.0esr.processed-source.tar.xz
30963377992f6f40cd1a7bf852f69f6b5eae19f3 SOURCES/firefox-langpacks-140.10.0esr-20260416.tar.xz
d38c5ae3f8a867330d1c5291b9d51720331f607b SOURCES/firefox-140.10.2esr.processed-source.tar.xz
d2a7bc61308193e1009f227b840d8a9fec433288 SOURCES/firefox-langpacks-140.10.2esr-20260514.tar.xz
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
0d0ddbd2a73340b3cbc977997f57222946b1e775 SOURCES/nspr-4.36.0-2.el8_2.src.rpm
fd3879b176634d66f8ef64d18fdaeec98e140c23 SOURCES/nss-3.112.0-1.el9_4.src.rpm

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-140.10.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-140.10.0esr-20260416.tar.xz
SOURCES/firefox-140.10.2esr.processed-source.tar.xz
SOURCES/firefox-langpacks-140.10.2esr-20260514.tar.xz
SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.36.0-2.el8_2.src.rpm
SOURCES/nss-3.112.0-1.el9_4.src.rpm

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,29 @@
# HG changeset patch
# User az <azebrowski@mozilla.com>
# Date 1777295119 0
# Node ID be2954efe4c16426fde496c22f4595687252aad2
# Parent fc073e8a30dbed81021ca06b7b6dd9b4a20a61bf
Bug 2031958 - Fix Solaris/GCC -Wincompatible-pointer-types build error in ffvpx parser_list.c a=dmeehan DONTBUILD
Original Revision: https://phabricator.services.mozilla.com/D295104
Differential Revision: https://phabricator.services.mozilla.com/D295303
diff --git a/media/ffvpx/libavcodec/parser_list.c b/media/ffvpx/libavcodec/parser_list.c
--- a/media/ffvpx/libavcodec/parser_list.c
+++ b/media/ffvpx/libavcodec/parser_list.c
@@ -1,10 +1,10 @@
#include "config_components.h"
-static const AVCodecParser * const parser_list[] = {
+static const FFCodecParser * const parser_list[] = {
#if CONFIG_VP8_PARSER
&ff_vp8_parser,
#endif
#if CONFIG_VP9_PARSER
&ff_vp9_parser,
#endif
NULL };

View File

@ -56,7 +56,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el9")
if match then
return 7
return 9
end
match = string.match(str, ".el10_%d+")
if match then
@ -64,7 +64,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el10")
if match then
return 1
return 3
end
return -1
end}
@ -108,6 +108,10 @@ end}
%global with_wasi_sdk 1
%endif
%endif
# newer llvm requires newer wasi - we're going to fix it in the rebase to 152 esr
%if %{rhel_minor_version} >= 9
%global with_wasi_sdk 0
%endif
%endif
@ -191,7 +195,7 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 140.10.0
Version: 140.10.2
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -222,7 +226,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}-20260416.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20260514.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -271,6 +275,8 @@ Patch11: rhbz-71999-fips-youtube.patch
Patch13: firefox-fix-build-with-system-pipewire.patch
Patch14: build-system-nss.patch
Patch15: build-workaround-s390x.patch
Patch16: build-ffvpx-failures.patch
Patch17: build-bindgen-0.72.1.patch
# -- Upstreamed patches --
Patch51: mozilla-bmo1170092.patch
@ -1330,6 +1336,13 @@ echo "--------------------------------------------"
%ifarch s390x
%patch -P15 -p1 -b .s390x_workaround
%endif
%patch -P16 -p1 -b .build-ffvpx-failure
%if (0%{?rhel} == 10 && %{rhel_minor_version} > 2)
%patch -P17 -p1 -b .build-bindgen-0.72.1
%endif
%if (0%{?rhel} == 9 && %{rhel_minor_version} > 8)
%patch -P17 -p1 -b .build-bindgen-0.72.1
%endif
# We need to create the wasi.patch with the correct path to the wasm libclang_rt.
%if %{with_wasi_sdk}
@ -2137,6 +2150,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Thu May 14 2026 Jan Horak <jhorak@redhat.com> - 140.10.2-1
- Update to 140.10.2 ESR
* Wed May 6 2026 Jan Horak <jhorak@redhat.com> - 140.10.1-1
- Update to 140.10.1 ESR
* Thu Apr 16 2026 Jan Horak <jhorak@redhat.com> - 140.10.0-1
- Update to 140.10.0 ESR
@ -2170,6 +2189,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Tue Aug 12 2025 Jan Grulich <jgrulich@redhat.com> - 128.14.0-1
- Update to 128.14.0 build1
* Tue Aug 05 2025 Tomas Popela <tpopela@redhat.com> - 128.13.0-2
- Bump the NSS requirements as the rebased NSS is already shipped in c10s
* Tue Jul 15 2025 Eike Rathke <erack@redhat.com> - 128.13.0-1
- Update to 128.13.0 build1
@ -2209,7 +2231,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Mon Nov 18 2024 Jan Grulich <jgrulich@redhat.com - 128.4.0-2
- Enable PipeWire camera support for RHEL 10
+ backport upstream fixes for PipeWire camera support
Fixes: RHEL-64749
Resolves: RHEL-64749
* Tue Oct 22 2024 Eike Rathke <erack@redhat.com> - 128.4.0-1
- Update to 128.4.0 build1