diff options
| author |   Joonas Niilola <juippis@gentoo.org> | 2022-03-23 09:30:31 +0200 |
|---|---|---|
| committer | Joonas Niilola <juippis@gentoo.org> | 2022-03-23 10:15:35 +0200 |
| commit | f40c5716d239c87edfb220cf7b5c8755a7e89b87 (patch) | |
| tree | 44b6ed6132d395770ac7fd1b34a8006bbc45f1fd /mail-client | |
| parent | package.mask: re-mask exim-4.95 again after revbump (diff) | |
| download | gentoo-f40c5716d239c87edfb220cf7b5c8755a7e89b87.tar.gz gentoo-f40c5716d239c87edfb220cf7b5c8755a7e89b87.tar.bz2 gentoo-f40c5716d239c87edfb220cf7b5c8755a7e89b87.zip | |
mail-client/thunderbird: update patch set to build with dav1d-1.0.0
- unfortunately with the patch thunderbird fails to build with dav1d
<1.0.0 so there's an ugly condition for that now.
Thanks-to: Jan Breig <jan.breig@disroot.org>
Closes: https://bugs.gentoo.org/835788
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/thunderbird/Manifest | 2 | ||||
| -rw-r--r-- | mail-client/thunderbird/thunderbird-91.7.0.ebuild | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 2373812551cb..d3b036c5793c 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -1,4 +1,4 @@ -DIST firefox-91esr-patches-05j.tar.xz 17116 BLAKE2B 5db6d2d3d5432369d2cfcda1a2b542d70ac18c1af7013d91984054c9658d7e3f989527c3a248de53f2e8dc51a852a46477f9ad75e98db28f50f8609fcafe547c SHA512 42080a8e28014d5f8de7ff45e0128ab71747faad7a92f0f7094686125835c168751794bd0229f77290f075502c271af0171ffae2863325d10cc6e8a853a90d3e +DIST firefox-91esr-patches-06j.tar.xz 17668 BLAKE2B ebe51e06197b70b0f0661724e1ccf2f2aaf0e0eb4576e795963c6a0f9c32f293825b8d2a487dcadd8e5e1cb5db7c756016c50f34e6bc6df451b44e54ef76686e SHA512 3af533a49c5e4a6fdb5be2225256655d402055332ba98f3aa159fcc78c4a9901a541b63d68cb02440f55ede04858388881118f655efebc75b18c316e0ab522a7 DIST thunderbird-91.7.0-af.xpi 561895 BLAKE2B ed4d0c6e98ce53ce4113052bc9ef496d997697d3d5873f8073324754f5b6b278734f12e78ee71448f472d0271f7eae3f055d15364e508af7844f524217c06dc4 SHA512 1f0bdfd7b8bb0e665ef12834b3c656b4cd6140893ef75ec83e20f82a90686a46cc4f573276402fd5fc4e6ded65aebca6af29d3e9adc0d2750574fc64dc1feb30 DIST thunderbird-91.7.0-ar.xpi 665242 BLAKE2B dcd6571a1783edafc110bfd34b22ef8a9cd1216cbbc3b2b511af76afc66a7f0a013b96a64d286c495c7a49296adc7f0f20e9fd60aefa583d4bbaa5eb20c64ccb SHA512 a61d722e08007099b375ccd2552374ae8b3335919fc6efb7ae2a36898e824a09b00cf85510f8eb0fe43cd28847de238db849e98c240e610bd72f58d57d861094 DIST thunderbird-91.7.0-ast.xpi 580510 BLAKE2B ba9ec3c24b2eb0f247521512d6334a7c9ea84711d22d6f716aa062dcb84eb2c83785a79aa1bda59ddffc563fe154935ab1b4d7aa436e7af683f7009da6fa96c9 SHA512 34065a120d6bf123dbd892d51ea336e94ffeb8a15d39f9c7d14eb57b04b434da8b488ad6c4cffbd28fc47f3f6ef544a5c4cb6eb34d012776d0991430c559e143 diff --git a/mail-client/thunderbird/thunderbird-91.7.0.ebuild b/mail-client/thunderbird/thunderbird-91.7.0.ebuild index 7c1faf2231ea..908703b76654 100644 --- a/mail-client/thunderbird/thunderbird-91.7.0.ebuild +++ b/mail-client/thunderbird/thunderbird-91.7.0.ebuild @@ -3,7 +3,7 @@ EAPI="7" -FIREFOX_PATCHSET="firefox-91esr-patches-05j.tar.xz" +FIREFOX_PATCHSET="firefox-91esr-patches-06j.tar.xz" LLVM_MAX_SLOT=13 @@ -510,7 +510,15 @@ src_unpack() { } src_prepare() { - use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch + if use lto; then + rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die + fi + + if use system-av1 && has_version "<media-libs/dav1d-1.0.0"; then + rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die + elog "<media-libs/dav1d-1.0.0 detected, removing 1.0.0 compat patch." + fi + eapply "${WORKDIR}/firefox-patches" # Allow user to apply any additional patches without modifing ebuild |