update to 120.0.6099.71 [release 120.0.6099.71-1mamba;Tue Dec 12 2023]

This commit is contained in:
Silvan Calarco 2024-01-05 21:19:07 +01:00
parent 8e3752f9f8
commit 1d80bc961c
2 changed files with 77 additions and 28 deletions

View File

@ -0,0 +1,51 @@
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 80bc79e5fb3..13b200e4cb0 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -616,24 +616,6 @@ config("compiler") {
}
}
- # TODO(crbug.com/1488374): This causes binary size growth and potentially
- # other problems.
- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
- if (default_toolchain != "//build/toolchain/cros:target" &&
- !llvm_android_mainline) {
- cflags += [
- "-mllvm",
- "-split-threshold-for-reg-with-hint=0",
- ]
- if (use_thin_lto && is_a_target_toolchain) {
- if (is_win) {
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
- } else {
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
- }
- }
- }
-
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
if (is_win) {
cflags += [ "/clang:-ffp-contract=off" ]
@@ -768,7 +750,6 @@ config("compiler") {
ldflags += [
"/opt:lldltojobs=all",
"-mllvm:-import-instr-limit=$import_instr_limit",
- "-mllvm:-disable-auto-upgrade-debug-info",
]
} else {
ldflags += [ "-flto=thin" ]
@@ -800,13 +781,6 @@ config("compiler") {
if (is_apple) {
ldflags += [ "-Wcrl,object_path_lto" ]
}
- if (!is_chromeos) {
- # TODO(https://crbug.com/972449): turn on for ChromeOS when that
- # toolchain has this flag.
- # We only use one version of LLVM within a build so there's no need to
- # upgrade debug info, which can be expensive since it runs the verifier.
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
- }
}
# TODO(https://crbug.com/1211155): investigate why this isn't effective on

View File

@ -1,8 +1,9 @@
%define MAJver %(echo %version | cut -d. -f1) %define MAJver %(echo %version | cut -d. -f1)
%define chromium_patches_ver %(echo %version | cut -d. -f1)-3 %define chromium_patches_ver %(echo %version | cut -d. -f1)
#% define chromium_patches_ver %(echo %version | cut -d. -f1)-3
Name: chromium Name: chromium
Epoch: 3 Epoch: 3
Version: 119.0.6045.159 Version: 120.0.6099.71
Release: 1mamba Release: 1mamba
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
Group: Graphical Desktop/Applications/Internet Group: Graphical Desktop/Applications/Internet
@ -30,6 +31,7 @@ Patch16: chromium-117.0.5938.88-add-memory-for-std-unique_ptr-in-third_par
Patch17: chromium-117.0.5938.88-roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch Patch17: chromium-117.0.5938.88-roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch
Patch18: chromium-119.0.6045.159-libxml2-2.12.1.patch Patch18: chromium-119.0.6045.159-libxml2-2.12.1.patch
Patch19: chromium-119.0.6045.159-icu-74.patch Patch19: chromium-119.0.6045.159-icu-74.patch
Patch20: chromium-120.0.6099.71-drop-flags-unsupported-by-clang16.patch
License: BSD License: BSD
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -41,10 +43,6 @@ BuildRequires: libXfixes-devel
BuildRequires: libXrandr-devel BuildRequires: libXrandr-devel
BuildRequires: libalsa-devel BuildRequires: libalsa-devel
BuildRequires: libat-spi2-core-devel BuildRequires: libat-spi2-core-devel
BuildRequires: libatomic-devel
BuildRequires: libavcodec-ffmpeg-devel
BuildRequires: libavformat-ffmpeg-devel
BuildRequires: libavutil-ffmpeg-devel
BuildRequires: libcairo-devel BuildRequires: libcairo-devel
BuildRequires: libcups-devel BuildRequires: libcups-devel
BuildRequires: libdav1d-devel BuildRequires: libdav1d-devel
@ -60,7 +58,6 @@ BuildRequires: libglib-devel
BuildRequires: libharfbuzz-devel BuildRequires: libharfbuzz-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libjsoncpp-devel
BuildRequires: libmesa-devel BuildRequires: libmesa-devel
BuildRequires: libminizip1-devel BuildRequires: libminizip1-devel
BuildRequires: libnspr-devel BuildRequires: libnspr-devel
@ -69,11 +66,7 @@ BuildRequires: libopus-devel
BuildRequires: libpango-devel BuildRequires: libpango-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libpulseaudio-devel BuildRequires: libpulseaudio-devel
BuildRequires: libre2-devel
BuildRequires: libsnappy-devel
BuildRequires: libstdc++6-devel
BuildRequires: libwebp-devel BuildRequires: libwebp-devel
BuildRequires: libwoff2-devel
BuildRequires: libxcb-devel BuildRequires: libxcb-devel
BuildRequires: libxkbcommon-devel BuildRequires: libxkbcommon-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
@ -126,20 +119,20 @@ Chromium is an open-source browser project that aims to build a safer, faster, a
# Don't clean build at the end # Don't clean build at the end
%global __spec_rmbuild_cmd /bin/true %global __spec_rmbuild_cmd /bin/true
%define _default_patch_fuzz 2
%global __provides_exclude_from ^%{_libdir}/chromium/.*$
%prep %prep
#% setup -q -a2 #% setup -q -a2
%setup -q -D -T %setup -q -D -T
:<< ___EOF :<< ___EOF
%define _default_patch_fuzz 2
%global __provides_exclude_from ^%{_libdir}/chromium/.*$
# Allow building against system libraries in official builds # Allow building against system libraries in official builds
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
tools/generate_shim_headers/generate_shim_headers.py tools/generate_shim_headers/generate_shim_headers.py
%patch 10 -p1 -b .use-oauth2-client-switches-as-default %patch 10 -p1 -b .use-oauth2-client-switches-as-default
%patch 11 -Rp1 -b .REVERT-disable-autoupgrading-debug-info #%patch 11 -Rp1 -b .REVERT-disable-autoupgrading-debug-info
##%patch 12 -p1 -b .randrom-build-fixes ##%patch 12 -p1 -b .randrom-build-fixes
%patch 13 -p1 -b .aarch64-include-limits %patch 13 -p1 -b .aarch64-include-limits
#%patch 14 -p0 -b .material-color-utilities-cmath #%patch 14 -p0 -b .material-color-utilities-cmath
@ -148,15 +141,17 @@ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
##%patch 17 -p1 -b .roll-src-third_party-libavif-src-b33d9ebfc.676aded35 ##%patch 17 -p1 -b .roll-src-third_party-libavif-src-b33d9ebfc.676aded35
%patch 18 -p1 -b .libxml2-2.12.1 %patch 18 -p1 -b .libxml2-2.12.1
%patch 19 -p1 -b .icu-74 %patch 19 -p1 -b .icu-74
%patch 20 -p1 -b .drop-flags-unsupported-by-clang16
# Fixes for building with libstdc++ instead of libc++ # Fixes for building with libstdc++ instead of libc++
patch -Np1 -i chromium-patches-*/chromium-114-ruy-include.patch patch -Np1 -i chromium-patches-*/chromium-114-ruy-include.patch
patch -Np1 -i chromium-patches-*/chromium-114-vk_mem_alloc-include.patch #patch -Np1 -i chromium-patches-*/chromium-114-vk_mem_alloc-include.patch
patch -Np1 -i chromium-patches-*/chromium-117-material-color-include.patch patch -Np1 -i chromium-patches-*/chromium-117-material-color-include.patch
patch -Np1 -i chromium-patches-*/chromium-119-FragmentDataIterator-std.patch #patch -Np1 -i chromium-patches-*/chromium-119-FragmentDataIterator-std.patch
patch -Np1 -i chromium-patches-*/chromium-119-at-spi-variable-consumption.patch patch -Np1 -i chromium-patches-*/chromium-119-at-spi-variable-consumption.patch
patch -Np1 -i chromium-patches-*/chromium-119-clang16.patch patch -Np1 -i chromium-patches-*/chromium-119-clang16.patch
patch -Np1 -i chromium-patches-*/chromium-119-replace-deprecated-is_pod.patch #patch -Np1 -i chromium-patches-*/chromium-119-replace-deprecated-is_pod.patch
patch -Np1 -i chromium-patches-*/chromium-120-std-nullptr_t.patch
# Force script incompatible with Python 3 to use /usr/bin/python2 # Force script incompatible with Python 3 to use /usr/bin/python2
sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
@ -185,13 +180,13 @@ sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
declare -rgA _system_libs=( declare -rgA _system_libs=(
#[brotli]=brotli #[brotli]=brotli
[dav1d]=dav1d [dav1d]=dav1d
[ffmpeg]=ffmpeg #[ffmpeg]=ffmpeg
[flac]=flac [flac]=flac
[fontconfig]=fontconfig [fontconfig]=fontconfig
[freetype]=libfreetype [freetype]=libfreetype
[harfbuzz-ng]=harfbuzz [harfbuzz-ng]=harfbuzz
[icu]=icu [icu]=icu
[jsoncpp]=jsoncpp #[jsoncpp]=jsoncpp
#[libaom]=aom #[libaom]=aom
#[libavif]=libavif #[libavif]=libavif
[libdrm]= [libdrm]=
@ -202,9 +197,9 @@ declare -rgA _system_libs=(
[libxml]=libxml2 [libxml]=libxml2
[libxslt]=libxslt [libxslt]=libxslt
[opus]=opus [opus]=opus
[re2]=re2 #[re2]=re2
[snappy]=snappy #[snappy]=snappy
[woff2]=woff2 #[woff2]=woff2
[zlib]=libminizip1 [zlib]=libminizip1
) )
@ -256,9 +251,9 @@ export AR=llvm-ar
export NM=llvm-nm export NM=llvm-nm
# Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn) # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn)
CFLAGS+=' -Wno-builtin-macro-redefined -Wno-unknown-warning-option' export CFLAGS=' -Wno-builtin-macro-redefined -Wno-unknown-warning-option'
CXXFLAGS+=' -Wno-builtin-macro-redefined -Wno-unknown-warning-option -stdlib=libstdc++' export CXXFLAGS=' -Wno-builtin-macro-redefined -Wno-unknown-warning-option'
CPPFLAGS+=' -D__DATE__= -D__TIME__= -D__TIMESTAMP__=' export CPPFLAGS=' -D__DATE__= -D__TIME__= -D__TIMESTAMP__='
%ifarch arm %ifarch arm
#export GYP_DEFINES="$GYP_DEFINES target_arch=arm disable_nacl=1 linux_use_tcmalloc=0 armv7=1 arm_neon=0 arm_thumb=1 arm_fpu=vfpv3-d16" #export GYP_DEFINES="$GYP_DEFINES target_arch=arm disable_nacl=1 linux_use_tcmalloc=0 armv7=1 arm_neon=0 arm_thumb=1 arm_fpu=vfpv3-d16"
@ -286,7 +281,7 @@ chromium_conf=(
'proprietary_codecs=true' 'proprietary_codecs=true'
'rtc_use_pipewire=true' 'rtc_use_pipewire=true'
'link_pulseaudio=true' 'link_pulseaudio=true'
'use_custom_libcxx=false' 'use_custom_libcxx=true'
'use_sysroot=false' 'use_sysroot=false'
'use_system_libffi=true' 'use_system_libffi=true'
'enable_hangout_services_extension=true' 'enable_hangout_services_extension=true'
@ -437,6 +432,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver
%{_mandir}/man1/chromium.1* %{_mandir}/man1/chromium.1*
%changelog %changelog
* Tue Dec 12 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 120.0.6099.71-1mamba
- update to 120.0.6099.71
* Mon Nov 27 2023 Automatic Build System <autodist@mambasoft.it> 119.0.6045.159-1mamba * Mon Nov 27 2023 Automatic Build System <autodist@mambasoft.it> 119.0.6045.159-1mamba
- automatic version update by autodist - automatic version update by autodist