From 44b4bc44cb3e1e9a7c6248c7d7abb718948265f9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 23 Jul 2024 01:35:31 +0200 Subject: [PATCH] chromium: update to 127.0.6533.72. --- .../chromium/patches/build-support-musl.patch | 11 +++- .../chromium-114-maldoca-include.patch | 25 -------- .../chromium-browser-ui-missing-deps.patch | 59 +++++++++++++++++++ .../patches/chromium-system-nodejs.patch | 21 +++---- .../chromium/patches/musl-no-mallinfo.patch | 20 +++---- .../patches/musl-partition-atfork.patch | 4 +- srcpkgs/chromium/template | 10 ++-- 7 files changed, 96 insertions(+), 54 deletions(-) delete mode 100644 srcpkgs/chromium/patches/chromium-114-maldoca-include.patch create mode 100644 srcpkgs/chromium/patches/chromium-browser-ui-missing-deps.patch diff --git a/srcpkgs/chromium/patches/build-support-musl.patch b/srcpkgs/chromium/patches/build-support-musl.patch index 090f7168ad4..1e5b0b8afae 100644 --- a/srcpkgs/chromium/patches/build-support-musl.patch +++ b/srcpkgs/chromium/patches/build-support-musl.patch @@ -13,7 +13,7 @@ shlib_extension = ".dylib" --- a/build/config/rust.gni +++ b/build/config/rust.gni -@@ -186,11 +186,23 @@ +@@ -185,11 +185,23 @@ rust_abi_target = "" if (is_linux || is_chromeos) { if (current_cpu == "arm64") { @@ -40,7 +40,7 @@ } else if (current_cpu == "arm") { if (arm_float_abi == "hard") { float_suffix = "hf" -@@ -199,13 +211,25 @@ +@@ -198,15 +210,31 @@ } if (arm_arch == "armv7-a" || arm_arch == "armv7") { # No way to inform Rust about the -a suffix. @@ -58,6 +58,13 @@ + rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix + } } + } else if (current_cpu == "riscv64") { +- rust_abi_target = "riscv64gc-unknown-linux-gnu" ++ if (is_musl) { ++ rust_abi_target = "riscv64gc-unknown-linux-musl" ++ } else { ++ rust_abi_target = "riscv64gc-unknown-linux-gnu" ++ } } else { # Best guess for other future platforms. - rust_abi_target = current_cpu + "-unknown-linux-gnu" diff --git a/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch b/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch deleted file mode 100644 index 0259cb9b0d0..00000000000 --- a/srcpkgs/chromium/patches/chromium-114-maldoca-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 345c58f1d85286b394c05bb8d871ac8173be90a3 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Fri, 31 Mar 2023 16:26:06 +0000 -Subject: [PATCH] IWYU: add stdint.h for int types in maldoca - ---- - third_party/maldoca/src/maldoca/ole/header.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/third_party/maldoca/src/maldoca/ole/header.h b/third_party/maldoca/src/maldoca/ole/header.h -index 174f704..41c41d5 100644 ---- a/third_party/maldoca/src/maldoca/ole/header.h -+++ b/third_party/maldoca/src/maldoca/ole/header.h -@@ -43,6 +43,8 @@ - #ifndef MALDOCA_OLE_HEADER_H_ - #define MALDOCA_OLE_HEADER_H_ - -+#include -+ - #include "absl/strings/string_view.h" - - namespace maldoca { --- -2.39.2 - diff --git a/srcpkgs/chromium/patches/chromium-browser-ui-missing-deps.patch b/srcpkgs/chromium/patches/chromium-browser-ui-missing-deps.patch new file mode 100644 index 00000000000..81c419c5028 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-browser-ui-missing-deps.patch @@ -0,0 +1,59 @@ +Source: Tom Briden +Upstream: No + +diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn +index ea57f9b16f6b8..20d8681ee9af2 100644 +--- a/chrome/browser/ui/views/side_panel/BUILD.gn ++++ b/chrome/browser/ui/views/side_panel/BUILD.gn +@@ -142,18 +142,30 @@ static_library("side_panel") { + } + public_deps = [ + "//base", ++ "//chrome/browser/cart:mojo_bindings", + "//chrome/browser/companion/core/mojom:mojo_bindings", + "//chrome/browser/profiles:profile", + "//chrome/browser/ui/actions:actions_headers", + "//chrome/browser/ui/color:color_headers", ++ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings", ++ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings", + "//chrome/browser/ui/webui/side_panel/performance_controls:mojo_bindings", ++ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings", ++ "//chrome/browser/ui:webui_name_variants", + "//chrome/common", + "//chrome/common/accessibility:mojo_bindings", ++ "//chrome/common/companion:mojo_bindings", ++ "//components/enterprise/buildflags:buildflags", ++ "//components/enterprise/common/proto:connectors_proto", + "//components/lens", + "//components/lens:buildflags", + "//components/omnibox/browser", ++ "//components/page_image_service/mojom:mojo_bindings", ++ "//components/paint_preview/buildflags:buildflags", + "//components/prefs", + "//components/search_engines", ++ "//components/segmentation_platform/public/proto:proto", ++ "//components/webapps/common:mojo_bindings", + "//content/public/browser", + "//extensions/browser", + "//extensions/common", +@@ -165,6 +177,8 @@ static_library("side_panel") { + "//ui/gfx/geometry", + "//ui/views", + "//ui/views/controls/webview", ++ "//ui/webui/resources/cr_components/commerce:mojo_bindings", ++ "//ui/webui/resources/cr_components/help_bubble:mojo_bindings", + "//url", + ] + deps = [ +diff --git a/chrome/browser/ui/webui/top_chrome/BUILD.gn b/chrome/browser/ui/webui/top_chrome/BUILD.gn +index 5830f1f5e234a..6749b8fd0da56 100644 +--- a/chrome/browser/ui/webui/top_chrome/BUILD.gn ++++ b/chrome/browser/ui/webui/top_chrome/BUILD.gn +@@ -19,6 +19,7 @@ source_set("top_chrome") { + deps = [ + "//base", + "//chrome/browser/profiles:profile", ++ "//chrome/browser/ui:webui_name_variants", + "//components/site_engagement/content:content", + "//content/public/browser", + "//ui/webui", diff --git a/srcpkgs/chromium/patches/chromium-system-nodejs.patch b/srcpkgs/chromium/patches/chromium-system-nodejs.patch index 83e8b93b9fc..78c3e965c16 100644 --- a/srcpkgs/chromium/patches/chromium-system-nodejs.patch +++ b/srcpkgs/chromium/patches/chromium-system-nodejs.patch @@ -1,20 +1,21 @@ --- a/third_party/node/node.py +++ b/third_party/node/node.py -@@ -13,11 +13,12 @@ +@@ -11,17 +11,7 @@ + + def GetBinaryPath(): - darwin_name = ('node-darwin-arm64' if platform.machine() == 'arm64' else - 'node-darwin-x64') +- if platform.machine() == 'arm64': +- darwin_path = 'mac_arm64' +- darwin_name = 'node-darwin-arm64' +- else: +- darwin_path = 'mac' +- darwin_name = 'node-darwin-x64' - return os_path.join(os_path.dirname(__file__), *{ -- 'Darwin': ('mac', darwin_name, 'bin', 'node'), +- 'Darwin': (darwin_path, darwin_name, 'bin', 'node'), - 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), - 'Windows': ('win', 'node.exe'), - }[platform.system()]) -+ #return os_path.join(os_path.dirname(__file__), *{ -+ # 'Darwin': ('mac', darwin_name, 'bin', 'node'), -+ # 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), -+ # 'Windows': ('win', 'node.exe'), -+ #}[platform.system()]) -+ return "/usr/bin/node" ++ return "/usr/bin/node" def RunNode(cmd_parts, stdout=None): diff --git a/srcpkgs/chromium/patches/musl-no-mallinfo.patch b/srcpkgs/chromium/patches/musl-no-mallinfo.patch index a58ee08a435..a495859b0b3 100644 --- a/srcpkgs/chromium/patches/musl-no-mallinfo.patch +++ b/srcpkgs/chromium/patches/musl-no-mallinfo.patch @@ -103,23 +103,23 @@ musl does not implement mallinfo()/mallinfo2() #define HAVE_MALLOC_H 1 --- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc -@@ -717,7 +717,7 @@ +@@ -660,7 +660,7 @@ - #endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID) + #endif // !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if 0 +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if (PA_BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || PA_BUILDFLAG(IS_CHROMEOS) SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW { - base::SimplePartitionStatsDumper allocator_dumper; + partition_alloc::SimplePartitionStatsDumper allocator_dumper; Allocator()->DumpStats("malloc", true, &allocator_dumper); --- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc -@@ -24,7 +24,7 @@ - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) +@@ -29,7 +29,7 @@ + #if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) // Platforms on which we override weak libc symbols. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if (PA_BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || PA_BUILDFLAG(IS_CHROMEOS) - NOINLINE void FreeForTest(void* data) { + PA_NOINLINE void FreeForTest(void* data) { free(data); diff --git a/srcpkgs/chromium/patches/musl-partition-atfork.patch b/srcpkgs/chromium/patches/musl-partition-atfork.patch index 35d810055fb..598efe24762 100644 --- a/srcpkgs/chromium/patches/musl-partition-atfork.patch +++ b/srcpkgs/chromium/patches/musl-partition-atfork.patch @@ -4,8 +4,8 @@ if (!g_global_init_called.compare_exchange_strong(expected, true)) return; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) +-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) ++#if (PA_BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || PA_BUILDFLAG(IS_CHROMEOS) // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index bd51612ed64..2fb5a781102 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,13 +1,13 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=126.0.6478.55 +version=127.0.6533.72 revision=1 archs="i686* x86_64* aarch64* armv7l*" hostmakedepends=" $(vopt_if clang "clang17 lld17 llvm17 compiler-rt") bison git gperf hwids ninja nodejs perl pkg-config python3 - libepoxy-devel libevent-devel libglib-devel rust" + libepoxy-devel libevent-devel libglib-devel rust rust-bindgen" makedepends=" alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel fontconfig-devel freetype-devel gtk+3-devel libXScrnSaver-devel @@ -28,7 +28,7 @@ maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=7ccef206f8c99e6a17b927b1b6d8018da808d75a0f46998282e0ca6cb80fe4c9 +checksum=7f21f1bfc89e1a2c474463ef950b72e6401d1375cf3c17d907bf3d346720efbe lib32disabled=yes @@ -87,6 +87,7 @@ post_patch() { tools/generate_shim_headers/generate_shim_headers.py mkdir -p third_party/node/linux/node-linux-x64/bin + rm -f third_party/node/linux/node-linux-x64/bin/node ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ } @@ -203,12 +204,11 @@ do_configure() { 'clang_base_path="/usr"' "clang_version=\"${clang_version%%.*}\"" - "gold_path=\"${XBPS_CROSS_BASE}/usr/bin/ld.gold\"" "use_custom_libcxx=$(vopt_if libcxx true false)" # https://github.com/llvm/llvm-project/issues/61705 - 'use_gold=false' 'enable_rust=true' 'rust_sysroot_absolute="/usr"' + 'rust_bindgen_root="/usr"' "rustc_version=\"$(rustc --version)\"" # is_debug makes the build a debug build, changes some things.