From d2923650b8f88aee534125b278ca88ac17b8fda7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 9 Apr 2026 02:39:00 +0200 Subject: [PATCH] chromium: update to 147.0.7727.55. --- .../files/musl-patches/libc++-musl.patch | 11 --- ...um-124-iwyu-sys-select-dawn-terminal.patch | 24 ------- ...-147-aarch64-musl-no-memory-tagging.patch} | 10 +++ .../patches/chromium-147-llvm-22.patch | 11 +++ ...atch => chromium-147-musl-toolchain.patch} | 69 ++++++++++++++++--- srcpkgs/chromium/template | 6 +- 6 files changed, 83 insertions(+), 48 deletions(-) delete mode 100644 srcpkgs/chromium/files/musl-patches/libc++-musl.patch delete mode 100644 srcpkgs/chromium/patches/chromium-124-iwyu-sys-select-dawn-terminal.patch rename srcpkgs/chromium/patches/{aarch64-musl-no-memory-tagging.patch => chromium-147-aarch64-musl-no-memory-tagging.patch} (67%) create mode 100644 srcpkgs/chromium/patches/chromium-147-llvm-22.patch rename srcpkgs/chromium/patches/{chromium-140-musl-toolchain.patch => chromium-147-musl-toolchain.patch} (52%) diff --git a/srcpkgs/chromium/files/musl-patches/libc++-musl.patch b/srcpkgs/chromium/files/musl-patches/libc++-musl.patch deleted file mode 100644 index 11de10fc77db08..00000000000000 --- a/srcpkgs/chromium/files/musl-patches/libc++-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/buildtools/third_party/libc++/__config_site -+++ b/buildtools/third_party/libc++/__config_site -@@ -25,7 +25,7 @@ - #define _LIBCPP_HAS_THREADS 1 - #define _LIBCPP_HAS_MONOTONIC_CLOCK 1 - #define _LIBCPP_HAS_TERMINAL 1 --#define _LIBCPP_HAS_MUSL_LIBC 0 -+#define _LIBCPP_HAS_MUSL_LIBC 1 - - #ifdef _WIN32 - #define _LIBCPP_HAS_THREAD_API_PTHREAD 0 diff --git a/srcpkgs/chromium/patches/chromium-124-iwyu-sys-select-dawn-terminal.patch b/srcpkgs/chromium/patches/chromium-124-iwyu-sys-select-dawn-terminal.patch deleted file mode 100644 index cc7299aafffc39..00000000000000 --- a/srcpkgs/chromium/patches/chromium-124-iwyu-sys-select-dawn-terminal.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cf993f56ce699ca0ed66ca5a6b88fe7b31c03a75 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" -Date: Fri, 5 Apr 2024 06:08:21 +0200 -Subject: [PATCH] iwyu: sys/select.h in terminal utils - -required for fd_set. fixes building on musl libc - -Change-Id: I5c03d58c8337c1af871024a436b09117ad9206d4 ---- - src/tint/utils/system/terminal_posix.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/dawn/src/tint/utils/system/terminal_posix.cc b/third_party/dawn/src/tint/utils/system/terminal_posix.cc -index e820774244..a97eab7db8 100644 ---- a/third_party/dawn/src/tint/utils/system/terminal_posix.cc -+++ b/third_party/dawn/src/tint/utils/system/terminal_posix.cc -@@ -27,6 +27,7 @@ - - // GEN_BUILD:CONDITION(tint_build_is_linux || tint_build_is_mac) - -+#include - #include - - #include diff --git a/srcpkgs/chromium/patches/aarch64-musl-no-memory-tagging.patch b/srcpkgs/chromium/patches/chromium-147-aarch64-musl-no-memory-tagging.patch similarity index 67% rename from srcpkgs/chromium/patches/aarch64-musl-no-memory-tagging.patch rename to srcpkgs/chromium/patches/chromium-147-aarch64-musl-no-memory-tagging.patch index 3142e42d9dfb22..d8a5515cee14a3 100644 --- a/srcpkgs/chromium/patches/aarch64-musl-no-memory-tagging.patch +++ b/srcpkgs/chromium/patches/chromium-147-aarch64-musl-no-memory-tagging.patch @@ -20,3 +20,13 @@ #define HAS_HW_CAPS #endif +--- a/base/allocator/partition_allocator/partition_alloc.gni ++++ b/base/allocator/partition_allocator/partition_alloc.gni +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/linux/musl.gni") + import("//build_overrides/partition_alloc.gni") + + # ----------------------------------------------------------------------------- diff --git a/srcpkgs/chromium/patches/chromium-147-llvm-22.patch b/srcpkgs/chromium/patches/chromium-147-llvm-22.patch new file mode 100644 index 00000000000000..5080805a78db1c --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-147-llvm-22.patch @@ -0,0 +1,11 @@ +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -617,7 +617,7 @@ + # https://crbug.com/484082200 for background and https://crrev.com/c/7593035 + # for discussion. + if (!is_wasm) { +- cflags += [ "-fno-lifetime-dse" ] ++ # cflags += [ "-fno-lifetime-dse" ] + } + + # TODO(hans): Remove this once Clang generates better optimized debug info diff --git a/srcpkgs/chromium/patches/chromium-140-musl-toolchain.patch b/srcpkgs/chromium/patches/chromium-147-musl-toolchain.patch similarity index 52% rename from srcpkgs/chromium/patches/chromium-140-musl-toolchain.patch rename to srcpkgs/chromium/patches/chromium-147-musl-toolchain.patch index 38cfb223a5bb1f..420bac71da19f8 100644 --- a/srcpkgs/chromium/patches/chromium-140-musl-toolchain.patch +++ b/srcpkgs/chromium/patches/chromium-147-musl-toolchain.patch @@ -1,18 +1,19 @@ ---- a/build/toolchain/toolchain.gni -+++ b/build/toolchain/toolchain.gni -@@ -51,6 +51,10 @@ - } - } - +--- /dev/null 2026-04-08 02:08:03.222890460 +0200 ++++ b/build/config/linux/musl.gni 2026-04-10 01:18:23.479529250 +0200 +@@ -0,0 +1,3 @@ +declare_args() { + is_musl = false +} -+ - # Extension for shared library files (including leading dot). - if (is_apple) { - shlib_extension = ".dylib" --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn +@@ -20,6 +20,7 @@ + import("//build/config/rust.gni") + import("//build/config/ui.gni") + import("//build/config/unwind.gni") ++import("//build/config/linux/musl.gni") + import("//build/toolchain/rbe.gni") + import("//build/toolchain/toolchain.gni") + import("//build_overrides/build.gni") @@ -1282,8 +1282,13 @@ # simplicity we always explicitly set the architecture. if (current_cpu == "x64") { @@ -61,3 +62,51 @@ } } else if (current_cpu == "mipsel") { ldflags += [ "-Wl,--hash-style=sysv" ] +--- a/buildtools/third_party/libc++/__config_site ++++ b/buildtools/third_party/libc++/__config_site +@@ -26,12 +26,6 @@ + #define _LIBCPP_HAS_MONOTONIC_CLOCK 1 + #define _LIBCPP_HAS_TERMINAL 1 + +-#ifdef ANDROID_HOST_MUSL +-#define _LIBCPP_HAS_MUSL_LIBC 1 +-#else +-#define _LIBCPP_HAS_MUSL_LIBC 0 +-#endif +- + #ifdef _WIN32 + #define _LIBCPP_HAS_THREAD_API_PTHREAD 0 + #define _LIBCPP_HAS_THREAD_API_EXTERNAL 0 +--- a/build/config/rust.gni ++++ b/build/config/rust.gni +@@ -5,6 +5,7 @@ + import("//build/config/chrome_build.gni") + import("//build/config/compiler/compiler.gni") + import("//build/config/sanitizers/sanitizers.gni") ++import("//build/config/linux/musl.gni") + import("//build/toolchain/toolchain.gni") + + if (is_android) { +--- a/build/config/c++/BUILD.gn ++++ b/build/config/c++/BUILD.gn +@@ -3,6 +3,7 @@ + import("//build/config/chromeos/ui_mode.gni") + import("//build/config/compiler/compiler.gni") + import("//build/config/dcheck_always_on.gni") ++import("//build/config/linux/musl.gni") + import("//buildtools/deps_revisions.gni") + + assert(use_custom_libcxx, "should only be used if use_custom_libcxx is set") +@@ -60,6 +61,12 @@ + + defines += [ "CR_LIBCXX_REVISION=$libcxx_revision" ] + ++ if (is_musl) { ++ defines += [ "_LIBCPP_HAS_MUSL_LIBC=1" ] ++ } else { ++ defines += [ "_LIBCPP_HAS_MUSL_LIBC=0" ] ++ } ++ + if (is_win) { + # Intentionally not using libc++abi on Windows because libc++abi only + # implements the Itanium C++ ABI, and not the Microsoft ABI which we use on diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index d9840bba772fb2..7e1ce64b243fa1 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,11 +1,11 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=146.0.7680.177 +version=147.0.7727.55 revision=1 _rollup=4.22.4 archs="i686* x86_64* aarch64* armv7l*" -_llvmver=21 +_llvmver=22 hostmakedepends=" $(vopt_if clang "clang${_llvmver} lld${_llvmver} llvm${_llvmver} compiler-rt${_llvmver}") bison git gperf hwids ninja nodejs perl pkg-config python3 @@ -36,7 +36,7 @@ homepage="https://www.chromium.org/" # distfiles="https://chromium.googlesource.com/chromium/src.git/+archive/refs/tags/${version}.tar.gz" distfiles="https://github.com/chromium-linux-tarballs/chromium-tarballs/releases/download/${version}/chromium-${version}-linux.tar.xz https://registry.npmjs.org/@rollup/wasm-node/-/wasm-node-${_rollup}.tgz" -checksum="b0dbfa58893c4ae6e8bb074b86fd2ebf107dbf1604b5f60bda162df712808c0c +checksum="39ee033238284174dc3bd1a24f6508ff63292134216bb02b217a5ad50ce32a26 ee49bf67bd9bee869405af78162d028e2af0fcfca80497404f56b1b99f272717" skip_extraction="wasm-node-${_rollup}.tgz"