1 |
commit: 32720627c1f618a2269dfd10ad56a772f756a0e2 |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 24 16:01:59 2016 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 24 16:03:38 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=32720627 |
7 |
|
8 |
Adjust firefox-46.0_beta1 to use new gtk3-default logic |
9 |
|
10 |
www-client/firefox/firefox-46.0_beta1.ebuild | 6 +++--- |
11 |
www-client/firefox/metadata.xml | 1 + |
12 |
2 files changed, 4 insertions(+), 3 deletions(-) |
13 |
|
14 |
diff --git a/www-client/firefox/firefox-46.0_beta1.ebuild b/www-client/firefox/firefox-46.0_beta1.ebuild |
15 |
index b87fff9..ebda88f 100644 |
16 |
--- a/www-client/firefox/firefox-46.0_beta1.ebuild |
17 |
+++ b/www-client/firefox/firefox-46.0_beta1.ebuild |
18 |
@@ -30,10 +30,10 @@ fi |
19 |
PATCH="${PN}-46.0-patches-0.2" |
20 |
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" |
21 |
|
22 |
-MOZCONFIG_OPTIONAL_GTK3="enabled" |
23 |
-#MOZCONFIG_OPTIONAL_QT5=1 |
24 |
+MOZCONFIG_OPTIONAL_GTK2ONLY=1 |
25 |
+#MOZCONFIG_OPTIONAL_QT5=1 -- fails to build so leave it off until the code can be patched |
26 |
MOZCONFIG_OPTIONAL_WIFI=1 |
27 |
-#MOZCONFIG_OPTIONAL_JIT="enabled" |
28 |
+#MOZCONFIG_OPTIONAL_JIT="enabled" -- forcing jit no matter what, hardened should work due to W^X support |
29 |
|
30 |
inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.46 pax-utils fdo-mime autotools virtualx mozlinguas |
31 |
|
32 |
|
33 |
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml |
34 |
index eaa95d5..27d7ed6 100644 |
35 |
--- a/www-client/firefox/metadata.xml |
36 |
+++ b/www-client/firefox/metadata.xml |
37 |
@@ -10,6 +10,7 @@ |
38 |
are not binary-redistributable according to upstream.</flag> |
39 |
<flag name="custom-optimization">Fine-tune custom compiler |
40 |
optimizations (-Os, -O0, -O1, -O2, -O3)</flag> |
41 |
+ <flag name="force-gtk2">Use the cairo-gtk2 rendering engine</flag> |
42 |
<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically |
43 |
downloaded and kept up-to-date in user profiles</flag> |
44 |
<flag name="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for media support</flag> |