Import from CS git

This commit is contained in:
eabdullin 2026-05-28 10:19:12 +00:00
parent 1537eb5f97
commit 15cce997e9
4 changed files with 9 additions and 37 deletions

View File

@ -1,6 +1,6 @@
bc4adac8f38f5103d8f88564a1545063dd8d6402 SOURCES/cbindgen-vendor.tar.xz
d38c5ae3f8a867330d1c5291b9d51720331f607b SOURCES/firefox-140.10.2esr.processed-source.tar.xz
d2a7bc61308193e1009f227b840d8a9fec433288 SOURCES/firefox-langpacks-140.10.2esr-20260514.tar.xz
9ab7be74cea45d63a3efc7cc2df7d5233943102a SOURCES/firefox-140.11.0esr.processed-source.tar.xz
a0a5406ebeea012175065d83a83ec4e1bbf28ecf SOURCES/firefox-langpacks-140.11.0esr-20260520.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.2esr.processed-source.tar.xz
SOURCES/firefox-langpacks-140.10.2esr-20260514.tar.xz
SOURCES/firefox-140.11.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-140.11.0esr-20260520.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

View File

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

@ -195,7 +195,7 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 140.10.2
Version: 140.11.0
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -226,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}-20260514.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20260520.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -275,7 +275,6 @@ 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 --
@ -1336,7 +1335,6 @@ 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
@ -2150,6 +2148,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Wed May 20 2026 Jan Horak <jhorak@redhat.com> - 140.11.0-1
- Update to 140.11.0 ESR
* Thu May 14 2026 Jan Horak <jhorak@redhat.com> - 140.10.2-1
- Update to 140.10.2 ESR