Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/
Date: Thu, 02 Feb 2017 03:02:46
Message-Id: 1486004517.7c0970a092e19fd8c1df802d029d8bf630fc73ec.anarchy@gentoo
1 commit: 7c0970a092e19fd8c1df802d029d8bf630fc73ec
2 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 2 03:01:57 2017 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 2 03:01:57 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=7c0970a0
7
8 eclass/mozconfig-v6.51 : Remove skia support as being optional and force
9 it to be default
10
11 eclass/mozconfig-v6.51.eclass | 12 ++----------
12 1 file changed, 2 insertions(+), 10 deletions(-)
13
14 diff --git a/eclass/mozconfig-v6.51.eclass b/eclass/mozconfig-v6.51.eclass
15 index 7bbed9a..1e451f8 100644
16 --- a/eclass/mozconfig-v6.51.eclass
17 +++ b/eclass/mozconfig-v6.51.eclass
18 @@ -83,7 +83,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4
19 # Set the variable to any value if the use flag should exist but not be default-enabled.
20
21 # use-flags common among all mozilla ebuilds
22 -IUSE="${IUSE} dbus debug +jemalloc neon pulseaudio selinux +skia startup-notification system-cairo
23 +IUSE="${IUSE} dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo
24 system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx"
25
26 # some notes on deps:
27 @@ -286,7 +286,7 @@ mozconfig_config() {
28 mozconfig_annotate 'Gentoo default' --with-system-png
29 mozconfig_annotate '' --enable-system-ffi
30 mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
31 - mozconfig_use_enable skia
32 + mozconfig_annotate '' skia
33 mozconfig_annotate '' --disable-gconf
34 mozconfig_annotate '' --with-intl-api
35
36 @@ -404,12 +404,4 @@ mozconfig_install_prefs() {
37 echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
38 >>"${prefs_file}" || die
39 fi
40 -
41 - # force cairo as the canvas renderer if USE=skia is disabled
42 - if ! use skia ; then
43 - echo "lockPref(\"gfx.canvas.azure.backends\",\"cairo\");" \
44 - >>"${prefs_file}" || die
45 - echo "lockPref(\"gfx.content.azure.backends\",\"cairo\");" \
46 - >>"${prefs_file}" || die
47 - fi
48 }