From 47fcf03080e5864b72d19e3c9c71c7b13fb76803 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 15 Nov 2024 21:55:34 +0100 Subject: [PATCH] automatic version update by autodist [release 130.0.6723.116-1mamba;Tue Nov 12 2024] --- chromium-123.0.6312.86-clang-18.patch | 32 ------------------- ...26-drop-flags-unsupported-by-clang17.patch | 29 ----------------- chromium.spec | 16 +++++----- 3 files changed, 8 insertions(+), 69 deletions(-) delete mode 100644 chromium-123.0.6312.86-clang-18.patch delete mode 100644 chromium-126.0.6478.126-drop-flags-unsupported-by-clang17.patch diff --git a/chromium-123.0.6312.86-clang-18.patch b/chromium-123.0.6312.86-clang-18.patch deleted file mode 100644 index 0469220..0000000 --- a/chromium-123.0.6312.86-clang-18.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn -index d4de2e0cca0..57359c32121 100644 ---- a/build/config/clang/BUILD.gn -+++ b/build/config/clang/BUILD.gn -@@ -130,12 +130,15 @@ template("clang_lib") { - } else if (is_linux || is_chromeos) { - if (current_cpu == "x64") { - _dir = "x86_64-unknown-linux-gnu" -+ _suffix = "-x86_64" - } else if (current_cpu == "x86") { - _dir = "i386-unknown-linux-gnu" -+ _suffix = "-i386" - } else if (current_cpu == "arm") { - _dir = "armv7-unknown-linux-gnueabihf" - } else if (current_cpu == "arm64") { - _dir = "aarch64-unknown-linux-gnu" -+ _suffix = "-aarch64" - } else { - assert(false) # Unhandled cpu type - } -@@ -166,6 +169,11 @@ template("clang_lib") { - assert(false) # Unhandled target platform - } - -+ # Bit of a hack to make this find builtins from compiler-rt >= 16 -+ if (is_linux || is_chromeos) { -+ _dir = "linux" -+ } -+ - _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib" - _lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}" - libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ] diff --git a/chromium-126.0.6478.126-drop-flags-unsupported-by-clang17.patch b/chromium-126.0.6478.126-drop-flags-unsupported-by-clang17.patch deleted file mode 100644 index d5f6c1d..0000000 --- a/chromium-126.0.6478.126-drop-flags-unsupported-by-clang17.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 6efe967eb0a1..590a2c274ac1 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -568,24 +568,6 @@ config("compiler") { - } - } - -- # TODO(crbug.com/40283598): This causes binary size growth and potentially -- # other problems. -- # TODO(crbug.com/40284925): 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/40192287): Investigate why/if this should be needed. - if (is_win) { - cflags += [ "/clang:-ffp-contract=off" ] diff --git a/chromium.spec b/chromium.spec index ed417f1..20e89d8 100644 --- a/chromium.spec +++ b/chromium.spec @@ -3,7 +3,7 @@ %define clang_version %(clang --version | grep -m1 version | sed 's/[^0-9.]//g' | cut -d. -f1) Name: chromium Epoch: 3 -Version: 130.0.6723.92 +Version: 130.0.6723.116 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 @@ -16,8 +16,6 @@ Source1: chromium-master_preferences Source2: https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/%{chromium_patches_ver}/chromium-patches-%{chromium_patches_ver}.tar.bz2 Patch1: chromium-126.0.6478.126-use-oauth2-client-switches-as-default.patch Patch2: chromium-116-0.5845.110-aarch64-include-limits.patch -Patch4: chromium-126.0.6478.126-drop-flags-unsupported-by-clang17.patch -Patch5: chromium-123.0.6312.86-clang-18.patch Patch6: chromium-123.0.6312.86-clang-18-2.patch Patch7: chromium-130.0.6723.92-fix_lib64_in_rust_bindgen.patch Patch8: chromium-130.0.6723.92-compiler-rt-adjust-paths.patch @@ -36,7 +34,6 @@ BuildRequires: libat-spi2-core-devel BuildRequires: libbrotli-devel BuildRequires: libcairo-devel BuildRequires: libcups-devel -BuildRequires: libdav1d-devel BuildRequires: libdbus-devel BuildRequires: libdrm-devel BuildRequires: libexpat-devel @@ -48,7 +45,7 @@ BuildRequires: libgcc BuildRequires: libglib-devel BuildRequires: libharfbuzz-devel BuildRequires: libicu-devel -BuildRequires: libjpeg-devel +BuildRequires: libjpeg-turbo BuildRequires: libmesa-devel BuildRequires: libminizip1-devel BuildRequires: libnspr-devel @@ -57,6 +54,8 @@ BuildRequires: libopus-devel BuildRequires: libpango-devel BuildRequires: libpng-devel BuildRequires: libpulseaudio-devel +BuildRequires: libudev-devel +BuildRequires: libwebp-devel BuildRequires: libxcb-devel BuildRequires: libxkbcommon-devel BuildRequires: libxml2-devel @@ -124,11 +123,9 @@ sed -i -e 's/\/malloc/' -e 's/\/free/' \ %patch 1 -p1 -b .use-oauth2-client-switches-as-default %patch 2 -p1 -b .aarch64-include-limits -#%patch 4 -p1 -b .drop-flags-unsupported-by-clang17 -#%patch 5 -p1 -b .clang-18 -%patch 6 -p1 -b .clang-18-2 %patch 7 -p1 -b .fix_lib64_in_rust_bindgen %patch 8 -p1 -b .compiler-rt-adjust-paths +%patch 6 -p1 -b .clang-18-2 %patch 9 -p1 -b .increase-fortify-level # Fixes for building with libstdc++ instead of libc++ @@ -430,6 +427,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver %{_mandir}/man1/chromium.1* %changelog +* Tue Nov 12 2024 Automatic Build System 130.0.6723.116-1mamba +- automatic version update by autodist + * Tue Nov 05 2024 Automatic Build System 130.0.6723.92-1mamba - automatic version update by autodist