chromium 124.0.6315.2

2 files changed, 35 insertions, 13 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a0c4ddf..2d1be1a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -46,8 +46,8 @@ AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351
 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
 AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-122.0.6226.2.tar.xz 3305442564 BLAKE2B dc1030f1913f18ebdf382bab858a66ea555b0ee213cb02a6116cd7e68eaefec90fe2539a951efb9de01cb288106f6d521c833417f77e78a60367a4603a8d55e8 SHA512 69843914e50479111b993eadae3fa7a467d5c84c60e8ec1aa1a7e69a2401432d4d3ecf54ee71a9873e8f0f0207940a3729da67b3caf761c237b1afa9ab2976ad
 DIST chromium-123.0.6272.2.tar.xz 3402595812 BLAKE2B 4c3e2edd56585972635c2006fa6dbdcf4e3f10d6d884e8ad3a787097d47dd1af826e42cc9064fd2e52423ad8cf2086c219be047cf6d590c4378fab0f12e2aee8 SHA512 c69855b4deb0d2693eed32866bfb95591605516df7d77ed7895a7b4791b9cb9a41b5d3052f0cdfb7d166823e9ffe9547c9e48c360cb8095719d9e8da4b5b595d
+DIST chromium-124.0.6315.2.tar.xz 3442060216 BLAKE2B 95f30a53d26bbd58006521899ca658ceda2a6054652b52795a5fbf11d10a6e6c4bf768b915e9f466f5f9568cacaf7706b887ebed383b51a964b457ab56b47399 SHA512 9e360923530c39bfc8f823e98ba69928ba8c890650f34ef3a7f31d5c34343caaf4db054f44211d02de2e3aac4913dd86308d5a7cd9a5b1e52308ec5998bc4946
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-EBUILD chromium-122.0.6226.2.ebuild 39062 BLAKE2B 16b8b306d5e4340dcadb29a631fb7495df0241646e7f1692159854c5c0271b27839432421b808a767f79ca97b8e9da2179aa8f6b1f5520efe94b9516fb9e4de5 SHA512 023b44df6a05890ca89ae8cdc57f38be5303e78545be44456c5227c0db8018b96596573240404c5750847acf1bb9c4fd53b69662f7c12b7f93ab2bb5138e5b50
 EBUILD chromium-123.0.6272.2.ebuild 39756 BLAKE2B ae26fda7f31f23973acce2cc491f58d48f82248e00bf639b03bb41e2e73c2546dc62c30593d64edab548b339d8950b6086642bb946b271f2d36a711f99cfd32e SHA512 51dd8bc2a8f8aea7dff171e0aab23bbb7cdcf048efa455190e0d39b1bd6ad8f53eb91da3a39bef26e865841ece18fb64ee13a516e872b6b8e9b15cec88671c9e
+EBUILD chromium-124.0.6315.2.ebuild 39715 BLAKE2B d65f8d98f53d7695ddab2c78e73f07c22abcea564fa4237d1b7c646a12e313f82fb1ec3f3176bf03c26a4c14daf7105e2289e6d62e821da4f598e380988bb91f SHA512 b7a4e198fc547debc5bff03e49f4ce928bcaa8e5f309d381668f2823a128afe3f49de55515de57427e7d08c533d029be5348da7e3c10cfcccabb336385dc7bd8
diff --git a/www-client/chromium/chromium-122.0.6226.2.ebuild b/www-client/chromium/chromium-124.0.6315.2.ebuild
index 68e09b4..9138e6f 100644
--- a/www-client/chromium/chromium-122.0.6226.2.ebuild
+++ b/www-client/chromium/chromium-124.0.6315.2.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
 LLVM_MAX_SLOT=17
+RUST_MIN_VER=1.72.0
 
 CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
@@ -171,8 +172,9 @@ BDEPEND="
 		>=dev-util/web_page_replay_go-20220314
 		$(depend_clang_llvm_versions 17)
 	)
+	>=dev-lang/rust-${RUST_MIN_VER}[profiler]
 	dev-lang/perl
-	>=dev-util/gn-0.1807
+	>=dev-build/gn-0.2122
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
 	dev-vcs/git
@@ -318,24 +320,23 @@ src_prepare() {
 
 	local PATCHES=(
 		"${FILESDIR}/chromium-105-protobuf-RepeatedPtrField-export.patch"
-		"${FILESDIR}/chromium-120-compiler.patch"
+		"${FILESDIR}/chromium-123-compiler.patch"
 		"${FILESDIR}/chromium-122-VirtualCursor-std-layout.patch"
 		"${FILESDIR}/chromium-119-minizip.patch"
-		"${FILESDIR}/chromium-113-authenticator-request-dialog-model-include.patch"
-		"${FILESDIR}/chromium-118-blink-buildgn.patch"
 		"${FILESDIR}/chromium-118-material-color-utils.patch"
 		"${FILESDIR}/chromium-118-freetype-blink.patch"
-		"${FILESDIR}/chromium-119-minizip-types.patch"
 		"${FILESDIR}/chromium-121-blink_libxml2_downgrade.patch"
-		"${FILESDIR}/chromium-122-qrgen-disablerust.patch"
-		"${FILESDIR}/chromium-121-icu74.patch"
 
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-109-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-123-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-cross-compile.patch"
 	)
 
+	sed -i -e \
+			"/if (is_clang && toolchain_has_rust) {/,+2d" \
+			build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
+
 	default
 
 	mkdir -p third_party/node/linux/node-linux-x64/bin || die
@@ -523,6 +524,7 @@ src_prepare() {
 		third_party/pyyaml
 		third_party/qcms
 		third_party/rnnoise
+		third_party/rust
 		third_party/s2cellid
 		third_party/securemessage
 		third_party/selenium-atoms
@@ -648,6 +650,17 @@ src_prepare() {
 	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
 }
 
+chromium_rust_version_check() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	echo $rustc_version
+}
+
 chromium_configure() {
 	# Calling this here supports resumption via FEATURES=keepwork
 	python_setup
@@ -716,6 +729,18 @@ chromium_configure() {
 		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
 	fi
 
+	local rustc_ver
+		rustc_ver=$(chromium_rust_version_check)
+		if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
+			eerror "Rust >=${RUST_MIN_VER} is required"
+			eerror "Please run 'eselect rust' and select the correct rust version"
+			die "Selected rust version is too old"
+		else
+			einfo "Using rust ${rustc_ver} to build"
+		fi
+		myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
+		myconf_gn+=" rustc_version=\"${rustc_ver}\""
+
 	# Create dummy pkg-config file for libsystemd, only dependency of installer
 	mkdir "${T}/libsystemd" || die
 	cat <<- EOF > "${T}/libsystemd/libsystemd.pc"
@@ -725,9 +750,6 @@ chromium_configure() {
 	EOF
 	local -x PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+"${PKG_CONFIG_PATH}:"}${T}/libsystemd"
 
-	# Disable rust for now; it's only used for testing and we don't need the additional bdep
-	myconf_gn+=" enable_rust=false"
-
 	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
 	myconf_gn+=" is_debug=false"