commit:     897270e689e9934a15978cee6cfbaaa02e406f8e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 13:06:09 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 13:06:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897270e6

www-client/firefox: enable llvm-18/rust-1.78+ on 115esr

Bug: https://bugs.gentoo.org/936072
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-client/firefox/Manifest                |  2 +-
 www-client/firefox/firefox-115.13.0.ebuild | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 9a3614a2916d..93036bf40032 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -98,7 +98,7 @@ DIST firefox-115.13.0esr-xh.xpi 414787 BLAKE2B 
b1f1d584ebcb91b1819ddab80c6933f93
 DIST firefox-115.13.0esr-zh-CN.xpi 652628 BLAKE2B 
482eb1d85b53ccebb3bdc4a1c04d4eb12f8760cd1851a7cec986786db626f8f545f46ba545d6e3e4be383f1b751fee1a0df836b485e2f0841c659c8a035dbb64
 SHA512 
6ca1d36a0faea8710c0dcf802391be1888ff6fdeb2d20af2970e63d982f551b64cd5ffbb2ebd187d0b2f4add2f5ab1f3ef9d82f149beaaf6d309da6425ef4b34
 DIST firefox-115.13.0esr-zh-TW.xpi 656755 BLAKE2B 
ef8244f8c0d65d2c604a5a11caf4f493992dcf2d32aac8bca36a8a17ef21ca4050c3406b565822300c0333df2950ff6342f7ed05b02da1243aaa3fdedbd396ef
 SHA512 
c62f4dddc59f71d944d70250dd0337680c789000f4df188d71f3fae1cb272c34b85711218a53727324adf190e26e1667a192b612d9f1d3a437f24e1b27eb9ed0
 DIST firefox-115.13.0esr.source.tar.xz 510571488 BLAKE2B 
e2b00965a92cd11da6c81daa8b6c652dfccc9f0f7d066bc17ae5fa3ac3aaaa021c4489a9f653127f5516e3d77cd7174de328343e22c4edab438e3fcb9a859178
 SHA512 
799cdf2d0494003a5addd0da703f53deb9c9d6bb6f6c95d40026363382803e2d086039c7798940a1f35f4cba111f2e8e21bde8ac2eac29fd9bd6876dd8d3a85f
-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 firefox-128-patches-04.tar.xz 17056 BLAKE2B 
c8df37a4ea83b077e7c7fc2b7538f06421637899dae266831a316473ae04b7a5e9feaad8b4ca755f3a22dc2964ec4fff32160b361d2b394fdaf18fbef0742561
 SHA512 
885a0f27acfc8e7e6e3713c821fd043651b555b21b7991a3ee9afbfa7c2442408c671c0436de743606fee8efa5f5455d860d65fc59fdfd7a6339eae997fa9209
 DIST firefox-128.0-ach.xpi 463921 BLAKE2B 
016138341e087f6afd53c82e0b33700c20c341491e6b12f444cc7d85aea1f0e08f4bfa7395af5cf888984f57a3fd6a41f5df39fced8267e0bd0388753a1ad994
 SHA512 
b67378c13ecd5e0c7e570b69c2f267232749ce71c97ad987b3e6b1215b84ff934918d5fccbdefe99dbd5a331917b8d545e9ccc8aad4aba25329231ad357a9612
 DIST firefox-128.0-af.xpi 417369 BLAKE2B 
434dd6861e1b378fff90cc704a7cf63b90de4f54d6b8153ad9051beb0aae84c37686c052624b8d38f60cbf6885162142f5f2a126bcf2a238cccf63bc7194dcd5
 SHA512 
e3ef703a909fa12d944c80aec83c9d8ddf8c49aab18f62c2ebf6f4ad08d17e17b5494b472480a41c510e522994db0afe796259879668bb319c4fab27979e2970

diff --git a/www-client/firefox/firefox-115.13.0.ebuild 
b/www-client/firefox/firefox-115.13.0.ebuild
index 9764cb0160da..2402163d52e3 100644
--- a/www-client/firefox/firefox-115.13.0.ebuild
+++ b/www-client/firefox/firefox-115.13.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-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"
@@ -80,6 +80,15 @@ FF_ONLY_DEPEND="!www-client/firefox:0
        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
@@ -736,6 +745,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"

Reply via email to