From cb6ae912ab84f985530092237b9168584286b616 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Tue, 16 Jul 2024 02:30:10 +0300 Subject: [PATCH] www-client/icecat: enable llvm-18/rust-1.78+ Signed-off-by: Alfred Wingate --- www-client/icecat/Manifest | 1 + www-client/icecat/icecat-115.13.0.ebuild | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest index 132ba24..c4f42ac 100644 --- a/www-client/icecat/Manifest +++ b/www-client/icecat/Manifest @@ -1,3 +1,4 @@ DIST firefox-115esr-patches-09.tar.xz 16660 BLAKE2B 1dcdf62f35013b82dd70bf00c0505394b9277affcd1b1cbde92421778f4fcc146f536a546c2db8d6a70f92d40e4b1c96927fedec54383e6bb80bd9806d9b4461 SHA512 e003d0a2a5304dcdd0851b57ceb11993333326c8221d5d99555cd0c64090d5eda1bdb2a2a52e605f6094a3214ffa2238e43d57ff64eb7d424ff54b8125c16f5c +DIST firefox-115esr-patches-11.tar.xz 49440 BLAKE2B 804f5b7434fdf671361f8efbfa3e63cb8b14fcdea39a444ee04cbb4ff7d7deaea74ede239843c350a857eeacf59a69145e234070baa3b05b6d3e1b5c8835f23c SHA512 5e2c88374f14611a1aee4fa191ceb2e66c1d440c98d6ca9d17747290f01f1a713b71c71cebc37313c089524aa6155bfce08c8931a24b71b28de54913cfccd73c DIST icecat-115.12.0-1gnu1.tar.bz2 686519433 BLAKE2B b05e5bf06b8dcd8d8a640f81ac4ac67608bbcbbedf78df71e5134486f15bc579967c99b60c44cc62ded8c49b78f4a704d316d7bad7af5469b5a7d6c892dd5e2f SHA512 e72d4e572f1761c5c0b4ed95fa214b857760b1e4d17219d04bb71d134edfe8bbb7d428cd5566f13a244a7d7a1197805411a01616dff790cef3d823258909a722 DIST icecat-115.13.0-3gnu1.tar.bz2 695172489 BLAKE2B cab28efcb29f53b096785c19501c5660d78fef5cd170189c79835ca23908736a597d390d92b056275c24d2296be780bda91423c67205c42e4674f3c02e99c68b SHA512 798328014bc648e2e43a5f72a473b05e704b8158ffd7d1cd1f3d93fcc14935ea19b84ebdc306b30f190cf178a1ae6974a9b8b53c360e879a4c1e0daba0055d28 diff --git a/www-client/icecat/icecat-115.13.0.ebuild b/www-client/icecat/icecat-115.13.0.ebuild index 4cff462..2666f4b 100644 --- a/www-client/icecat/icecat-115.13.0.ebuild +++ b/www-client/icecat/icecat-115.13.0.ebuild @@ -6,9 +6,9 @@ EAPI=8 # Using Gentoos firefox patches as system libraries and lto are quite nice -FIREFOX_PATCHSET="firefox-115esr-patches-09.tar.xz" +FIREFOX_PATCHSET="firefox-115esr-patches-11.tar.xz" -LLVM_MAX_SLOT=17 +LLVM_MAX_SLOT=18 PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="ncurses,sqlite,ssl" @@ -54,6 +54,15 @@ FF_ONLY_DEPEND="screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla )" BDEPEND="${PYTHON_DEPS} || ( + ( + sys-devel/clang:18 + sys-devel/llvm:18 + clang? ( + sys-devel/lld:18 + virtual/rust:0/llvm-18 + pgo? ( =sys-libs/compiler-rt-sanitizers-18*[profile] ) + ) + ) ( sys-devel/clang:17 sys-devel/llvm:17 @@ -630,6 +639,9 @@ src_prepare() { rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die fi + # Modify patch to apply correctly + sed -i -e 's/firefox/icecat/' "${WORKDIR}"/firefox-patches/0033-bmo-1882209-update-crates-for-rust-1.78-stripped-patch-from-bugs.freebsd.org-bug278834.patch || die + eapply "${WORKDIR}/firefox-patches" # Allow user to apply any additional patches without modifing ebuild @@ -681,6 +693,10 @@ src_prepare() { # Clear cargo checksums from crates we have patched # moz_clear_vendor_checksums crate moz_clear_vendor_checksums audio_thread_priority + moz_clear_vendor_checksums bindgen + moz_clear_vendor_checksums encoding_rs + moz_clear_vendor_checksums any_all_workaround + moz_clear_vendor_checksums packed_simd # Create build dir BUILD_DIR="${WORKDIR}/${PN}_build"