From e07951b09b0838bb0ae8531c7c7419e04c711cf0 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 1 Mar 2022 12:33:16 +0100 Subject: [PATCH] Updated to 98.0 --- .gitignore | 2 ++ firefox.spec | 11 +++++++---- mozilla-1667096.patch | 42 +++++++++++++++++++++--------------------- sources | 4 ++-- 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index e0a7956..8fd6453 100644 --- a/.gitignore +++ b/.gitignore @@ -495,3 +495,5 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-97.0-20220208.tar.xz /firefox-97.0.1.source.tar.xz /firefox-langpacks-97.0.1-20220218.tar.xz +/firefox-98.0.source.tar.xz +/firefox-langpacks-98.0-20220301.tar.xz diff --git a/firefox.spec b/firefox.spec index 37bc621..bbfc8a3 100644 --- a/firefox.spec +++ b/firefox.spec @@ -162,13 +162,13 @@ ExcludeArch: aarch64 Summary: Mozilla Firefox Web browser Name: firefox -Version: 97.0.1 +Version: 98.0 Release: 1%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20220218.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220301.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source10: firefox-mozconfig @@ -459,7 +459,7 @@ This package contains results of tests executed during build. %patch49 -p1 -b .build-arm-libaom %patch53 -p1 -b .firefox-gcc-build %patch54 -p1 -b .1669639 -%patch55 -p1 -b .testing +#%patch55 -p1 -b .testing %patch57 -p1 -b .ffvpx-with-vapi #%patch64 -p1 -b .1753402 %patch65 -p1 -b .D139022 @@ -467,7 +467,7 @@ This package contains results of tests executed during build. %patch67 -p1 -b .D139088 # Test patches -%patch100 -p1 -b .firefox-tests-xpcshell +#%patch100 -p1 -b .firefox-tests-xpcshell #%patch101 -p1 -b .firefox-tests-reftest %patch102 -p1 -b .firefox-tests-xpcshell-freeze @@ -1051,6 +1051,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Mar 1 2022 Martin Stransky - 98.0-1 +- Updated to 98.0 + * Fri Feb 18 2022 Martin Stransky - 97.0.1-1 - Updated to 97.0.1 - GCC 12 build fixes diff --git a/mozilla-1667096.patch b/mozilla-1667096.patch index 8a82677..d2f2bf7 100644 --- a/mozilla-1667096.patch +++ b/mozilla-1667096.patch @@ -1,6 +1,6 @@ -diff -up firefox-97.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-97.0/media/ffvpx/libavcodec/codec_list.c ---- firefox-97.0/media/ffvpx/libavcodec/codec_list.c.1667096 2022-02-08 10:21:17.151809054 +0100 -+++ firefox-97.0/media/ffvpx/libavcodec/codec_list.c 2022-02-08 10:25:11.374078784 +0100 +diff -up firefox-98.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-98.0/media/ffvpx/libavcodec/codec_list.c +--- firefox-98.0/media/ffvpx/libavcodec/codec_list.c.1667096 2022-03-01 11:15:54.962398882 +0100 ++++ firefox-98.0/media/ffvpx/libavcodec/codec_list.c 2022-03-01 11:17:46.605000755 +0100 @@ -11,6 +11,9 @@ static const AVCodec * const codec_list[ #if CONFIG_MP3_DECODER &ff_mp3_decoder, @@ -8,12 +8,12 @@ diff -up firefox-97.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-97.0/m +#ifdef CONFIG_LIBFDK_AAC + &ff_libfdk_aac_decoder, +#endif - #if CONFIG_AV1_DECODER - &ff_av1_decoder, + #if CONFIG_LIBDAV1D + &ff_libdav1d_decoder, #endif -diff -up firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c ---- firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 2022-02-08 10:21:17.151809054 +0100 -+++ firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c 2022-02-08 10:21:17.151809054 +0100 +diff -up firefox-98.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-98.0/media/ffvpx/libavcodec/libfdk-aacdec.c +--- firefox-98.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 2022-03-01 11:15:54.963398914 +0100 ++++ firefox-98.0/media/ffvpx/libavcodec/libfdk-aacdec.c 2022-03-01 11:15:54.963398914 +0100 @@ -0,0 +1,409 @@ +/* + * AAC decoder wrapper @@ -424,12 +424,12 @@ diff -up firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-97. + FF_CODEC_CAP_INIT_CLEANUP, + .wrapper_name = "libfdk", +}; -diff -up firefox-97.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-97.0/media/ffvpx/libavcodec/moz.build ---- firefox-97.0/media/ffvpx/libavcodec/moz.build.1667096 2022-02-02 22:01:47.000000000 +0100 -+++ firefox-97.0/media/ffvpx/libavcodec/moz.build 2022-02-08 10:21:17.151809054 +0100 -@@ -111,6 +111,12 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: - ] - USE_LIBS += ['mozva'] +diff -up firefox-98.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-98.0/media/ffvpx/libavcodec/moz.build +--- firefox-98.0/media/ffvpx/libavcodec/moz.build.1667096 2022-03-01 11:15:54.963398914 +0100 ++++ firefox-98.0/media/ffvpx/libavcodec/moz.build 2022-03-01 11:18:00.646453768 +0100 +@@ -123,6 +123,12 @@ if CONFIG['MOZ_LIBAV_FFT']: + 'avfft.c', + ] +if CONFIG['MOZ_FDK_AAC']: + SOURCES += [ @@ -437,13 +437,13 @@ diff -up firefox-97.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-97.0/medi + ] + OS_LIBS += CONFIG['MOZ_FDK_AAC_LIBS'] + - if CONFIG['MOZ_LIBAV_FFT']: - SOURCES += [ - 'avfft.c', -diff -up firefox-97.0/toolkit/moz.configure.1667096 firefox-97.0/toolkit/moz.configure ---- firefox-97.0/toolkit/moz.configure.1667096 2022-02-08 10:21:17.152809035 +0100 -+++ firefox-97.0/toolkit/moz.configure 2022-02-08 10:24:31.734885827 +0100 -@@ -1969,6 +1969,15 @@ with only_when(compile_environment): + SYMBOLS_FILE = 'avcodec.symbols' + NoVisibilityFlags() + +diff -up firefox-98.0/toolkit/moz.configure.1667096 firefox-98.0/toolkit/moz.configure +--- firefox-98.0/toolkit/moz.configure.1667096 2022-03-01 11:15:54.881396269 +0100 ++++ firefox-98.0/toolkit/moz.configure 2022-03-01 11:15:54.963398914 +0100 +@@ -1950,6 +1950,15 @@ with only_when(compile_environment): set_config("MOZ_SYSTEM_PNG", True, when="--with-system-png") diff --git a/sources b/sources index d90aa63..3b484cc 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (cbindgen-vendor.tar.xz) = b9ab1498be90ecf60822df7021f8812f124550d97f8cd687c69d3ab56fc5fb714bfe88c78c978a1794d211724909a9a5cad6a4b483fa05f762909c45d5075520 SHA512 (mochitest-python.tar.gz) = 18e1aeb475df5fbf1fe3838897d5ac2f3114aa349030713fc2be27af087b1b12f57642621b87bd052f324a7cb7fbae5f36b21502191d85692f62c8cdd69c8bf2 -SHA512 (firefox-97.0.1.source.tar.xz) = 8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c -SHA512 (firefox-langpacks-97.0.1-20220218.tar.xz) = bb191d08d5bf8b1d375667a019f33a35cc62ce416415ae1213ce392c112b54efde13d0ad2e1d4d7e84943ff1d20249c5970ec0e648067231b28ef13b9fa85306 +SHA512 (firefox-98.0.source.tar.xz) = e4728316d919cad2c7b9bfc08cd6fa651c0706e14dba1629382ef1e8d723ebf22c6a892f23928ee05d98b9eadfa1c3e3fd803077c64919786c176c5e8d87863a +SHA512 (firefox-langpacks-98.0-20220301.tar.xz) = 54cc19003903da31bdc485eaf208e35759a390c71bb96a10757cbe10fbc65a1524a8d33c071589ee3f949508df66ced7115c0e4203e17bd672672fe303b4a5ee