1 |
commit: 94962582bc0ab30ccc29051d410a521089dcc7cc |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 4 14:10:46 2017 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 4 14:52:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=94962582 |
7 |
|
8 |
mozconfig-v6.52.eclass: various fixes |
9 |
|
10 |
Skia support is now forced off on big-endian platforms, to avoid bug 607662 |
11 |
|
12 |
gtk+:2 is added back as a fixed dependency, as it is still needed on mozilla-52 |
13 |
regardless of whether or not the toolkit is cairo-gtk3, bug 601326 |
14 |
|
15 |
apulse is now an alternative dependency to pulseaudio for USE="pulseaudio" |
16 |
|
17 |
eclass/mozconfig-v6.52.eclass | 50 +++++++++++++++++++++++++++---------------- |
18 |
1 file changed, 32 insertions(+), 18 deletions(-) |
19 |
|
20 |
diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass |
21 |
index c260153..409c8ad 100644 |
22 |
--- a/eclass/mozconfig-v6.52.eclass |
23 |
+++ b/eclass/mozconfig-v6.52.eclass |
24 |
@@ -51,12 +51,14 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 |
25 |
# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 |
26 |
# @DESCRIPTION: |
27 |
# Set this variable before the inherit line, when an ebuild can provide |
28 |
-# optional gtk3 support via IUSE="gtk3". Currently this would include |
29 |
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the future. |
30 |
+# optional gtk3 support via IUSE="force-gtk3". Currently this would include |
31 |
+# thunderbird and seamonkey in the future, once support is ready for testing. |
32 |
# |
33 |
-# Leave the variable UNSET if gtk3 support should not be available. |
34 |
+# Leave the variable UNSET if gtk3 support should not be optionally available. |
35 |
# Set the variable to "enabled" if the use flag should be enabled by default. |
36 |
# Set the variable to any value if the use flag should exist but not be default-enabled. |
37 |
+# If gtk+:3 is to be the standard toolkit, do not use this and instead use |
38 |
+# MOZCONFIG_OPTIONAL_GTK2ONLY. |
39 |
|
40 |
# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY |
41 |
# @DESCRIPTION: |
42 |
@@ -93,6 +95,7 @@ RDEPEND=">=app-text/hunspell-1.2:= |
43 |
dev-libs/atk |
44 |
dev-libs/expat |
45 |
>=x11-libs/cairo-1.10[X] |
46 |
+ >=x11-libs/gtk+-2.18:2 |
47 |
x11-libs/gdk-pixbuf |
48 |
>=x11-libs/pango-1.22.0 |
49 |
>=media-libs/libpng-1.6.25:0=[apng] |
50 |
@@ -100,7 +103,8 @@ RDEPEND=">=app-text/hunspell-1.2:= |
51 |
media-libs/fontconfig |
52 |
>=media-libs/freetype-2.4.10 |
53 |
kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) |
54 |
- pulseaudio? ( media-sound/pulseaudio ) |
55 |
+ pulseaudio? ( media-sound/pulseaudio |
56 |
+ >=media-sound/apulse-0.1.9 ) |
57 |
virtual/freedesktop-icon-theme |
58 |
dbus? ( >=sys-apps/dbus-0.60 |
59 |
>=dev-libs/dbus-glib-0.72 ) |
60 |
@@ -128,25 +132,18 @@ RDEPEND=">=app-text/hunspell-1.2:= |
61 |
if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then |
62 |
MOZCONFIG_OPTIONAL_GTK2ONLY= |
63 |
if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then |
64 |
- IUSE+=" +gtk3" |
65 |
+ IUSE+=" +force-gtk3" |
66 |
else |
67 |
- IUSE+=" gtk3" |
68 |
+ IUSE+=" force-gtk3" |
69 |
fi |
70 |
- RDEPEND+=" |
71 |
- gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) |
72 |
- !gtk3? ( >=x11-libs/gtk+-2.18:2 )" |
73 |
+ RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )" |
74 |
elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then |
75 |
if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then |
76 |
IUSE+=" +gtk2" |
77 |
else |
78 |
IUSE+=" gtk2" |
79 |
fi |
80 |
- RDEPEND+=" |
81 |
- gtk2? ( >=x11-libs/gtk+-2.18:2 ) |
82 |
- !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )" |
83 |
-else |
84 |
- RDEPEND+=" |
85 |
- >=x11-libs/gtk+-2.18:2" |
86 |
+ RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )" |
87 |
fi |
88 |
if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then |
89 |
if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then |
90 |
@@ -248,10 +245,16 @@ mozconfig_config() { |
91 |
mozconfig_annotate 'Gentoo default' --with-system-png |
92 |
mozconfig_annotate '' --enable-system-ffi |
93 |
mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold |
94 |
- mozconfig_annotate '' --enable-skia |
95 |
mozconfig_annotate '' --disable-gconf |
96 |
mozconfig_annotate '' --with-intl-api |
97 |
|
98 |
+ # skia has no support for big-endian platforms |
99 |
+ if [[ $(tc-endian) == "big" ]]; then |
100 |
+ mozconfig_annotate 'big endian target' --disable-skia |
101 |
+ else |
102 |
+ mozconfig_annotate '' --enable-skia |
103 |
+ fi |
104 |
+ |
105 |
# default toolkit is cairo-gtk2, optional use flags can change this |
106 |
local toolkit="cairo-gtk2" |
107 |
local toolkit_comment="" |
108 |
@@ -301,7 +304,8 @@ mozconfig_config() { |
109 |
mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" |
110 |
|
111 |
mozconfig_use_enable pulseaudio |
112 |
- if ! use pulseaudio ; then |
113 |
+ # force the deprecated alsa sound code if pulseaudio is disabled |
114 |
+ if use kernel_linux && ! use pulseaudio ; then |
115 |
mozconfig_annotate '-pulseaudio' --enable-alsa |
116 |
fi |
117 |
|
118 |
@@ -321,7 +325,9 @@ mozconfig_config() { |
119 |
fi |
120 |
if [[ ${CHOST} == armv* ]] ; then |
121 |
mozconfig_annotate '' --with-float-abi=hard |
122 |
- mozconfig_annotate '' --enable-skia |
123 |
+ if ! use skia ; then |
124 |
+ mozconfig_annotate 'Gentoo forces skia for arm' --enable-skia |
125 |
+ fi |
126 |
|
127 |
if ! use system-libvpx ; then |
128 |
sed -i -e "s|softfp|hard|" \ |
129 |
@@ -369,4 +375,12 @@ mozconfig_install_prefs() { |
130 |
echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ |
131 |
>>"${prefs_file}" || die |
132 |
fi |
133 |
+ |
134 |
+ # force cairo as the canvas renderer on platforms without skia support |
135 |
+ if [[ $(tc-endian) == "big" ]] ; then |
136 |
+ echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \ |
137 |
+ >>"${prefs_file}" || die |
138 |
+ echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \ |
139 |
+ >>"${prefs_file}" || die |
140 |
+ fi |
141 |
} |