commit:     e185fb2fe7cfe7419a8c8257d73c5d68075d1d82
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 20 06:20:09 2025 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec 20 06:20:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e185fb2f

www-client/firefox: include a musl build fix in 146.0.1

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

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

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 7c0a950396ec..8bced3136bb0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1016,7 +1016,7 @@ DIST firefox-145.0.1-zh-TW.xpi 479814 BLAKE2B 
f0920e55307e907d6b8800e330ed65c163
 DIST firefox-145.0.1.source.tar.xz 645303268 BLAKE2B 
0e76fefc9aa2f80dbe1ab21a1c576f5199a1c5b33d5ab059d6047dc161e6bfb27e64a58c676ce805a297565519321a548bbad80cfd1d6effc8e2e34299f3a116
 SHA512 
6e052fee46c31b2696ba5403f905e0b94b08ce354588cd6315d54ee1dcff9b82835d64ea5a57596dfb1866dd1518a29966fdaabdb4c3838103344bd2dc18c72d
 DIST firefox-145.0.source.tar.xz 649881808 BLAKE2B 
a8007d06dce77197dfb40ab9a759287b6bcff4e56d1b2c7acfed9475aaa2f936948534d6e726a158550c70a28bad8ec8c7f1b99ca8165198c1952a484869b6c9
 SHA512 
7ba40d7de95d7b93278f1823ce460b45c6bfac01eda52bc5c28f23a6bc858bdcbf8b4b4dc359b853372fffbcff4e7f0b276fefe22c2d4a0fa303e8ce1d2629be
 DIST firefox-146-patches-01.tar.xz 10568 BLAKE2B 
643ed4298d7ab2251ae1f813473a7b461aa386dfb72984e46201b22b6cb0f69f28e92b44a4783dda32a81b4b0dacbe8b47a25b9232481ecd79a19550e74e4812
 SHA512 
9e2474eedda1c2644ddcb0f9fd2d90ede764469337eab1267d3d4dbe8e3487bb519106449acf1da9798050d61a51e96a882f365e4587f88747161f6418203e4e
-DIST firefox-146-patches-02.tar.xz 10888 BLAKE2B 
75c6f36ef1a097f15a6c1df829df98f3d7053de1d59cb546ca309974a9a5331bb147cf7921096b7b25383b416d187a387fd0f6a3a7fb562d0fea952f6e81fb79
 SHA512 
8a92d59655765d6cbe7764040f23524a0c4cd25db64be686d7c163819dad9f7304da71f6dae9075f33a15128ae26a70a043d4c135329a017e1e1108094c75e40
+DIST firefox-146-patches-03.tar.xz 11228 BLAKE2B 
4c016627aeaf68f36ae4bb7d8e3dbd4dcf75ec616dedbf9931bd5f11fdb1ff15b93c7e3dcaa9fc0025279de4d3d503c38dddc6e6fa74d546f1c04322073ae91c
 SHA512 
0e117abd73062baa58d004368b84a3a541a521c0097e11735d3cd4e61772cd57d2482dbef8aeeeff085d51c35cde5a8253288803150aa501678392c057a7a9d3
 DIST firefox-146.0-ach.xpi 293906 BLAKE2B 
805c65104451b5736880d3f2e04784f8824fd96ba4ae9274304222dfa7965e65a7617b9579c4529577f8ebcd638a3d054ae83b22ff55e23456f546a2528f5b17
 SHA512 
ff2d360795e20bce2aa924a68bc7f07637a8565de5f7268641562a319ba78e1d499e62c07bcebd2e01e4fbe941830b11a21b7630067ddc7417d5da49f78010f2
 DIST firefox-146.0-af.xpi 267091 BLAKE2B 
b6230e7a0b56dc3b0276d3e4f8aaf46e0cfccb9e496a8fdddd56da198e67c56745ef6b70a9b2cca143d4922a5b690edb3101879c9a496357fad3dac01a7d1d4b
 SHA512 
0bd0eee7fbdba23b5197208c96e0c455096407c756c66c1ff575f901ebd0a3273b5880a18665ac777fcfa520636a0794c58c431289319082e6b7c53c325c35f7
 DIST firefox-146.0-an.xpi 331365 BLAKE2B 
16951f936c9a638ee36bb2238e2ccfe3f6bc8da196d9a7aa64f3390a1058be2cae555b4c16e4f700d5fda4d4a3010a869701e9bcfd9b37f2c1b0e0e56ac8e2de
 SHA512 
c0f9ab0dd92679610355fe020eb2ad93a1b50b58ed12b714990cd1cad26029e4dc46ec70adebb8caeabecb7a2ae65efcc1032dd9c6093b99d2a47df847aedb83

diff --git a/www-client/firefox/firefox-146.0.1.ebuild 
b/www-client/firefox/firefox-146.0.1.ebuild
index 9928269248b9..cf8d2ea1557b 100644
--- a/www-client/firefox/firefox-146.0.1.ebuild
+++ b/www-client/firefox/firefox-146.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-FIREFOX_PATCHSET="firefox-146-patches-02.tar.xz"
+FIREFOX_PATCHSET="firefox-146-patches-03.tar.xz"
 
 LLVM_COMPAT=( 19 20 21 )
 
@@ -651,6 +651,7 @@ src_prepare() {
        if use elibc_glibc ; then
                rm -v 
"${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die
                rm -v 
"${WORKDIR}"/firefox-patches/*bmo-1988166-musl-remove-nonexisting-system-header-req.patch
 || die
+               rm -v 
"${WORKDIR}"/firefox-patches/*bgo-967694-musl-prctrl-exception-on-musl.patch || 
die
        fi
 
        eapply "${WORKDIR}/firefox-patches"

Reply via email to