diff options
| author | Matt Jolly <kangie@gentoo.org> | 2025-09-26 17:12:47 +1000 |
|---|---|---|
| committer | Matt Jolly <kangie@gentoo.org> | 2025-09-26 17:51:10 +1000 |
| commit | 750dfb36e60022b75e81c83400d93ee9e2abe1cc (patch) | |
| tree | 331c4210de1db66077d85ba799cb618931395331 /www-client/chromium | |
| parent | f2a96fc528a316ea7601b74a4fb9d19dc7bae778 (diff) | |
| download | gentoo-750dfb36e60022b75e81c83400d93ee9e2abe1cc.tar.gz gentoo-750dfb36e60022b75e81c83400d93ee9e2abe1cc.tar.bz2 gentoo-750dfb36e60022b75e81c83400d93ee9e2abe1cc.zip | |
www-client/chromium: fix build with bleeding-edge Rust
There's a dependency on `unicode_width` from the rust stdlib
that has been removed from modenrn Rust versions (1.91/1.92)
and as it turns out is not required for Chromium anyway.
Signed-off-by: Matt Jolly <kangie@gentoo.org>
Diffstat (limited to 'www-client/chromium')
4 files changed, 21 insertions, 1 deletions
diff --git a/www-client/chromium/chromium-138.0.7204.157.ebuild b/www-client/chromium/chromium-138.0.7204.157.ebuild index f514d0a9a2bd..3e4167d6f8d5 100644 --- a/www-client/chromium/chromium-138.0.7204.157.ebuild +++ b/www-client/chromium/chromium-138.0.7204.157.ebuild @@ -500,6 +500,13 @@ src_prepare() { sed -i 's/adler2/adler/' build/rust/std/BUILD.gn || die "Failed to tell GN that we have adler and not adler2" fi + + # chromium@0420449584e2afb7473393f536379efe194ba23c + # this crate is not included in the latest versions of Rust, + # and apparently has been unnecessary in Chromium for a long time. + sed -i '/unicode_width/d' build/rust/std/BUILD.gn || + die "Failed to remove unicode_width from build/rust/std/BUILD.gn" + fi default diff --git a/www-client/chromium/chromium-140.0.7339.185.ebuild b/www-client/chromium/chromium-140.0.7339.185.ebuild index a65823c874aa..ab23d17eb372 100644 --- a/www-client/chromium/chromium-140.0.7339.185.ebuild +++ b/www-client/chromium/chromium-140.0.7339.185.ebuild @@ -554,6 +554,12 @@ src_prepare() { die "Failed to tell GN that we have adler and not adler2" fi + # chromium@0420449584e2afb7473393f536379efe194ba23c + # this crate is not included in the latest versions of Rust, + # and apparently has been unnecessary in Chromium for a long time. + sed -i '/unicode_width/d' build/rust/std/BUILD.gn || + die "Failed to remove unicode_width from build/rust/std/BUILD.gn" + if ver_test ${RUST_SLOT} -lt "1.89.0"; then # The rust allocator was changed in 1.89.0, so we need to patch sources for older versions PATCHES+=( "${FILESDIR}/chromium-140-__rust_no_alloc_shim_is_unstable.patch" ) diff --git a/www-client/chromium/chromium-140.0.7339.207.ebuild b/www-client/chromium/chromium-140.0.7339.207.ebuild index bb378103f187..6c9e60d05518 100644 --- a/www-client/chromium/chromium-140.0.7339.207.ebuild +++ b/www-client/chromium/chromium-140.0.7339.207.ebuild @@ -561,7 +561,8 @@ src_prepare() { # chromium@0420449584e2afb7473393f536379efe194ba23c # this crate is not included in the latest versions of Rust, # and apparently has been unnecessary in Chromium for a long time. - sed -i '/unicode_width/d' build/rust/std/BUILD.gn || die "Failed to remove unicode_width from build/rust/std/BUILD.gn" + sed -i '/unicode_width/d' build/rust/std/BUILD.gn || + die "Failed to remove unicode_width from build/rust/std/BUILD.gn" if ver_test ${RUST_SLOT} -lt "1.89.0"; then # The rust allocator was changed in 1.89.0, so we need to patch sources for older versions diff --git a/www-client/chromium/chromium-141.0.7390.30.ebuild b/www-client/chromium/chromium-141.0.7390.30.ebuild index 24cab3eff426..b375fcfe6a48 100644 --- a/www-client/chromium/chromium-141.0.7390.30.ebuild +++ b/www-client/chromium/chromium-141.0.7390.30.ebuild @@ -554,6 +554,12 @@ src_prepare() { die "Failed to tell GN that we have adler and not adler2" fi + # chromium@0420449584e2afb7473393f536379efe194ba23c + # this crate is not included in the latest versions of Rust, + # and apparently has been unnecessary in Chromium for a long time. + sed -i '/unicode_width/d' build/rust/std/BUILD.gn || + die "Failed to remove unicode_width from build/rust/std/BUILD.gn" + if ver_test ${RUST_SLOT} -lt "1.89.0"; then # The rust allocator was changed in 1.89.0, so we need to patch sources for older versions PATCHES+=( "${FILESDIR}/chromium-140-__rust_no_alloc_shim_is_unstable.patch" ) |