diff options
| -rw-r--r-- | www-client/chromium/Manifest | 3 | ||||
| -rw-r--r-- | www-client/chromium/chromium-142.0.7420.2.ebuild | 1 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch | 48 |
3 files changed, 51 insertions, 1 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 2edcb58..2b47a68 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -20,6 +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-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 @@ -32,4 +33,4 @@ DIST chromium-142.0.7393.6.tar.xz 7482130636 BLAKE2B 5f6c584fda683a95200bae72b7d DIST chromium-142.0.7420.2.tar.xz 7524495212 BLAKE2B 843e2adad73b2d8c63a9fb28c972cec349c8f7b616f842f71f74bd9713bc0a305ee6713d0eef13c5f21106a650e3f3b67a9c92018c7f08edc98089457bd15567 SHA512 b21fb6555cd98da102d06935b3a0f55565584a0a94a16135c8cc91c60bb6e727af88af343a4bd16528587a467c37bf15807740e3cda24953af0d80f4bcdea594 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c EBUILD chromium-142.0.7393.6.ebuild 40694 BLAKE2B 3b3d20c639ed3e604dbff478eeb486c5819915ed1177297a667d0581468a1ed992019935015e37c3e01ef57b93987402ddf6296e62078f5d6d1906084194d810 SHA512 f33c79537e9a39e1685b9d3159d860e7fdec083c8dbedccfd18dc333fa05ce8acbe619368d9ee033b439b075f58857d5e9e749fadb20db7b3679e990933660f5 -EBUILD chromium-142.0.7420.2.ebuild 40700 BLAKE2B d57dce8a04cbfa1f09e5e5bd25629c1d17880de27b4b4218e2ac4210542a6ae8907d73e551fc30cb2cc57674ae355dfa04bbc2545e7c73b8edb5e467f123b467 SHA512 77ae5edf33ddb7fb4d93d7ce1ae2cd95eea7a689fe1f38e714dc170f87aab8317ebaa13b0e6dc4275678c8c59098d066052b9169e83e669398c6c62061a9a61e +EBUILD chromium-142.0.7420.2.ebuild 40760 BLAKE2B 084d8f646cb9d1a0a8fe3bfe147c9b7e953a13366449817ecb37f12a6f30d912ee7dd87c78b25607b3a31b6ad48d3dd048094d4422f9a7a2d696c21e7e1baed0 SHA512 899acb69e3a7749536d1da736df44be43245223ac50ae4d7319e7218828f1abe2c1b9d83cc36261f3c624a0f7021a499da59b98dd7ea2ec3adb0a776c99c135f diff --git a/www-client/chromium/chromium-142.0.7420.2.ebuild b/www-client/chromium/chromium-142.0.7420.2.ebuild index 83df4dc..e0de516 100644 --- a/www-client/chromium/chromium-142.0.7420.2.ebuild +++ b/www-client/chromium/chromium-142.0.7420.2.ebuild @@ -322,6 +322,7 @@ src_prepare() { "${FILESDIR}/chromium-138-gn-exec_script_allowlist.patch" "${FILESDIR}/chromium-142-rust-1.8x-r1.patch" "${FILESDIR}/chromium-142-blink-observable_array-css.patch" + "${FILESDIR}/chromium-142-crabbyavif-rust18x.patch.patch" "${FILESDIR}/chromium-141-mv2-ungoogled.patch" "${FILESDIR}/chromium-111-InkDropHost-crash.patch" diff --git a/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch b/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch new file mode 100644 index 0000000..164e31f --- /dev/null +++ b/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch @@ -0,0 +1,48 @@ +diff --git a/third_party/crabbyavif/src/src/capi/io.rs b/third_party/crabbyavif/src/src/capi/io.rs +index e7994ce312..cb2f3cb578 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 { + } + + impl crate::decoder::IO for avifIOWrapper { +- #[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))] ++ #[cfg_attr(feature = "disable_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 +--- a/third_party/crabbyavif/src/src/lib.rs ++++ b/third_party/crabbyavif/src/src/lib.rs +@@ -13,7 +13,7 @@ + // limitations under the License. + + #![deny(unsafe_op_in_unsafe_fn)] +-#![cfg_attr(feature = "disable_cfi", feature(sanitize))] ++#![cfg_attr(feature = "disable_cfi")] + + #[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 +--- 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( + // Returns Ok(Some(false)) if only YUV was converted and alpha + // 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")] + pub(crate) fn yuv_to_rgb(image: &image::Image, rgb: &mut rgb::Image) -> AvifResult<Option<bool>> { + if (rgb.depth != 8 && rgb.depth != 10) || !image.depth_valid() { + return Ok(None); // Not implemented. +@@ -833,7 +833,7 @@ fn rgb_to_yuv_conversion_function( + } + } + +-#[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))] ++#[cfg_attr(feature = "disable_cfi")] + pub(crate) fn rgb_to_yuv(rgb: &rgb::Image, image: &mut image::Image) -> AvifResult<Option<()>> { + let conversion_function = match rgb_to_yuv_conversion_function(rgb, image) { + Some(conversion_function) => conversion_function, |