commit: e1f6f4172827ba444b8b3d1ebf34ff1fc8d23194
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 23:04:53 2015 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 23:04:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=e1f6f417
migrate gtk3 change to mozconfig-v5.38 eclass
eclass/mozconfig-v5.38.eclass | 8 ++++++--
www-client/firefox/firefox-38.0.5.ebuild | 2 --
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/eclass/mozconfig-v5.38.eclass b/eclass/mozconfig-v5.38.eclass
index ad1b197..6acd44e 100644
--- a/eclass/mozconfig-v5.38.eclass
+++ b/eclass/mozconfig-v5.38.eclass
@@ -45,7 +45,7 @@ esac
# Set the variable to any value if the use flag should exist but not be
default-enabled.
# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug gstreamer +jemalloc3 pulseaudio selinux
startup-notification system-cairo system-icu system-jpeg system-sqlite
system-libvpx"
+IUSE="${IUSE} dbus debug gstreamer gtk3 +jemalloc3 pulseaudio selinux
startup-notification system-cairo system-icu system-jpeg system-sqlite
system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs
2.14
@@ -144,7 +144,11 @@ mozconfig_config() {
--enable-svg \
--with-system-bz2
- mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
+ if use gtk3 ; then
+ mozconfig_annotate 'Enable Cairo Gtk+3 support'
--enable-default-toolkit=cairo-gtk3
+ else
+ mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
+ fi
if has bindist ${IUSE}; then
mozconfig_use_enable !bindist official-branding
diff --git a/www-client/firefox/firefox-38.0.5.ebuild
b/www-client/firefox/firefox-38.0.5.ebuild
index 0ac1f57..8061ce3 100644
--- a/www-client/firefox/firefox-38.0.5.ebuild
+++ b/www-client/firefox/firefox-38.0.5.ebuild
@@ -232,8 +232,6 @@ src_configure() {
fi
fi
- use gtk3 && mozconfig_annotate 'Enable Cairo Gtk+3 support'
--enable-default-toolkit=cairo-gtk3
-
use egl && mozconfig_annotate 'Enable EGL as GL provider'
--with-gl-provider=EGL
# Setup api key for location services
