summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2022-03-23 10:08:15 +0200
committerJoonas Niilola <juippis@gentoo.org>2022-03-23 10:15:36 +0200
commite5b6cf514635031f5c164ec90384d6174cf13742 (patch)
tree7ff71a27e91b9cb69329e7058abc905bc0b89656 /www-client
parentmail-client/thunderbird: update patch set to build with dav1d-1.0.0 (diff)
downloadgentoo-e5b6cf514635031f5c164ec90384d6174cf13742.tar.gz
gentoo-e5b6cf514635031f5c164ec90384d6174cf13742.tar.bz2
gentoo-e5b6cf514635031f5c164ec90384d6174cf13742.zip
www-client/firefox: dav1d-1.0.0 compatibility patch for unstable ESR
Bug: https://bugs.gentoo.org/835788 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'www-client')
-rw-r--r--www-client/firefox/Manifest1
-rw-r--r--www-client/firefox/firefox-91.7.1.ebuild12
2 files changed, 11 insertions, 2 deletions
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index c93fd2fde74f..8e64b3b5d357 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -195,6 +195,7 @@ DIST firefox-91.7.1esr-zh-CN.xpi 575379 BLAKE2B 44cf2c4c0f180c9c5652214d45070a0a
DIST firefox-91.7.1esr-zh-TW.xpi 576227 BLAKE2B 08196cddca48b3a68154ead26522a84be085a6b777f43bd11cc918efcb3b12a711869911736972cfb5b26e77f14f3b7a8da6e15a73eb32d7663102a26c1b6635 SHA512 3030828799207a4c37a06591f17636412b55042ee61bd9f42a01204ddbf148ac6176f64639eb83e3313958db3c36860fcbafb136e5e7ede70a588104690bc531
DIST firefox-91.7.1esr.source.tar.xz 380937836 BLAKE2B 15995930be6b377c46e3932b56eb18b45c350c948f11afac4458c0ee3f2aa45e70244718872b101a560a155514dd479f38ed5ee58ff258c4e9f9f7070595f1e4 SHA512 c56aa38e9d706ff1f1838d2639dac82109dcffb54a7ea17326ae306604d78967ac32da13676756999bc1aa0bf50dc4e7072936ceb16e2e834bea48382ae4b48c
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 firefox-97-patches-03j.tar.xz 17340 BLAKE2B d1c9ff486510cfebc0cad708657203e3bdf9007e150af603a4625b29421f983ca1f3b1c6468d07fb7f1ebb967f4bd03ba6fa545a5ca420e957480a0b27c04632 SHA512 f4d9f95d7b88efd1b3f19957c7a1b1f971ce0f25fdd461cda701a4d8adf6d1733eaf055624342b79531f84ebc46c9c4edd4f0f23204b7fae9cdd6f9708c6ba41
DIST firefox-97.0.2-ach.xpi 453073 BLAKE2B 87cd31589ea0a9e5f48b690f7dea2971dd8023e4c0e55950d78c4898dabf54e326166a25c757b10ccc7f7177aa5e1d70f11c5fa1d087f35ff754f5fbfdadbc6f SHA512 838d414785aa4dea5c2153ad4442bf0ce0eab40ce4dcbd651eba4ec56fa87c0479546e5b2dea62b5d3d953951ba50efe1fea86e45d96b7449cb7a75b5b8e4f71
DIST firefox-97.0.2-af.xpi 419759 BLAKE2B 01dae1c9ac06a1686fe3949de4f195c65cd942d9d366e99c10f07f644e548d226d4680b66839ac1058588b545964327c38d2333c077d887f9e7089fcfabfaf3d SHA512 96a4dcdb4688dfce0551bfd7928b969e2277c40f11b195b0ceef4d23c6b48e0bfa2836c7a245b8eb07f809f921e687faf595ff5a2b831f2332bb9ab45fb3363a
diff --git a/www-client/firefox/firefox-91.7.1.ebuild b/www-client/firefox/firefox-91.7.1.ebuild
index 3f52fa98446d..d5b0e8d7db25 100644
--- a/www-client/firefox/firefox-91.7.1.ebuild
+++ b/www-client/firefox/firefox-91.7.1.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
@@ -566,7 +566,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