aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory A. Pratt <anarchy@gentoo.org>2017-02-01 21:01:57 -0600
committerJory A. Pratt <anarchy@gentoo.org>2017-02-01 21:01:57 -0600
commit7c0970a092e19fd8c1df802d029d8bf630fc73ec (patch)
tree1f27ee3b1684a182b0e094aa0ff04512db73c7f2
parentmail-client/thunderbird - More misc fixes for beta ebuild only (diff)
downloadmozilla-7c0970a092e19fd8c1df802d029d8bf630fc73ec.tar.gz
mozilla-7c0970a092e19fd8c1df802d029d8bf630fc73ec.tar.bz2
mozilla-7c0970a092e19fd8c1df802d029d8bf630fc73ec.zip
eclass/mozconfig-v6.51 : Remove skia support as being optional and force
it to be default
-rw-r--r--eclass/mozconfig-v6.51.eclass12
1 files changed, 2 insertions, 10 deletions
diff --git a/eclass/mozconfig-v6.51.eclass b/eclass/mozconfig-v6.51.eclass
index 7bbed9a0..1e451f84 100644
--- a/eclass/mozconfig-v6.51.eclass
+++ b/eclass/mozconfig-v6.51.eclass
@@ -83,7 +83,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4
# 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 +jemalloc neon pulseaudio selinux +skia startup-notification system-cairo
+IUSE="${IUSE} dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo
system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx"
# some notes on deps:
@@ -286,7 +286,7 @@ mozconfig_config() {
mozconfig_annotate 'Gentoo default' --with-system-png
mozconfig_annotate '' --enable-system-ffi
mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
- mozconfig_use_enable skia
+ mozconfig_annotate '' skia
mozconfig_annotate '' --disable-gconf
mozconfig_annotate '' --with-intl-api
@@ -404,12 +404,4 @@ mozconfig_install_prefs() {
echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
>>"${prefs_file}" || die
fi
-
- # force cairo as the canvas renderer if USE=skia is disabled
- if ! use skia ; then
- echo "lockPref(\"gfx.canvas.azure.backends\",\"cairo\");" \
- >>"${prefs_file}" || die
- echo "lockPref(\"gfx.content.azure.backends\",\"cairo\");" \
- >>"${prefs_file}" || die
- fi
}