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

[Jory Pratt]

commit:     2d67ad7b04bb26d9bc037effe1d2a936a0dfc947
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 00:31:12 2017 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 00:31:12 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=2d67ad7b

www-client/firefox - sync esr ebuild with tree

 www-client/firefox/firefox-45.7.0.ebuild | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/www-client/firefox/firefox-45.7.0.ebuild 
b/www-client/firefox/firefox-45.7.0.ebuild
index 34f9e6c..9ad87f2 100644
--- a/www-client/firefox/firefox-45.7.0.ebuild
+++ b/www-client/firefox/firefox-45.7.0.ebuild
@@ -28,8 +28,8 @@ fi
 PATCH="${PN}-45.0-patches-10"
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases";
 
-MOZCONFIG_OPTIONAL_GTK3=1
-MOZCONFIG_OPTIONAL_QT5=1
+# Kill gtk3 support since gtk+-3.20 breaks it hard prior to 48.0
+#MOZCONFIG_OPTIONAL_GTK3=1
 MOZCONFIG_OPTIONAL_WIFI=1
 MOZCONFIG_OPTIONAL_JIT="enabled"
 
@@ -54,9 +54,7 @@ SRC_URI="${SRC_URI}
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 # Mesa 7.10 needed for WebGL + bugfixes
-# gtk3 from 3.20 and above fails hard, limit it
 RDEPEND="
-       gtk3? ( <x11-libs/gtk+-3.20 )
        >=dev-libs/nss-3.21.1
        >=dev-libs/nspr-4.12
        selinux? ( sec-policy/selinux-mozilla )"
@@ -131,8 +129,7 @@ src_unpack() {
 
 src_prepare() {
        # Apply our patches
-       eapply "${WORKDIR}/firefox" \
-               "${FILESDIR}"/${PN}-45-qt-widget-fix.patch
+       eapply "${WORKDIR}/firefox"
 
        # Allow user to apply any additional patches without modifing ebuild
        eapply_user