From cc2e0d6465c7a805a18be2f1c9e5a411304a89bc Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sat, 22 Feb 2025 13:49:49 -0500 Subject: Revert "rust 1.85 ebuild no longer has the option for pretending nightly..." This reverts commit e1009929f0d692ee0bc5488c3f9041d451201a01. --- www-client/chromium/Manifest | 3 +-- www-client/chromium/chromium-135.0.7023.0.ebuild | 1 - .../chromium/files/chromium-135-rust-stable.patch | 31 ---------------------- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 www-client/chromium/files/chromium-135-rust-stable.patch (limited to 'www-client/chromium') diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 8910168..1a1caeb 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -27,7 +27,6 @@ AUX chromium-134-EnumTable-crash.patch 3068 BLAKE2B 8b3bad8e20d6c3477495792279b1 AUX chromium-134-gn-exec_script_allowlist.patch 2328 BLAKE2B d5e4ebeff797fa02b4e41da1cbc8f90bdfdf3250e627e387c8b482b5f163703e835da0e06e2d543d7d81fc990fa5093c6495fa5f7858b5c692a9d0b10fe21914 SHA512 c47330b69dd6fa1d0ca91ebf2927fe8f5c75c9e6a9ebb5959ed7590665b05d297c494222c786cba5c3530dcb8ad0fa08e87f0cb2942daeb403b812e5879b684f AUX chromium-135-mv2-ungoogled.patch 8653 BLAKE2B 21947e2a25bb5306c63c93de772c41a06e2199a318e90888197d8d7c04bc55ad445a0a5984e84ec6238b80043851b427e4ef1e627dfd41da100b3d1948f6be0c SHA512 d77df69c86b4d91ffb7dbeb8b5640bafab03845c69c50bb0dd9c8b23b4d5d1658f1b9866eb7d0f80a757625e5882f5c65297c6dafe8ed8337de7c2fe5fced032 AUX chromium-135-protobuf-RepeatedPtrField-export.patch 812 BLAKE2B ba7d6eca5967bfe7324b384bea5b80feb2fdf9013bc32a618ab3fa18b6c143c889e1691c7a9fff501fe8d6c9794e28a2b3541e9aac97614bd1f4a4891e78ca89 SHA512 8d9ba3b598ce70d20635372427d7134d6ebf7951e9015124d8cf928e745b1f234c199929adcdfa738583fabb87800e154ef2219f15a9489f5b64a1e477b3930e -AUX chromium-135-rust-stable.patch 1264 BLAKE2B 38beac55ee9e86de138db4ac993cd7d2d68f3ab443b219c8ea37fbc36b5238034cf2adc0b905458b7b358872204106d5f1cfdcbabf7d6d8024bbff80ae0e8022 SHA512 81bdd06eb09cb6e8ea3865dede8fb0336f76eb08b17eadae0853ba20e80ac8e40074d5ab1d15c40a795d3fc1f01b4718f055b6460381b734dfcea93db4d0ff74 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 @@ -38,4 +37,4 @@ DIST chromium-135.0.6999.2.tar.xz 7004861732 BLAKE2B c03d771863e69568bb1d5502ed0 DIST chromium-135.0.7023.0.tar.xz 6994083592 BLAKE2B 097202e647c386218f33e7ef8f03f115def0ad85c46faa94d233a05d43c2e25cdea16f34de7ff42fe279b23a1874e27adfafe7b95648edbf02b2fe1799e8fa1f SHA512 01a68c3387fccb35b4c48ad039e2420bff863f670fb6075a9c7cd0ce9130038ed2617ce2abad0c1cf383e4f5e189d01b97e4429589cecdba4755ef7d1ef72d83 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c EBUILD chromium-135.0.6999.2.ebuild 40476 BLAKE2B bf189c621aebb0c01e40f9e294e789889d494cc2348ce49f75d7cf09791435343b69bee42e87cddc911044b399ce8daf9044cc153be0fa3bd8627665432fabfb SHA512 2d917f72a0c1c508163124484a6ff81cab8047018ef57ae7240fbab9794ab81fb67a96200175e790f60d9b36ef45ec0de193d907cf102bdfe6e738bc5ceaf783 -EBUILD chromium-135.0.7023.0.ebuild 40517 BLAKE2B 9c30acb25dc363535819bca534e7a11f07828b2d4bbf5df0fe638672d598f8430a1ac8dc5fe7d696652728fa15aeb292b7fa01534fe83f49fad1f2557de5f4a6 SHA512 8a479f81bc25fe4b4bff056c33aff8a7b74f90f77ae4fdeea9dff7b53d55884ef861bcc2d550244f9aafdcc591e4fbddbf54cb4791aed67cde2c68b09b579b26 +EBUILD chromium-135.0.7023.0.ebuild 40470 BLAKE2B 775d2a5f0479096302c7ebe84d06e6e7a156e6ad2e5a04537915abb88f69fad9288381592a8ffa499178e2a9fb1045960369a73c2f06e739425bac803532d0f9 SHA512 5a7d39d6d911016d956d5127e8505b4f55fad442d9d0f395ac6971d6510a90a8e2a360ae19019867a9750c3f8885eddfc5411156dfb9a1001d024b3cae5114b5 diff --git a/www-client/chromium/chromium-135.0.7023.0.ebuild b/www-client/chromium/chromium-135.0.7023.0.ebuild index 0635e60..262e910 100644 --- a/www-client/chromium/chromium-135.0.7023.0.ebuild +++ b/www-client/chromium/chromium-135.0.7023.0.ebuild @@ -323,7 +323,6 @@ src_prepare() { "${FILESDIR}/chromium-124-metrics-histograms-nodepotbin.patch" "${FILESDIR}/chromium-134-gn-exec_script_allowlist.patch" "${FILESDIR}/chromium-135-mv2-ungoogled.patch" - "${FILESDIR}/chromium-135-rust-stable.patch" "${FILESDIR}/chromium-111-InkDropHost-crash.patch" "${FILESDIR}/chromium-134-EnumTable-crash.patch" diff --git a/www-client/chromium/files/chromium-135-rust-stable.patch b/www-client/chromium/files/chromium-135-rust-stable.patch deleted file mode 100644 index 1b9bfb6..0000000 --- a/www-client/chromium/files/chromium-135-rust-stable.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/third_party/rust/chromium_crates_io/vendor/bytemuck-1.21.0/src/lib.rs b/third_party/rust/chromium_crates_io/vendor/bytemuck-1.21.0/src/lib.rs -index 3ae485ae66..c8770c9a5b 100644 ---- a/third_party/rust/chromium_crates_io/vendor/bytemuck-1.21.0/src/lib.rs -+++ b/third_party/rust/chromium_crates_io/vendor/bytemuck-1.21.0/src/lib.rs -@@ -5,16 +5,16 @@ - #![allow(clippy::uninlined_format_args)] - #![allow(clippy::result_unit_err)] - #![allow(clippy::type_complexity)] --#![cfg_attr(feature = "nightly_docs", feature(doc_cfg))] --#![cfg_attr(feature = "nightly_portable_simd", feature(portable_simd))] --#![cfg_attr(feature = "nightly_float", feature(f16, f128))] --#![cfg_attr( -- all( -- feature = "nightly_stdsimd", -- any(target_arch = "x86_64", target_arch = "x86") -- ), -- feature(stdarch_x86_avx512) --)] -+//#![cfg_attr(feature = "nightly_docs", feature(doc_cfg))] -+//#![cfg_attr(feature = "nightly_portable_simd", feature(portable_simd))] -+//#![cfg_attr(feature = "nightly_float", feature(f16, f128))] -+//#![cfg_attr( -+// all( -+// feature = "nightly_stdsimd", -+// any(target_arch = "x86_64", target_arch = "x86") -+// ), -+// feature(stdarch_x86_avx512) -+//)] - - //! This crate gives small utilities for casting between plain data types. - //! -- cgit v1.2.3