From 1d80bc961c9e7dcc0ae0b3333d0dc1772b7d9a1b Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 21:19:07 +0100 Subject: [PATCH] update to 120.0.6099.71 [release 120.0.6099.71-1mamba;Tue Dec 12 2023] --- ...71-drop-flags-unsupported-by-clang16.patch | 51 ++++++++++++++++++ chromium.spec | 54 +++++++++---------- 2 files changed, 77 insertions(+), 28 deletions(-) create mode 100644 chromium-120.0.6099.71-drop-flags-unsupported-by-clang16.patch diff --git a/chromium-120.0.6099.71-drop-flags-unsupported-by-clang16.patch b/chromium-120.0.6099.71-drop-flags-unsupported-by-clang16.patch new file mode 100644 index 0000000..a180426 --- /dev/null +++ b/chromium-120.0.6099.71-drop-flags-unsupported-by-clang16.patch @@ -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 diff --git a/chromium.spec b/chromium.spec index 3691c89..b411a8e 100644 --- a/chromium.spec +++ b/chromium.spec @@ -1,8 +1,9 @@ %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 Epoch: 3 -Version: 119.0.6045.159 +Version: 120.0.6099.71 Release: 1mamba 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 @@ -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 Patch18: chromium-119.0.6045.159-libxml2-2.12.1.patch Patch19: chromium-119.0.6045.159-icu-74.patch +Patch20: chromium-120.0.6099.71-drop-flags-unsupported-by-clang16.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -41,10 +43,6 @@ BuildRequires: libXfixes-devel BuildRequires: libXrandr-devel BuildRequires: libalsa-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: libcups-devel BuildRequires: libdav1d-devel @@ -60,7 +58,6 @@ BuildRequires: libglib-devel BuildRequires: libharfbuzz-devel BuildRequires: libicu-devel BuildRequires: libjpeg-devel -BuildRequires: libjsoncpp-devel BuildRequires: libmesa-devel BuildRequires: libminizip1-devel BuildRequires: libnspr-devel @@ -69,11 +66,7 @@ BuildRequires: libopus-devel BuildRequires: libpango-devel BuildRequires: libpng-devel BuildRequires: libpulseaudio-devel -BuildRequires: libre2-devel -BuildRequires: libsnappy-devel -BuildRequires: libstdc++6-devel BuildRequires: libwebp-devel -BuildRequires: libwoff2-devel BuildRequires: libxcb-devel BuildRequires: libxkbcommon-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 %global __spec_rmbuild_cmd /bin/true +%define _default_patch_fuzz 2 +%global __provides_exclude_from ^%{_libdir}/chromium/.*$ + %prep #% setup -q -a2 %setup -q -D -T :<< ___EOF -%define _default_patch_fuzz 2 -%global __provides_exclude_from ^%{_libdir}/chromium/.*$ - # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ tools/generate_shim_headers/generate_shim_headers.py %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 13 -p1 -b .aarch64-include-limits #%patch 14 -p0 -b .material-color-utilities-cmath @@ -148,16 +141,18 @@ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ ##%patch 17 -p1 -b .roll-src-third_party-libavif-src-b33d9ebfc.676aded35 %patch 18 -p1 -b .libxml2-2.12.1 %patch 19 -p1 -b .icu-74 +%patch 20 -p1 -b .drop-flags-unsupported-by-clang16 # 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-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-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-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 sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py @@ -185,13 +180,13 @@ sed -i -e 's/\/malloc/' -e 's/\/free/' \ declare -rgA _system_libs=( #[brotli]=brotli [dav1d]=dav1d - [ffmpeg]=ffmpeg + #[ffmpeg]=ffmpeg [flac]=flac [fontconfig]=fontconfig [freetype]=libfreetype [harfbuzz-ng]=harfbuzz [icu]=icu - [jsoncpp]=jsoncpp + #[jsoncpp]=jsoncpp #[libaom]=aom #[libavif]=libavif [libdrm]= @@ -202,9 +197,9 @@ declare -rgA _system_libs=( [libxml]=libxml2 [libxslt]=libxslt [opus]=opus - [re2]=re2 - [snappy]=snappy - [woff2]=woff2 + #[re2]=re2 + #[snappy]=snappy + #[woff2]=woff2 [zlib]=libminizip1 ) @@ -256,9 +251,9 @@ export AR=llvm-ar export NM=llvm-nm # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn) -CFLAGS+=' -Wno-builtin-macro-redefined -Wno-unknown-warning-option' -CXXFLAGS+=' -Wno-builtin-macro-redefined -Wno-unknown-warning-option -stdlib=libstdc++' -CPPFLAGS+=' -D__DATE__= -D__TIME__= -D__TIMESTAMP__=' +export CFLAGS=' -Wno-builtin-macro-redefined -Wno-unknown-warning-option' +export CXXFLAGS=' -Wno-builtin-macro-redefined -Wno-unknown-warning-option' +export CPPFLAGS=' -D__DATE__= -D__TIME__= -D__TIMESTAMP__=' %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" @@ -286,7 +281,7 @@ chromium_conf=( 'proprietary_codecs=true' 'rtc_use_pipewire=true' 'link_pulseaudio=true' - 'use_custom_libcxx=false' + 'use_custom_libcxx=true' 'use_sysroot=false' 'use_system_libffi=true' 'enable_hangout_services_extension=true' @@ -437,6 +432,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver %{_mandir}/man1/chromium.1* %changelog +* Tue Dec 12 2023 Silvan Calarco 120.0.6099.71-1mamba +- update to 120.0.6099.71 + * Mon Nov 27 2023 Automatic Build System 119.0.6045.159-1mamba - automatic version update by autodist