From a566fd4c4295e44d03091275192402f4ff0d4000 Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 12 Dec 2023 13:34:44 +0300 Subject: [PATCH] Update to 120.0.6099.71 --- .chromium.metadata | 2 +- .gitignore | 2 +- SPECS/chromium.spec | 59 ++++++++++++++++++++++++--------------------- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/.chromium.metadata b/.chromium.metadata index 216f6299..cb1a9a79 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,4 +1,4 @@ -901044fca51c5c74fa6df331cca0146aa8f07603 SOURCES/chromium-120.0.6099.62.tar.xz +edcfe1eec21ecfee709a1783199797ca5d7760a2 SOURCES/chromium-120.0.6099.71.tar.xz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz diff --git a/.gitignore b/.gitignore index 4bfd5234..1793f7b1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ SOURCES/node-v20.6.1-linux-arm64.tar.xz SOURCES/chromium-browser-gost-icons.tar.xz SOURCES/chromium-gost-acea4dd67875ea46a340f6fd2274c631ab132523.tar.gz SOURCES/msspi-061bce0709523afaad3ea4ffa7c0bff96b5592c0.tar.gz -SOURCES/chromium-120.0.6099.62.tar.xz +SOURCES/chromium-120.0.6099.71.tar.xz diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index 4d2af25b..d9329586 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -71,13 +71,13 @@ # set esbuild_version %global esbuild_version 0.19.2 -# set version for devtoolset and gcc-toolset +# set latest version for devtoolset and gcc-toolset %global dts_version 12 %if 0%{?rhel} == 8 || 0%{?rhel} == 9 %global dts_version 13 %endif -# set version for llvm-toolset on el7 +# set latest version for llvm-toolset on el7 %global llvm_toolset_version 14.0 # set name for toolset @@ -200,9 +200,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. @@ -227,22 +246,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 @@ -322,8 +325,8 @@ %endif Name: chromium%{chromium_channel} -Version: 120.0.6099.62 -Release: 2%{?dist}.inferit +Version: 120.0.6099.71 +Release: 1%{?dist}.inferit 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) @@ -1319,14 +1322,15 @@ 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 chrome_pgo_phase=0' 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} @@ -1376,7 +1380,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 @@ -1530,8 +1534,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 @@ -1906,6 +1908,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %endif %changelog +* Tue Dec 12 2023 Arkady L. Shane - 120.0.6099.71-1.inferit +- Updateo to 20.0.6099.71 + * Thu Dec 07 2023 Arkady L. Shane - 120.0.6099.62-2.inferit - drop unsupported ldflag which caused build failure - update to 120.0.6099.62