commit:     bb05d316fd8ddfba9987e636b7ccf92b66d84eb6
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 12 07:58:07 2026 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 12 07:58:07 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb05d316

mail-client/thunderbird: fix 147.0.1 with glibc-2.43

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

 mail-client/thunderbird/Manifest                   | 1 +
 mail-client/thunderbird/thunderbird-147.0.1.ebuild | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index b5d8b861a43a..e5d93ba44857 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -3,6 +3,7 @@ DIST firefox-140esr-patches-04.tar.xz 124424 BLAKE2B 
89fd2cedb67a9d82c339fed01b7
 DIST firefox-140esr-patches-05.tar.xz 124432 BLAKE2B 
9281214dcf3da5d2e288112a99dc1fbee44ee93c4b83e30d73e8383805bd9c8ad9b1918d11351398cd963fdc30ec3cb50d7f6b5c9905d7c1303d21fdef440fbe
 SHA512 
70551bb7eea2a50bbd30418438a78a8ace07467fe852b7655c24373c651f816df89fceeb98b6fa6c7d95944b0c5deef76b89b3e742795a8ac04259f02bd25c10
 DIST firefox-146-patches-01.tar.xz 10568 BLAKE2B 
643ed4298d7ab2251ae1f813473a7b461aa386dfb72984e46201b22b6cb0f69f28e92b44a4783dda32a81b4b0dacbe8b47a25b9232481ecd79a19550e74e4812
 SHA512 
9e2474eedda1c2644ddcb0f9fd2d90ede764469337eab1267d3d4dbe8e3487bb519106449acf1da9798050d61a51e96a882f365e4587f88747161f6418203e4e
 DIST firefox-147-patches-01t.tar.xz 47372 BLAKE2B 
27c8ec917b10b3ad0ab035cf98b0578acff26a627360ae4d74bcbaf1c8e1775a4d7fd4f0175787cb8f0abec71c0f9e23db18ececa890c387869c1cfe4964ccdb
 SHA512 
9cc23c92b442205314c044dff704ea33cc3f22d43a88d4c2f4bb0d2e21b89488c6b9935195339031729573c722493403ac845cbaddbbcf0a927e7d506f21b67c
+DIST firefox-147-patches-02t.tar.xz 47564 BLAKE2B 
44c18affb9539278d6e8259bb1c39ca03e2f09f4a29d3051ab1aec3f34c1e5f7dc134fdc2878dbd0c3bcb9373e3d792fd93252e77692e7cfa6aa96a9a1d0bfa0
 SHA512 
a47bb9967734914f7005846ff1c47600aac4ea217c7bc65f8f6e9501aced696a3666f59c600942be674f22e611112836b1f29ad17504fb78e21dcff0dc10ac62
 DIST thunderbird-140.6.0esr-af.xpi 316217 BLAKE2B 
c7238abeeca8275eeafa982c35d46816de5c0c0751f037f6acfc07833077c521a752946b56b1c3b92e756212be2105b8203b4172da6cfffb66f47d1f34f2aee7
 SHA512 
f7ae8f8ba1e12e85a6cade91d0520ef957f1ea4b8da086805aec9c5e2d22b0d3667b5437bd5a9177c9a7e4e4759e083e23ac4b6473a3858d98465073540d2148
 DIST thunderbird-140.6.0esr-ar.xpi 436191 BLAKE2B 
6a00d9f3b2a2985058dee6065c320b66d37a187f48be4d6ba7f970382a2ab564d12d1bb4babd2692572c7f1e7cb320e8d03e510814e295bb9c00a7eea1ab076e
 SHA512 
38c52544ff236113c57a1722e2767a2838a371bc93c2b028d0cc52e188bf407d35e99d37584d3c15fee465975e5f8d0c2489d987220e7016a9436f50f21bb903
 DIST thunderbird-140.6.0esr-ast.xpi 340597 BLAKE2B 
2e7eea3d13f0e84650f425d5ec8a4705ad78416f095726db60fd0f2cbfc0947e9b3b02439db7c7dae310f8fa8a92f63f24b2a47287f60f03b886e8124bc97510
 SHA512 
c479cf7a42b8698b520a6bd29490000d47c8be24d37b49b1344d797a2d80fabe9a42676403fa210cfd12d676695fbf90e09325b4ded1ad69f05fc68f1b4fd255

diff --git a/mail-client/thunderbird/thunderbird-147.0.1.ebuild 
b/mail-client/thunderbird/thunderbird-147.0.1.ebuild
index b72e26eff40c..352d3dced614 100644
--- a/mail-client/thunderbird/thunderbird-147.0.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-147.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-FIREFOX_PATCHSET="firefox-147-patches-01t.tar.xz"
+FIREFOX_PATCHSET="firefox-147-patches-02t.tar.xz"
 
 LLVM_COMPAT=( 19 20 21 )
 
@@ -573,6 +573,12 @@ src_prepare() {
 
        # Clear checksums from cargo crates we've manually patched.
        # moz_clear_vendor_checksums xyz
+       # glslopt: bgo#969412, bgo#969871
+       moz_clear_vendor_checksums glslopt
+       # TB-specific
+       sed -i \
+               -e 's/\("files":{\)[^}]*/\1/' \
+               "${S}"/comm/third_party/rust/glslopt/.cargo-checksum.json || die
 
        # Create build dir
        BUILD_DIR="${WORKDIR}/${PN}_build"

Reply via email to