chromium: update to 151.0.7922.71.
This commit is contained in:
Duncaen
@@ -1,21 +0,0 @@
|
||||
diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.cc.me chromium-117.0.5938.62/net/dns/host_resolver_cache.cc
|
||||
diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me chromium-117.0.5938.62/net/dns/host_resolver_cache.h
|
||||
--- chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me 2023-09-14 15:21:24.632965004 +0200
|
||||
+++ chromium-117.0.5938.62/net/dns/host_resolver_cache.h 2023-09-15 09:15:48.511300845 +0200
|
||||
@@ -143,12 +143,14 @@ class NET_EXPORT HostResolverCache final
|
||||
}
|
||||
|
||||
bool operator()(const Key& lhs, const KeyRef& rhs) const {
|
||||
+ const std::string rhs_domain_name{rhs.domain_name};
|
||||
return std::tie(lhs.domain_name, lhs.network_anonymization_key) <
|
||||
- std::tie(rhs.domain_name, *rhs.network_anonymization_key);
|
||||
+ std::tie(rhs_domain_name, *rhs.network_anonymization_key);
|
||||
}
|
||||
|
||||
bool operator()(const KeyRef& lhs, const Key& rhs) const {
|
||||
- return std::tie(lhs.domain_name, *lhs.network_anonymization_key) <
|
||||
+ const std::string lhs_domain_name{lhs.domain_name};
|
||||
+ return std::tie(lhs_domain_name, *lhs.network_anonymization_key) <
|
||||
std::tie(rhs.domain_name, rhs.network_anonymization_key);
|
||||
}
|
||||
};
|
||||
@@ -1,40 +0,0 @@
|
||||
From 96e74ccdbab3edda23ca04c28cdfd9c25f622663 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Jolly <kangie@gentoo.org>
|
||||
Date: Tue, 16 Jun 2026 21:57:07 -0700
|
||||
Subject: [PATCH] build: Fix get_path_info on empty ar in unbundle toolchain
|
||||
|
||||
Some toolchains leave ar empty during initial setup, causing GN to error
|
||||
when get_path_info() is called with an empty string. Guard the check to
|
||||
only run when ar is not empty.
|
||||
|
||||
Signed-off-by: Matt Jolly <kangie@gentoo.org>
|
||||
Change-Id: I87615806ddfda6f262a7500b0c5b6fed1f452985
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7949777
|
||||
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
|
||||
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
|
||||
Reviewed-by: Matt Stark <msta@google.com>
|
||||
Cr-Commit-Position: refs/heads/main@{#1648076}
|
||||
---
|
||||
build/toolchain/gcc_toolchain.gni | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
|
||||
index 1f434d4ead440..f82ee44f323e2 100644
|
||||
--- a/build/toolchain/gcc_toolchain.gni
|
||||
+++ b/build/toolchain/gcc_toolchain.gni
|
||||
@@ -407,8 +407,13 @@ template("single_gcc_toolchain") {
|
||||
command = "cmd /s /c \"\"$python_path\" $tool_wrapper_path delete-file {{output}} && $command\""
|
||||
} else {
|
||||
command = "rm -f {{output}} && $command"
|
||||
- inputs =
|
||||
- [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ]
|
||||
+
|
||||
+ # Add ar to inputs if it's not from $PATH. Some toolchains leave
|
||||
+ # |ar| empty during toolchain setup, so guard get_path_info() here.
|
||||
+ if (ar != "" && get_path_info(ar, "file") != ar) {
|
||||
+ inputs =
|
||||
+ [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ]
|
||||
+ }
|
||||
}
|
||||
|
||||
# Almost all targets build with //build/config/compiler:thin_archive which
|
||||
@@ -1,33 +0,0 @@
|
||||
From 0bd622221d825f254dbe85dfd3cb7716f4763ecd Mon Sep 17 00:00:00 2001
|
||||
From: Matt Jolly <kangie@gentoo.org>
|
||||
Date: Sun, 14 Jun 2026 11:25:31 +1000
|
||||
Subject: [PATCH] modules: Only set --sysroot if sysroot is set
|
||||
|
||||
This enables downstream distro builds that don't use the sysroot to
|
||||
evaluate the file without GN getting upset.
|
||||
|
||||
Signed-off-by: Matt Jolly <kangie@gentoo.org>
|
||||
Change-Id: If6a9efe52d6707fd0bfaddeddd9e5b72e756147f
|
||||
---
|
||||
|
||||
diff --git a/build/modules/BUILD.gn b/build/modules/BUILD.gn
|
||||
index 0c1cf49..77911d1 100644
|
||||
--- a/build/modules/BUILD.gn
|
||||
+++ b/build/modules/BUILD.gn
|
||||
@@ -230,10 +230,12 @@
|
||||
} else {
|
||||
# We need to pass the sysroot in so that it can scan it to generate a
|
||||
# modulemap for the sysroot headers.
|
||||
- args += [
|
||||
- "--sysroot",
|
||||
- rebase_path(sysroot, root_build_dir),
|
||||
- ]
|
||||
+ if (defined(sysroot) && sysroot != "") {
|
||||
+ args += [
|
||||
+ "--sysroot",
|
||||
+ rebase_path(sysroot, root_build_dir),
|
||||
+ ]
|
||||
+ }
|
||||
}
|
||||
args += [
|
||||
"--",
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
From 27f8690db999f6e56f0af7a9ea3d28a019ed72ca Mon Sep 17 00:00:00 2001
|
||||
From: Fumitoshi Ukai <ukai@google.com>
|
||||
Date: Tue, 30 Jun 2026 18:32:03 -0700
|
||||
Subject: [PATCH] don't depends on histograms.xml if it is not git checkout
|
||||
|
||||
histograms.xml is only generated on git checkout.
|
||||
|
||||
Bug: 329080012
|
||||
Change-Id: Iea4484f8af4cf9ef25e25ea1df2c616fbe46ed5c
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8019063
|
||||
Reviewed-by: Jesse McKenna <jessemckenna@google.com>
|
||||
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
|
||||
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
|
||||
Cr-Commit-Position: refs/heads/main@{#1655184}
|
||||
---
|
||||
tools/metrics/BUILD.gn | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/tools/metrics/BUILD.gn b/tools/metrics/BUILD.gn
|
||||
index c826e9708bf6a6..23799c76dd7ef1 100644
|
||||
--- a/tools/metrics/BUILD.gn
|
||||
+++ b/tools/metrics/BUILD.gn
|
||||
@@ -41,11 +41,11 @@ group("metrics_metadata") {
|
||||
]
|
||||
|
||||
# Only include histograms_xml if we have access to dirmd data, which
|
||||
- # is used to populate ownership information. This is only set to false
|
||||
- # for non-git checkouts.
|
||||
- # TODO(crbug.com/329080012): Remove this once dirmd works in non-git
|
||||
- # checkouts.
|
||||
- if (generate_location_tags) {
|
||||
+ # is used to populate ownership information. This is disabled
|
||||
+ # for non-git checkouts, as dirmd doesn't work on non-git checkout.
|
||||
+ # TODO(crbug.com/329080012): Remove this condition once dirmd works
|
||||
+ # in non-git checkouts.
|
||||
+ if (path_exists("//.git")) {
|
||||
deps += [ ":histograms_xml" ]
|
||||
}
|
||||
}
|
||||
+8
-8
@@ -12,12 +12,12 @@ Disable clang flags not supported by llvm 22.
|
||||
cflags += invoker.cflags
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -590,7 +590,7 @@
|
||||
# Flags for diagnostics.
|
||||
@@ -578,7 +578,7 @@
|
||||
cflags += [ "-fcolor-diagnostics" ]
|
||||
if (!is_win) {
|
||||
- cflags += [ "-fdiagnostics-show-inlining-chain" ]
|
||||
+ # cflags += [ "-fdiagnostics-show-inlining-chain" ]
|
||||
} else {
|
||||
# Combine after https://github.com/llvm/llvm-project/pull/192241
|
||||
cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
|
||||
if (!is_wasm) {
|
||||
if (!is_win) {
|
||||
- cflags += [ "-fdiagnostics-show-inlining-chain" ]
|
||||
+ # cflags += [ "-fdiagnostics-show-inlining-chain" ]
|
||||
} else {
|
||||
# Combine after https://github.com/llvm/llvm-project/pull/192241
|
||||
cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
|
||||
@@ -1,7 +1,7 @@
|
||||
# Template file for 'chromium'
|
||||
pkgname=chromium
|
||||
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
|
||||
version=150.0.7871.181
|
||||
version=151.0.7922.71
|
||||
revision=1
|
||||
_rollup=4.22.4
|
||||
archs="i686* x86_64* aarch64* armv7l*"
|
||||
@@ -10,7 +10,7 @@ hostmakedepends="
|
||||
$(vopt_if clang "clang${_llvmver} lld${_llvmver} llvm${_llvmver} compiler-rt${_llvmver}")
|
||||
bison git gperf hwids ninja nodejs perl pkg-config python3
|
||||
libepoxy-devel libglib-devel rust rust-bindgen esbuild
|
||||
gn $(vopt_if qt6 qt6-base)"
|
||||
go gn $(vopt_if qt6 qt6-base)"
|
||||
makedepends="
|
||||
alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel
|
||||
fontconfig-devel freetype-devel gtk+3-devel libXScrnSaver-devel
|
||||
@@ -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="155909b5bfe5fff29e21291ee71ebf8a05b8386686216cb1f86784ac3409a460
|
||||
checksum="b0bafa1501f47ad27c96c9b5451bb000058ab40ee0dc945a066d3bd614e84a2f
|
||||
ee49bf67bd9bee869405af78162d028e2af0fcfca80497404f56b1b99f272717"
|
||||
|
||||
skip_extraction="wasm-node-${_rollup}.tgz"
|
||||
@@ -107,6 +107,9 @@ post_patch() {
|
||||
rm -f third_party/node/linux/node-linux-x64/bin/node
|
||||
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
|
||||
|
||||
mkdir -p third_party/dawn/tools/golang/linux-amd64/bin
|
||||
ln -s /usr/bin/go third_party/dawn/tools/golang/linux-amd64/bin/go
|
||||
|
||||
rm -rv third_party/devtools-frontend/src/node_modules/rollup
|
||||
mkdir third_party/devtools-frontend/src/node_modules/rollup
|
||||
vsrcextract -C third_party/devtools-frontend/src/node_modules/rollup --strip-components=1 "wasm-node-${_rollup}.tgz"
|
||||
@@ -389,11 +392,12 @@ do_install() {
|
||||
vinstall chrome/installer/linux/common/desktop.template 644 usr/share/applications chromium.desktop
|
||||
vman chrome/app/resources/manpage.1.in chromium.1
|
||||
|
||||
sed -i \
|
||||
vsed -i \
|
||||
-e 's/@@MENUNAME/Chromium/g' \
|
||||
-e 's/@@PACKAGE/chromium/g' \
|
||||
-e 's/@@usr_bin_symlink_name/chromium/g' \
|
||||
-e 's/@@uri_scheme/x-scheme-handler\/chromium;/g' \
|
||||
-e 's/@@startup_wm_class/chromium/g' \
|
||||
-e '/@@extra_desktop_entries/d' \
|
||||
${DESTDIR}/usr/share/man/man1/chromium.1 \
|
||||
${DESTDIR}/usr/share/applications/chromium.desktop
|
||||
|
||||
Reference in New Issue
Block a user