commit:     32720627c1f618a2269dfd10ad56a772f756a0e2
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 16:01:59 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 16:03:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=32720627

Adjust firefox-46.0_beta1 to use new gtk3-default logic

 www-client/firefox/firefox-46.0_beta1.ebuild | 6 +++---
 www-client/firefox/metadata.xml              | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/www-client/firefox/firefox-46.0_beta1.ebuild 
b/www-client/firefox/firefox-46.0_beta1.ebuild
index b87fff9..ebda88f 100644
--- a/www-client/firefox/firefox-46.0_beta1.ebuild
+++ b/www-client/firefox/firefox-46.0_beta1.ebuild
@@ -30,10 +30,10 @@ fi
 PATCH="${PN}-46.0-patches-0.2"
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases";
 
-MOZCONFIG_OPTIONAL_GTK3="enabled"
-#MOZCONFIG_OPTIONAL_QT5=1
+MOZCONFIG_OPTIONAL_GTK2ONLY=1
+#MOZCONFIG_OPTIONAL_QT5=1 -- fails to build so leave it off until the code can 
be patched
 MOZCONFIG_OPTIONAL_WIFI=1
-#MOZCONFIG_OPTIONAL_JIT="enabled"
+#MOZCONFIG_OPTIONAL_JIT="enabled" -- forcing jit no matter what, hardened 
should work due to W^X support
 
 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils 
mozconfig-v6.46 pax-utils fdo-mime autotools virtualx mozlinguas
 

diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index eaa95d5..27d7ed6 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -10,6 +10,7 @@
                are not binary-redistributable according to upstream.</flag>
        <flag name="custom-optimization">Fine-tune custom compiler
                optimizations (-Os, -O0, -O1, -O2, -O3)</flag>
+       <flag name="force-gtk2">Use the cairo-gtk2 rendering engine</flag>
        <flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to 
be automatically
                downloaded and kept up-to-date in user profiles</flag>
        <flag name="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for 
media support</flag>

Reply via email to