Updated to 122.0

2024-01-22 16:52:36 +01:00 · 2024-01-22 16:52:36 +01:00 · 8454fdf13f
commit 8454fdf13f
parent 588e3b01fb
5 changed files with 53 additions and 71 deletions
--- a/.gitignore
+++ b/.gitignore
@ -615,3 +615,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-121.0-20231218.tar.xz
 /firefox-121.0.1.source.tar.xz
 /firefox-langpacks-121.0.1-20240112.tar.xz
+/firefox-122.0.source.tar.xz
+/firefox-langpacks-122.0-20240119.tar.xz
--- a/bmo-1559213-Support-system-av1.patch
+++ b/bmo-1559213-Support-system-av1.patch
@ -1,24 +1,7 @@
-From 8a4627c0c910415b00bebeb976dc6ea8c3e0d5d0 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Mon, 6 Apr 2020 19:36:02 +0200
-Subject: [PATCH 06/30] bmo#1559213: Support system av1
-
-Allow building against system-wide av1.
-
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1559213
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
- config/external/moz.build      |  5 +++--
- config/system-headers.mozbuild |  8 ++++++++
- dom/media/platforms/moz.build  |  5 +++++
- toolkit/moz.configure          | 20 ++++++++++++++++++--
- 4 files changed, 34 insertions(+), 4 deletions(-)
-
-diff --git a/config/external/moz.build b/config/external/moz.build
-index ab771212bf..75595d999c 100644
--- a/config/external/moz.build
-+++ b/config/external/moz.build
-@@ -49,8 +49,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
+diff -up firefox-122.0/config/external/moz.build.system-av1 firefox-122.0/config/external/moz.build
+--- firefox-122.0/config/external/moz.build.system-av1	2024-01-18 21:41:20.000000000 +0100
+++ firefox-122.0/config/external/moz.build	2024-01-19 18:27:03.512034790 +0100
+@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
     external_dirs += ["media/libvpx"]
 
 if CONFIG["MOZ_AV1"]:
@ -30,12 +13,11 @@ index ab771212bf..75595d999c 100644
 
 if not CONFIG["MOZ_SYSTEM_PNG"]:
     external_dirs += ["media/libpng"]
-diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
-index 2f7ae39515..96ab3a6466 100644
--- a/config/system-headers.mozbuild
-+++ b/config/system-headers.mozbuild
-@@ -1301,6 +1301,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
-         'proxy.h',
+diff -up firefox-122.0/config/system-headers.mozbuild.system-av1 firefox-122.0/config/system-headers.mozbuild
+--- firefox-122.0/config/system-headers.mozbuild.system-av1	2024-01-19 18:27:03.513034826 +0100
+++ firefox-122.0/config/system-headers.mozbuild	2024-01-19 19:02:54.515493457 +0100
+@@ -1304,6 +1304,14 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]:
+         "proxy.h",
     ]
 
 +if CONFIG['MOZ_SYSTEM_AV1']:
@ -46,14 +28,13 @@ index 2f7ae39515..96ab3a6466 100644
 +        'dav1d/dav1d.h',
 +    ]
 +
- if CONFIG['MOZ_SYSTEM_LIBVPX']:
+ if CONFIG["MOZ_SYSTEM_ICU"]:
     system_headers += [
-         'vpx_mem/vpx_mem.h',
-diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build
-index 8509aec6ef..7c5a1df63d 100644
--- a/dom/media/platforms/moz.build
-+++ b/dom/media/platforms/moz.build
-@@ -78,6 +78,11 @@ if CONFIG["MOZ_AV1"]:
+         "unicode/calendar.h",
+diff -up firefox-122.0/dom/media/platforms/moz.build.system-av1 firefox-122.0/dom/media/platforms/moz.build
+--- firefox-122.0/dom/media/platforms/moz.build.system-av1	2024-01-18 21:41:21.000000000 +0100
+++ firefox-122.0/dom/media/platforms/moz.build	2024-01-19 18:27:03.513034826 +0100
+@@ -81,6 +81,11 @@ if CONFIG["MOZ_AV1"]:
         "agnostic/AOMDecoder.cpp",
         "agnostic/DAV1DDecoder.cpp",
     ]
@ -65,11 +46,10 @@ index 8509aec6ef..7c5a1df63d 100644
 
 if CONFIG["MOZ_OMX"]:
     EXPORTS += [
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index a68e1b347d..7b7975bd12 100644
--- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -544,14 +544,29 @@ def av1(value):
+diff -up firefox-122.0/toolkit/moz.configure.system-av1 firefox-122.0/toolkit/moz.configure
+--- firefox-122.0/toolkit/moz.configure.system-av1	2024-01-19 18:27:03.495034173 +0100
+++ firefox-122.0/toolkit/moz.configure	2024-01-19 18:27:03.514034863 +0100
+@@ -743,14 +743,29 @@ def av1(value):
     if value:
         return True
 
@ -101,7 +81,7 @@ index a68e1b347d..7b7975bd12 100644
 def dav1d_nasm(target):
     if target.cpu in ("x86", "x86_64"):
         return namespace(version="2.14", what="AV1")
-@@ -561,6 +576,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
+@@ -760,6 +775,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
 set_define("MOZ_DAV1D_ASM", dav1d_asm)
 set_config("MOZ_AV1", av1)
 set_define("MOZ_AV1", av1)
@ -109,6 +89,3 @@ index a68e1b347d..7b7975bd12 100644
 
 # JXL Image Codec Support
 # ==============================================================
-- 
-2.34.1
-
--- a/firefox.spec
+++ b/firefox.spec
@ -173,13 +173,13 @@ ExcludeArch: i686

 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        121.0.1
-Release:        2%{?pre_tag}%{?dist}
+Version:        122.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}-20240112.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20240119.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        dump_syms-vendor.tar.xz
@ -1173,6 +1173,9 @@ fi
 #---------------------------------------------------------------------

 %changelog
+* Fri Jan 19 2024 Martin Stransky <stransky@redhat.com>- 122.0-1
+- Update to 122.0
+
 * Fri Jan 12 2024 Fabio Valentini <decathorpe@gmail.com> - 121.0.1-2
 - Rebuild for dav1d 1.3.0

--- a/pgo.patch
+++ b/pgo.patch
@ -1,7 +1,7 @@
-diff -up firefox-116.0/build/moz.configure/lto-pgo.configure.pgo firefox-116.0/build/moz.configure/lto-pgo.configure
--- firefox-116.0/build/moz.configure/lto-pgo.configure.pgo	2023-07-24 22:39:09.000000000 +0200
-+++ firefox-116.0/build/moz.configure/lto-pgo.configure	2023-07-25 10:58:24.992687495 +0200
-@@ -93,7 +93,7 @@ def pgo_flags(compiler, profdata, target
+diff -up firefox-122.0/build/moz.configure/lto-pgo.configure.pgo firefox-122.0/build/moz.configure/lto-pgo.configure
+--- firefox-122.0/build/moz.configure/lto-pgo.configure.pgo	2024-01-18 21:41:19.000000000 +0100
+++ firefox-122.0/build/moz.configure/lto-pgo.configure	2024-01-19 18:21:17.974681504 +0100
+@@ -86,7 +86,7 @@ def pgo_flags(compiler, profdata, target
         return namespace(
             gen_cflags=["-fprofile-generate"],
             gen_ldflags=["-fprofile-generate"],
@ -10,9 +10,9 @@ diff -up firefox-116.0/build/moz.configure/lto-pgo.configure.pgo firefox-116.0/b
             use_ldflags=["-fprofile-use"],
         )
 
-diff -up firefox-116.0/build/pgo/profileserver.py.pgo firefox-116.0/build/pgo/profileserver.py
--- firefox-116.0/build/pgo/profileserver.py.pgo	2023-07-24 22:39:09.000000000 +0200
-+++ firefox-116.0/build/pgo/profileserver.py	2023-07-25 10:58:24.992687495 +0200
+diff -up firefox-122.0/build/pgo/profileserver.py.pgo firefox-122.0/build/pgo/profileserver.py
+--- firefox-122.0/build/pgo/profileserver.py.pgo	2024-01-18 21:41:20.000000000 +0100
+++ firefox-122.0/build/pgo/profileserver.py	2024-01-19 18:21:17.974681504 +0100
@@ -11,7 +11,7 @@ import subprocess
 import sys
 
@ -22,7 +22,7 @@ diff -up firefox-116.0/build/pgo/profileserver.py.pgo firefox-116.0/build/pgo/pr
 from mozfile import TemporaryDirectory
 from mozhttpd import MozHttpd
 from mozprofile import FirefoxProfile, Preferences
-@@ -87,9 +87,22 @@ if __name__ == "__main__":
+@@ -98,9 +98,22 @@ if __name__ == "__main__":
     locations = ServerLocations()
     locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
 
@ -48,10 +48,10 @@ diff -up firefox-116.0/build/pgo/profileserver.py.pgo firefox-116.0/build/pgo/pr
 
     with TemporaryDirectory() as profilePath:
         # TODO: refactor this into mozprofile
-diff -up firefox-116.0/gfx/2d/moz.build.pgo firefox-116.0/gfx/2d/moz.build
--- firefox-116.0/gfx/2d/moz.build.pgo	2023-07-24 22:39:10.000000000 +0200
-+++ firefox-116.0/gfx/2d/moz.build	2023-07-25 10:58:24.992687495 +0200
-@@ -136,11 +136,11 @@ if CONFIG["INTEL_ARCHITECTURE"]:
+diff -up firefox-122.0/gfx/2d/moz.build.pgo firefox-122.0/gfx/2d/moz.build
+--- firefox-122.0/gfx/2d/moz.build.pgo	2024-01-18 21:41:22.000000000 +0100
+++ firefox-122.0/gfx/2d/moz.build	2024-01-19 18:21:17.974681504 +0100
+@@ -137,11 +137,11 @@ if CONFIG["INTEL_ARCHITECTURE"]:
     # The file uses SSE2 intrinsics, so it needs special compile flags on some
     # compilers.
     SOURCES["BlurSSE2.cpp"].flags += CONFIG["SSE2_FLAGS"]
@ -65,9 +65,9 @@ diff -up firefox-116.0/gfx/2d/moz.build.pgo firefox-116.0/gfx/2d/moz.build
     SOURCES["SwizzleSSE2.cpp"].flags += CONFIG["SSE2_FLAGS"]
     SOURCES["SwizzleSSSE3.cpp"].flags += CONFIG["SSSE3_FLAGS"]
     SOURCES["ssse3-scaler.c"].flags += CONFIG["SSSE3_FLAGS"]
-diff -up firefox-116.0/gfx/skia/generate_mozbuild.py.pgo firefox-116.0/gfx/skia/generate_mozbuild.py
--- firefox-116.0/gfx/skia/generate_mozbuild.py.pgo	2023-07-25 10:58:24.993687530 +0200
-+++ firefox-116.0/gfx/skia/generate_mozbuild.py	2023-07-25 10:59:43.428384144 +0200
+diff -up firefox-122.0/gfx/skia/generate_mozbuild.py.pgo firefox-122.0/gfx/skia/generate_mozbuild.py
+--- firefox-122.0/gfx/skia/generate_mozbuild.py.pgo	2024-01-19 18:21:17.975681537 +0100
+++ firefox-122.0/gfx/skia/generate_mozbuild.py	2024-01-19 18:24:15.494934133 +0100
@@ -54,10 +54,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
 if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-Dskvx=skvx_ssse3', '-mssse3']
@ -79,12 +79,12 @@ diff -up firefox-116.0/gfx/skia/generate_mozbuild.py.pgo firefox-116.0/gfx/skia/
     if not CONFIG["MOZ_CODE_COVERAGE"]:
 -        SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
 +        SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl', '-fno-lto']
- elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+ elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-Dskvx=skvx_crc32', '-march=armv8-a+crc']
 
-diff -up firefox-116.0/gfx/skia/moz.build.pgo firefox-116.0/gfx/skia/moz.build
--- firefox-116.0/gfx/skia/moz.build.pgo	2023-07-25 10:58:24.993687530 +0200
-+++ firefox-116.0/gfx/skia/moz.build	2023-07-25 11:00:20.382652180 +0200
+diff -up firefox-122.0/gfx/skia/moz.build.pgo firefox-122.0/gfx/skia/moz.build
+--- firefox-122.0/gfx/skia/moz.build.pgo	2024-01-19 18:21:17.975681537 +0100
+++ firefox-122.0/gfx/skia/moz.build	2024-01-19 18:25:13.472039275 +0100
@@ -564,10 +564,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
 if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-Dskvx=skvx_ssse3', '-mssse3']
@ -96,12 +96,12 @@ diff -up firefox-116.0/gfx/skia/moz.build.pgo firefox-116.0/gfx/skia/moz.build
     if not CONFIG["MOZ_CODE_COVERAGE"]:
 -        SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
 +        SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl', '-fno-lto']
- elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+ elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags += ['-Dskvx=skvx_crc32', '-march=armv8-a+crc']
 
-diff -up firefox-116.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-116.0/toolkit/components/terminator/nsTerminator.cpp
--- firefox-116.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2023-07-24 22:39:24.000000000 +0200
-+++ firefox-116.0/toolkit/components/terminator/nsTerminator.cpp	2023-07-25 10:58:24.993687530 +0200
+diff -up firefox-122.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-122.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-122.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2024-01-18 21:41:36.000000000 +0100
+++ firefox-122.0/toolkit/components/terminator/nsTerminator.cpp	2024-01-19 18:21:17.976681572 +0100
@@ -460,6 +460,11 @@ void nsTerminator::StartWatchdog() {
   }
 #endif
--- a/4
+++ b/4
@ -1,5 +1,5 @@
 SHA512 (mochitest-python.tar.gz) = 089b1593068b76f4572af0086eaccf52a6a1299bfffb58593206d19bf021ae381f2380bbfeb4371586cd53706ff6dde3d240238b2caf19b96c57dfc2f4524e36
 SHA512 (cbindgen-vendor.tar.xz) = 3e7eaff088db918e95f5505e5feeb06e8b7b95cc62042a6d163a708fc76baea43d21bf49cf7e02bc64fdfc61e8d7704057dbb225098de56e110783104d166c54
 SHA512 (dump_syms-vendor.tar.xz) = 5769c052fa874a965eb8837776b01fb097e8930f45d0d0d2a93997c4fae8726184a192aee52302bde62e62897801b1463cae9283563d9d60e8b8ee80a250f2a3
-SHA512 (firefox-121.0.1.source.tar.xz) = 7810850a922cb4a274ced6556e14256d3ff518a96f10a0f86d1f8e40daa0a8b1a5cfcc9cbf1391029d920944e94a9149951ee107a0e718a294954bb50b6ced2e
-SHA512 (firefox-langpacks-121.0.1-20240112.tar.xz) = 45c8ca9dcb5da0e3b282c060697487600eab71c0f6147006267407608cc9745daa69fc5948487644040b2b38d1b65404860f3ba406334648b9f4b31f9bd5df0a
+SHA512 (firefox-122.0.source.tar.xz) = 619b735c16970207f3f8fb31dd2350a5e665a802c30501c89aee4817b8b0f7f466da93c66ab238e94967587e538e6858934b18164ff312dbdbfbc3b2bf8bd824
+SHA512 (firefox-langpacks-122.0-20240119.tar.xz) = 04b5a912f0c1bfaeaf33995f491df861aa12b8134f5b2dada52649f82b5fb224c1d696c521c2665eb93813b9015bdaf71a7a0f7aee1dc6ebed1836073e9c71c8