[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/

[Jory Pratt]

commit:     446dfdfb06867447fc5f4cfada1a80495ebcfd70
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 02:21:31 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat May  4 02:21:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=446dfdfb

www-client/firefox: more wayland fixes

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 www-client/firefox/Manifest                   | 2 +-
 www-client/firefox/firefox-67.0_beta15.ebuild | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 74e8b8d..ec5a70c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,2 +1,2 @@
-DIST firefox-67.0-patches-04.tar.xz 151904 BLAKE2B 
b63b353f2c64007454d3f9bf58ccb615b056bf18119d8f88b23344aa31ae9a8728ac704b9e2a90a37ccf93ee38e0f23b941f70441b367722d3b73b9893d56867
 SHA512 
c6004f2aa51f46b38ea44c9ae4b18eb7be0b8ef21185660d7ebeec9338b319dcc87d52205523a2554cb63b26fcdb935004c8142510fd77b8787b2777d4091b55
+DIST firefox-67.0-patches-05.tar.xz 164292 BLAKE2B 
d0226ccc0732f7f4d63af44a76bff6c7bc0d0f91cbf4156da327f9c58ed81a318c6cc59a914fbdf59f5bf30539a9cd354d541878e414ad6b7eb2cd22b1fbfbf0
 SHA512 
2fc4400325dd4868f48d3c090fea63ad13f7bf23b01402c456ce7ad25626e9fd4e2f8e9139433abe182099437856713801eb90049cb69b5a0dabf11baa43bcbe
 DIST firefox-67.0b15.source.tar.xz 284191684 BLAKE2B 
b617bcbae18465651dfa24b472e5eda5b12d0c360500824a3f39fb083a2176be26e668e742ffd3cd7c08b5a322a35d646d8d64eb46d54c8411a670505ab89660
 SHA512 
5ce771bb1c4df0065de9e13a416d7fa390b67aac1a182bc047fb5b671e87c6464d2d7f407323c0b1c5f82757e11d5e4f39d5f58e283525b835771de3ef15c8bd

diff --git a/www-client/firefox/firefox-67.0_beta15.ebuild 
b/www-client/firefox/firefox-67.0_beta15.ebuild
index f1615d8..05b57be 100644
--- a/www-client/firefox/firefox-67.0_beta15.ebuild
+++ b/www-client/firefox/firefox-67.0_beta15.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then
 fi
 
 # Patch version
-PATCH="${PN}-67.0-patches-04"
+PATCH="${PN}-67.0-patches-05"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases";
 MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
@@ -248,6 +248,7 @@ src_unpack() {
 }
 
 src_prepare() {
+       use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
        eapply "${WORKDIR}/firefox"
 
        # Allow user to apply any additional patches without modifing ebuild
@@ -490,7 +491,7 @@ src_configure() {
        # use the gtk3 toolkit (the only one supported at this point)
        # TODO: Will this result in automagic dependency on 
x11-libs/gtk+[wayland]?
        if use wayland ; then
-               mozconfig_annotate '' --enable-default-toolkit-cairo-gtk-wayland
+               mozconfig_annotate '' 
--enable-default-toolkit=cairo-gtk3-wayland
        else
                mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
        fi