Attempt 2HEADmaster

3 files changed, 20 insertions, 1 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ad46be9..ae88f10 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,6 +12,7 @@ AUX chromium-139-mv2-ungoogled-r1.patch 7358 BLAKE2B 5f48c890e4fe1c22071ee9e4275
 AUX chromium-139-mv2-ungoogled.patch 7365 BLAKE2B bec1adf79214352df32e2e7dc2ba27b773e840f8d8ef70d79096b3bf5822f5116591dae436bcb8caaf0ea3669004a9638719ec4947a704d536df3b83af05da21 SHA512 857f2ad5b4f0b9ede6018142fbced266fb09065f35f1609e66f6da0e128d40917f242923516c048d9341debdb02ef4acee33181eefcb51e797aa0754f1c94821
 AUX chromium-139-protobuf-RepeatedPtrField-export.patch 776 BLAKE2B aa491b162f812832eb03785fa14e969f87fffbaa0d61d04c3a16132f84e407aee49fdcd1e83d8ca944923f6631abdf22c13a5a52353e33f381bf208ee3401934 SHA512 a3e1e70876176ee239f548cf92da9f5bf678d568a50b3cb1e64bce7d1c61be2d3ee6edd0e6189e6cc2a21f59f3b0393280b280fdde5e4c3c0337a2327f6a515a
 AUX chromium-140-compiler.patch 17875 BLAKE2B 92f700b2c0b40c382e588eb41a965947b2e45f2893c7991a2749057c39b2aa16b9a88ad086d06ef89b11705ff2b0eb356f307910d196fe39decd7f327347f8fa SHA512 58e1240cdea826b0679db67f70a34b1c3e7e667415e0a98b8d33ce6f3125cdc1c0e2a60ae8a363964e0407e12e03fd4b3dc652f45da0f3a70dc959d53355ad19
+AUX chromium-140-rust-1.8x.patch 626 BLAKE2B 3dcd6ace2bd8e8072e0a12eb8035bfc060f59fe55b20e623ff16897bf79596991773eab4f1e7a1d1b8334a2b3193f208524f4397ba1ff10e78a70f94c7ff7723 SHA512 ecc8cdef7409f6fc2a0af5ea8f9909d30b267457120e0a87702726a213446607c9473b521420d6738d1113c6697bd0a0716d9a2097d70b9d396b3dc35d7c7660
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
 AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
@@ -22,4 +23,4 @@ DIST chromium-139.0.7246.0.tar.xz 7233007432 BLAKE2B 5529a2a430dbadb53c8afb9be75
 DIST chromium-140.0.7299.0.tar.xz 7321153548 BLAKE2B 653f6c8f4bc42d31c91191ebdb5191d59172d9a0193b9bc69769f5d7b618e7dcda53777f22fe073b9a6186f9998c73a3e5232ad21aacf205902beeaeaacb4f72 SHA512 bb4439965041b8a8169516c74cc77106c990e3d324a577bf343c6b7f77c9c1b0862624dfecc2f2bc363b92c69a8723934fbc22a630438a57876cd340d86bf236
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 EBUILD chromium-139.0.7246.0.ebuild 40548 BLAKE2B 3c6f496e780b9b6cfe19f128e8d52c8a5e4b2b4eb8ff08a9b9d00365a2abb43af090fb5c99e53dd11181ad599be4572e5e18eabfbf2cb45e2ba5b6b730fa504e SHA512 1bab5ac1a9c22635c357f5fe0372b4447daba09b27dc5821d6233390ea07634fcbc4b2bf0d328163209c3694ae750d17695c8bc65d84519c75e14f287c0d8709
-EBUILD chromium-140.0.7299.0.ebuild 40650 BLAKE2B 519b795dffce5fcf693000ce23d866f350f2a6669e95d6126b2ece0c5ceae19684ce66b42282a57c0f3ad33761228d99dacbfd4061c5ccba1243529c400c604e SHA512 94cee2be6f283d7fa4863264aba9153e657f7272e35d51b3a0bf038c6b91251ea9f4ff536af8d3b806caa91fb75bf6976b0d4bb428ceced4bb55be44d2690e5d
+EBUILD chromium-140.0.7299.0.ebuild 40695 BLAKE2B 3e05aeb987c2d21aa8e89c98bf932eb537d2b85386e6a7aeb917100cb8d842654c9e3951d58f17440bebfac6741d31ccd111231a7e564ff8cbc03d466b9552cc SHA512 17d4e2ae546fd43ea4ed280d690520412b4fddac6aa9104c0dbc92c9252ea63a3a982208ea2760eb5177f3a33b2d02ed1218a950915c4ef7bc6b0c8af9c4d3d6
diff --git a/www-client/chromium/chromium-140.0.7299.0.ebuild b/www-client/chromium/chromium-140.0.7299.0.ebuild
index f4d0294..7f1b04a 100644
--- a/www-client/chromium/chromium-140.0.7299.0.ebuild
+++ b/www-client/chromium/chromium-140.0.7299.0.ebuild
@@ -320,6 +320,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-126-freetype-blink.patch"
 		"${FILESDIR}/chromium-124-metrics-histograms-nodepotbin.patch"
 		"${FILESDIR}/chromium-138-gn-exec_script_allowlist.patch"
+		"${FILESDIR}/chromium-140-rust-1.8x.patch"
 		"${FILESDIR}/chromium-139-mv2-ungoogled-r1.patch"
 
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
diff --git a/www-client/chromium/files/chromium-140-rust-1.8x.patch b/www-client/chromium/files/chromium-140-rust-1.8x.patch
new file mode 100644
index 0000000..84a7ed8
--- /dev/null
+++ b/www-client/chromium/files/chromium-140-rust-1.8x.patch
@@ -0,0 +1,17 @@
+diff --git a/build/rust/allocator/lib.rs b/build/rust/allocator/lib.rs
+index 29b3af1274..142c6e6084 100644
+--- a/build/rust/allocator/lib.rs
++++ b/build/rust/allocator/lib.rs
+@@ -90,6 +90,12 @@ mod both_allocators {
+     #[linkage = "weak"]
+     fn __rust_no_alloc_shim_is_unstable_v2() {}
+ 
++    // TODO(crbug.com/422538133) Remove after rolling past
++    // https://github.com/rust-lang/rust/pull/141061
++    #[no_mangle]
++    #[linkage = "weak"]
++    static __rust_no_alloc_shim_is_unstable: u8 = 0;
++
+     // Mangle the symbol name as rustc expects.
+     #[rustc_std_internal_symbol]
+     #[allow(non_upper_case_globals)]