Merge branch 'rawhide' into epel8

11 months ago · c2ede7f780
parent d20c78ff41 235c5e38dc
commit c2ede7f780
3 changed files with 34 additions and 38 deletions
--- a/chromium.spec
+++ b/chromium.spec
@ -132,7 +132,7 @@
 %global debug_package %{nil}
 %global debug_level 0
 %else
-%global debug_level 0
+%global debug_level 1
 # workaround for the error empty file debugsource
 %undefine _debugsource_packages
 %endif
@ -177,9 +177,28 @@
 %global toolchain gcc
 %endif

+# enable qt backend for el >= 8 and fedora
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+%global use_qt 1
+%else
+%global use_qt 0
+%endif
+
+%if 0%{?rhel} > 9 || 0%{?fedora}
+%global use_qt6 1
+%else
+%global use_qt6 0
+%endif
+
+# enable gtk3 by default
+%global gtk3 1
+
 # enable|disable system brotli
-# disable system brotli due to old system brotli
+# disable system brotli due to old system brotli on el and fedora < 38
 %global bundlebrotli 1
+%if 0%{?fedora} > 38
+%global bundlebrotli 0
+%endif

 # Chromium's fork of ICU is now something we can't unbundle.
 # This is left here to ease the change if that ever switches.
@ -204,22 +223,6 @@
 %global bundleminizip 1
 %endif

-# enable qt backend for el >= 8 and fedora
-%if 0%{?rhel} >= 8 || 0%{?fedora}
-%global use_qt 1
-%else
-%global use_qt 0
-%endif
-
-%if 0%{?rhel} > 9 || 0%{?fedora}
-%global use_qt6 1
-%else
-%global use_qt6 0
-%endif
-
-# enable gtk3 by default
-%global gtk3 1
-
 %if 0%{?rhel} == 7 || 0%{?rhel} == 8
 %global bundleopus 1
 %global bundlelibusbx 1
@ -290,8 +293,8 @@
 %endif

 Name:	chromium%{chromium_channel}
-Version: 120.0.6099.62
-Release: 2%{?dist}
+Version: 120.0.6099.71
+Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
 License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@ -1193,14 +1196,14 @@ CHROMIUM_CORE_GN_DEFINES+=' enable_nacl=false'
 CHROMIUM_CORE_GN_DEFINES+=' system_libdir="%{_lib}"'

 %if %{official_build}
-CHROMIUM_CORE_GN_DEFINES+=' is_official_build=true chrome_pgo_phase=0 use_debug_fission=true'
+CHROMIUM_CORE_GN_DEFINES+=' is_official_build=true'
 sed -i 's|OFFICIAL_BUILD|GOOGLE_CHROME_BUILD|g' tools/generate_shim_headers/generate_shim_headers.py
 %endif

 %if %{cfi}
-CHROMIUM_CORE_GN_DEFINES+=' use_thin_lto=true is_cfi=true'
+CHROMIUM_CORE_GN_DEFINES+=' is_cfi=true'
 %else
-CHROMIUM_CORE_GN_DEFINES+=' use_thin_lto=false is_cfi=false'
+CHROMIUM_CORE_GN_DEFINES+=' is_cfi=false'
 %endif

 %if %{useapikey}
@ -1250,7 +1253,7 @@ CHROMIUM_CORE_GN_DEFINES+=' enable_iterator_debugging=false'
 CHROMIUM_CORE_GN_DEFINES+=' enable_vr=false'
 CHROMIUM_CORE_GN_DEFINES+=' build_dawn_tests=false enable_perfetto_unittests=false'
 CHROMIUM_CORE_GN_DEFINES+=' disable_fieldtrial_testing_config=true'
-CHROMIUM_CORE_GN_DEFINES+=' blink_symbol_level=%{debug_level} symbol_level=%{debug_level} v8_symbol_level=%{debug_level}'
+CHROMIUM_CORE_GN_DEFINES+=' symbol_level=%{debug_level}'
 CHROMIUM_CORE_GN_DEFINES+=' blink_enable_generated_code_formatting=false'
 CHROMIUM_CORE_GN_DEFINES+=' angle_has_histograms=false'
 export CHROMIUM_CORE_GN_DEFINES
@ -1406,8 +1409,6 @@ mkdir -p %{builddir} && cp -a %{_bindir}/gn %{builddir}/
 %build_target %{builddir} policy_templates

 %if %{build_remoting}
-# remote client
-# ninja -C ../%{builddir} -vvv remoting_me2me_host remoting_start_host remoting_it2me_native_messaging_host remoting_me2me_native_messaging_host remoting_native_messaging_manifests remoting_resources
 %build_target %{remotingbuilddir} remoting_all
 %endif

@ -1769,6 +1770,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/chromedriver

 %changelog
+* Fri Dec 08 2023 Than Ngo <than@redhat.com> - 120.0.6099.71-1
+- update to 120.0.6099.71
+
 * Wed Dec 06 2023 Than Ngo <than@redhat.com> - 120.0.6099.62-2
 - drop unsupported ldflag which caused build failure

--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@ -87,9 +87,6 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/dv.h \
 		libavcodec/error_resilience.h \
 		libavcodec/fdctdsp.h \
-		libavcodec/fft.h \
-		libavcodec/fft-internal.h \
-		libavcodec/fft_table.h \
 		libavcodec/flac.h \
 		libavcodec/flacdsp.h \
 		libavcodec/flac_parse.h \
@ -100,6 +97,7 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/hevc.h \
 		libavcodec/hpeldsp.h \
 		libavcodec/hwaccels.h \
+		libavcodec/hwaccel_internal.h \
 		libavcodec/hwconfig.h \
 		libavcodec/idctdsp.h \
 		libavcodec/internal.h \
@ -181,7 +179,7 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavutil/x86/asm.h \
 		libavutil/x86/bswap.h \
 		libavutil/x86/cpu.h \
-		libavutil/x86/emms.h
+		libavutil/emms.h \
 		libavutil/x86/intreadwrite.h \
 		libavutil/x86/intmath.h
 		libavutil/x86/timer.h \
@ -223,10 +221,8 @@ header_files="	libavcodec/x86/inline_asm.h \
 		compat/va_copy.h \
 		compat/atomics/gcc/stdatomic.h "

-manual_files="	libavcodec/aarch64/fft_neon.S \
-		libavcodec/aarch64/h264pred_neon.S \
+manual_files=" libavcodec/aarch64/h264pred_neon.S \
 		libavcodec/aarch64/hpeldsp_neon.S \
-		libavcodec/aarch64/mdct_neon.S \
 		libavcodec/aarch64/neon.S \
 		libavcodec/aarch64/vorbisdsp_neon.S \
 		libavcodec/aarch64/vorbisdsp_init.c \
@ -240,7 +236,6 @@ manual_files="	libavcodec/aarch64/fft_neon.S \
 		libavcodec/x86/vp3dsp.asm \
 		libavcodec/x86/vp8dsp.asm \
 		libavcodec/bit_depth_template.c \
-		libavcodec/fft_template.c \
 		libavcodec/flacdec.c \
 		libavcodec/flacdsp.c \
 		libavcodec/flacdsp_template.c \
@ -248,7 +243,6 @@ manual_files="	libavcodec/aarch64/fft_neon.S \
 		libavcodec/h264pred_template.c \
 		libavcodec/hpel_template.c \
 		libavcodec/hpeldsp.c \
-		libavcodec/mdct_template.c \
 		libavcodec/options.c \
 		libavcodec/pcm.c \
 		libavcodec/pel_template.c \
@ -301,7 +295,6 @@ mp3_files="	libavcodec/aarch64/aacpsdsp_init_aarch64.c \
 		libavcodec/autorename_libavcodec_mpegaudiodsp.c \
 		libavcodec/autorename_libavcodec_sbrdsp.c \
 		libavcodec/cbrt_data.c \
-		libavcodec/dct.c \
 		libavcodec/dct32_fixed.c \
 		libavcodec/dct32_float.c \
 		libavcodec/dct32_template.c \
@ -319,7 +312,6 @@ mp3_files="	libavcodec/aarch64/aacpsdsp_init_aarch64.c \
 		libavcodec/sbrdsp.c \
 		libavcodec/sbrdsp_template.c \
 		libavcodec/sinewin.c \
-		libavcodec/x86/dct_init.c \
 		libavcodec/x86/dct32.asm \
 		libavcodec/x86/imdct36.asm \
 		libavcodec/x86/mpegaudiodsp.c \
--- a/2
+++ b/2
@ -2,4 +2,4 @@ SHA512 (node-v20.6.1-linux-arm64.tar.xz) = adfcaf2c22614797fd69fb46d94c1cbf64dea
 SHA512 (node-v20.6.1-linux-x64.tar.xz) = 7e15c05041a9a50f0046266aadb2e092a5aefbec19be1c7c809471add520cb57c7df3c47d88b1888b29bf2979dca3c92adddfd965370fa2a9da4ea02186464fd
 SHA512 (linux-arm64-0.19.2.tgz) = 8a0d8fec6786fffcd6954d00820037a55d61e60762c74300df0801f8db27057562c221a063bedfb8df56af9ba80abb366336987e881782c5996e6f871abd3dc6
 SHA512 (linux-x64-0.19.2.tgz) = a31cc74c4bfa54f9b75d735a1cfc944d3b5efb7c06bfba9542da9a642ae0b2d235ea00ae84d3ad0572c406405110fe7b61377af0fd15803806ef78d20fc6f05d
-SHA512 (chromium-120.0.6099.62-clean.tar.xz) = 592aae3aea3e96dab357515caf7efd34b2c406bfca5d8bf867d34603de5c92241dfa08cff3bbebc17122fe4e30c330a2bd153914634f7bcc6f3118a0b0d16c44
+SHA512 (chromium-120.0.6099.71-clean.tar.xz) = a77aaabee117e5e070f3109bd346a0d344ca2d7e25095a1f03963758a5816ed03af8b3a8a6cc2f306b86ddcda84b79882059ec961750873842e2656b5f836f25