From a576850a8aa8a3d4b5f22cbe4e8e195034da9330 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sat, 20 Sep 2025 15:20:05 -0400 Subject: that's not the correct way apparently --- www-client/chromium/Manifest | 2 +- .../chromium/files/chromium-142-crabbyavif-rust18x.patch | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'www-client/chromium') diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 987664c..88b4a1b 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -20,7 +20,7 @@ AUX chromium-141-mv2-ungoogled.patch 7180 BLAKE2B 5d4c0aa6c85aa62d77691b64ef9f99 AUX chromium-142-blink-observable_array-css.patch 631 BLAKE2B 24b1cc54353bcb61da6e7986ee2d7c7e64ec53c296d3bd346287bf354465ac36928f0f989f699624a7dff18f73aa3141e3d4d2860c4044f99231bcb0c611b731 SHA512 2812e8def0186293889067b5b7a65860e9d852f3b1661c3306101b7f97a38ea9c383dab08cbaa23a00212ccd0c3af7eeb73c1e5029f4f7c9866707b14541ada8 AUX chromium-142-compiler-r1.patch 19727 BLAKE2B dfe123c98038ffc20f9012a3267bc361a0dff59349f8c43ce62c9babba0908f15234e23603c62cc77c04a39cde0287a5c0bbe348a7bcf6ac8eddc6b9c80910ee SHA512 0b2d8a45adbfd22c4f57f73dd0bab8a2cab88a131cb1aec5ee587a6a08c30cc8d9828c133ea84d543420ea1a8fc28a36fa580b09776695f9c9ef20f1c025dadd AUX chromium-142-compiler.patch 19923 BLAKE2B 02a8d8708291b35902019ce37f2b790f336e7e4fcfc89aabdedfc0e088cf4dde87244f93381e8a5c5b71a22f2aa6eaa92d93afdec92b22a8a0714cb54067a1e5 SHA512 af051a3691693a6cc39fa6b0f7a8084a019cb72e9b9b49d1aff48ef2c32bdcbc68144ef8ecc7375702a7d5433d443c7ae33d10bd633565cfd4b2316b93375319 -AUX chromium-142-crabbyavif-rust18x.patch 2216 BLAKE2B 39193237b10c378309e9d7c4a239dd4adcfdeb3943c976401ecca4c5decd7f05992e055acb515bb4b6368585408a0f718556213b4a6dba0a40b2886e236b1c07 SHA512 6c9e25c398a40d9bb696f2cbcda94cbb4c404dff7c52c7f3bc00c8a46da5fec3c07e6102f9ddc0baf882b0a0cafe505274756466a0e18090fef8b66d45c8d084 +AUX chromium-142-crabbyavif-rust18x.patch 2292 BLAKE2B b8d6cbbaa5d31441ff817d90a42149ab95ea89b545da597d9d6604a7859fc6568a20f7efb3525156d6fafc9532d695d308911ee19d117a138c202085b33b6858 SHA512 81f1b0e932f9f45d2550e6ff083c41d9113eff156f5d8ed4106e58a9c5c22bb64f24e5381212f47af4b4140af08420189c305a833d2e3eb6532a43914510a11e AUX chromium-142-rust-1.8x-r1.patch 891 BLAKE2B aa1a4179ef6365fdc8a8c8faecbe115fd30a08eae93a0babdbaac2ad75cab1127ea660a506fdf67c49247fc02d7deafcb45a161f3c2c2592e3789f87447ca10b SHA512 2fd0b420ee67f5481c17e6f31c2fef12d225c8cac2ef0f2a470a0d626e58bf5ec005807809a2f970194af24c6d2bfad9ba58547772e8e89c6bcc0c1301575f88 AUX chromium-142-rust-1.8x.patch 644 BLAKE2B b1d78eb9693a7b73aace188d1c6d1ef634eeb4a8c4d15f4b9be8535a00e8d30f3c5005e487870bb597633bb86413c098f588c72d70a4fc931f7123aafeb68a65 SHA512 38472810fbafd948df461ff20b0a8065bbc7cd044d1e54bf332ed92c8546524487eec929c0369957fc18046ca95687b906b3104d3c3e56ed585b44308cbeaf4f AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca diff --git a/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch b/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch index 164e31f..da4dc76 100644 --- a/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch +++ b/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch @@ -1,5 +1,5 @@ diff --git a/third_party/crabbyavif/src/src/capi/io.rs b/third_party/crabbyavif/src/src/capi/io.rs -index e7994ce312..cb2f3cb578 100644 +index e7994ce312..60a3c13b78 100644 --- a/third_party/crabbyavif/src/src/capi/io.rs +++ b/third_party/crabbyavif/src/src/capi/io.rs @@ -207,7 +207,7 @@ impl Drop for avifIOWrapper { @@ -7,12 +7,12 @@ index e7994ce312..cb2f3cb578 100644 impl crate::decoder::IO for avifIOWrapper { - #[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))] -+ #[cfg_attr(feature = "disable_cfi")] ++ #[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))] fn read(&mut self, offset: u64, size: usize) -> AvifResult<&[u8]> { // SAFETY: Calling into a C function. let res = unsafe { diff --git a/third_party/crabbyavif/src/src/lib.rs b/third_party/crabbyavif/src/src/lib.rs -index 90fa411889..8dc9bf2066 100644 +index 90fa411889..a05f0a5e8b 100644 --- a/third_party/crabbyavif/src/src/lib.rs +++ b/third_party/crabbyavif/src/src/lib.rs @@ -13,7 +13,7 @@ @@ -20,12 +20,12 @@ index 90fa411889..8dc9bf2066 100644 #![deny(unsafe_op_in_unsafe_fn)] -#![cfg_attr(feature = "disable_cfi", feature(sanitize))] -+#![cfg_attr(feature = "disable_cfi")] ++#![cfg_attr(feature = "disable_cfi", feature(no_sanitize))] #[macro_use] mod internal_utils; diff --git a/third_party/crabbyavif/src/src/reformat/libyuv.rs b/third_party/crabbyavif/src/src/reformat/libyuv.rs -index 9df874ccf7..cb25214914 100644 +index 9df874ccf7..3f68c16f2b 100644 --- a/third_party/crabbyavif/src/src/reformat/libyuv.rs +++ b/third_party/crabbyavif/src/src/reformat/libyuv.rs @@ -372,7 +372,7 @@ fn find_conversion_function( @@ -33,7 +33,7 @@ index 9df874ccf7..cb25214914 100644 // needs to be imported separately. // Returns Ok(None) if the conversion is not implemented. -#[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))] -+#[cfg_attr(feature = "disable_cfi")] ++#[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))] pub(crate) fn yuv_to_rgb(image: &image::Image, rgb: &mut rgb::Image) -> AvifResult> { if (rgb.depth != 8 && rgb.depth != 10) || !image.depth_valid() { return Ok(None); // Not implemented. @@ -42,7 +42,7 @@ index 9df874ccf7..cb25214914 100644 } -#[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))] -+#[cfg_attr(feature = "disable_cfi")] ++#[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))] pub(crate) fn rgb_to_yuv(rgb: &rgb::Image, image: &mut image::Image) -> AvifResult> { let conversion_function = match rgb_to_yuv_conversion_function(rgb, image) { Some(conversion_function) => conversion_function, -- cgit v1.2.3