1 |
phajdan.jr 12/01/11 17:38:00 |
2 |
|
3 |
Modified: chromium-17.0.963.26.ebuild ChangeLog |
4 |
chromium-9999-r1.ebuild |
5 |
Added: chromium-18.0.1003.1.ebuild |
6 |
Log: |
7 |
Version bump for dev channel release. Disable DnsConfigServiceTest.GetSystemConfig test, bug #394883 by Jonathan Lovelace. Disable MessagePumpLibeventTest.DeleteWatcher test, bug #398501. NaCl binaries should work now, bug #389479 by Tatsh fixed upstream. |
8 |
|
9 |
(Portage version: 2.1.10.41/cvs/Linux i686) |
10 |
|
11 |
Revision Changes Path |
12 |
1.2 www-client/chromium/chromium-17.0.963.26.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-17.0.963.26.ebuild?rev=1.2&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-17.0.963.26.ebuild?rev=1.2&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-17.0.963.26.ebuild?r1=1.1&r2=1.2 |
17 |
|
18 |
Index: chromium-17.0.963.26.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.26.ebuild,v |
21 |
retrieving revision 1.1 |
22 |
retrieving revision 1.2 |
23 |
diff -u -r1.1 -r1.2 |
24 |
--- chromium-17.0.963.26.ebuild 5 Jan 2012 17:02:02 -0000 1.1 |
25 |
+++ chromium-17.0.963.26.ebuild 11 Jan 2012 17:38:00 -0000 1.2 |
26 |
@@ -1,6 +1,6 @@ |
27 |
# Copyright 1999-2012 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.26.ebuild,v 1.1 2012/01/05 17:02:02 floppym Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.26.ebuild,v 1.2 2012/01/11 17:38:00 phajdan.jr Exp $ |
31 |
|
32 |
EAPI="4" |
33 |
PYTHON_DEPEND="2:2.6" |
34 |
@@ -366,9 +366,10 @@ |
35 |
die "Tests must be run as non-root. Please use FEATURES=userpriv." |
36 |
fi |
37 |
|
38 |
- # For more info see bug #350347. |
39 |
+ # ICUStringConversionsTest: bug #350347. |
40 |
+ # MessagePumpLibeventTest: bug #398501. |
41 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ |
42 |
- '--gtest_filter=-ICUStringConversionsTest.*' |
43 |
+ '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*' |
44 |
|
45 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake |
46 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake |
47 |
|
48 |
|
49 |
|
50 |
1.534 www-client/chromium/ChangeLog |
51 |
|
52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.534&view=markup |
53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.534&content-type=text/plain |
54 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.533&r2=1.534 |
55 |
|
56 |
Index: ChangeLog |
57 |
=================================================================== |
58 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
59 |
retrieving revision 1.533 |
60 |
retrieving revision 1.534 |
61 |
diff -u -r1.533 -r1.534 |
62 |
--- ChangeLog 6 Jan 2012 18:34:57 -0000 1.533 |
63 |
+++ ChangeLog 11 Jan 2012 17:38:00 -0000 1.534 |
64 |
@@ -1,6 +1,16 @@ |
65 |
# ChangeLog for www-client/chromium |
66 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
67 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.533 2012/01/06 18:34:57 rich0 Exp $ |
68 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.534 2012/01/11 17:38:00 phajdan.jr Exp $ |
69 |
+ |
70 |
+*chromium-18.0.1003.1 (11 Jan 2012) |
71 |
+ |
72 |
+ 11 Jan 2012; Pawel Hajdan jr <phajdan.jr@g.o> |
73 |
+ +files/chromium-revert-jpeg-swizzle-r1.patch, chromium-17.0.963.26.ebuild, |
74 |
+ +chromium-18.0.1003.1.ebuild, chromium-9999-r1.ebuild: |
75 |
+ Version bump for dev channel release. Disable |
76 |
+ DnsConfigServiceTest.GetSystemConfig test, bug #394883 by Jonathan Lovelace. |
77 |
+ Disable MessagePumpLibeventTest.DeleteWatcher test, bug #398501. NaCl |
78 |
+ binaries should work now, bug #389479 by Tatsh fixed upstream. |
79 |
|
80 |
06 Jan 2012; Richard Freeman <rich0@g.o> chromium-16.0.912.75.ebuild: |
81 |
amd64 stable - 397907 |
82 |
|
83 |
|
84 |
|
85 |
1.86 www-client/chromium/chromium-9999-r1.ebuild |
86 |
|
87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.86&view=markup |
88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.86&content-type=text/plain |
89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.85&r2=1.86 |
90 |
|
91 |
Index: chromium-9999-r1.ebuild |
92 |
=================================================================== |
93 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v |
94 |
retrieving revision 1.85 |
95 |
retrieving revision 1.86 |
96 |
diff -u -r1.85 -r1.86 |
97 |
--- chromium-9999-r1.ebuild 1 Jan 2012 10:57:38 -0000 1.85 |
98 |
+++ chromium-9999-r1.ebuild 11 Jan 2012 17:38:00 -0000 1.86 |
99 |
@@ -1,6 +1,6 @@ |
100 |
# Copyright 1999-2012 Gentoo Foundation |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.85 2012/01/01 10:57:38 floppym Exp $ |
103 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.86 2012/01/11 17:38:00 phajdan.jr Exp $ |
104 |
|
105 |
EAPI="4" |
106 |
PYTHON_DEPEND="2:2.6" |
107 |
@@ -418,9 +418,10 @@ |
108 |
die "Tests must be run as non-root. Please use FEATURES=userpriv." |
109 |
fi |
110 |
|
111 |
- # For more info see bug #350347. |
112 |
+ # ICUStringConversionsTest: bug #350347. |
113 |
+ # MessagePumpLibeventTest: bug #398501. |
114 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ |
115 |
- '--gtest_filter=-ICUStringConversionsTest.*' |
116 |
+ '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*' |
117 |
|
118 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake |
119 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake |
120 |
@@ -429,10 +430,9 @@ |
121 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake |
122 |
|
123 |
# NetUtilTest: bug #361885. |
124 |
- # NetUtilTest.GenerateFileName: some locale-related mismatch. |
125 |
- # UDP: unstable, active development. We should revisit this later. |
126 |
+ # DnsConfigServiceTest.GetSystemConfig: bug #394883. |
127 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ |
128 |
- '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*' |
129 |
+ '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig' |
130 |
|
131 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake |
132 |
} |
133 |
|
134 |
|
135 |
|
136 |
1.1 www-client/chromium/chromium-18.0.1003.1.ebuild |
137 |
|
138 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-18.0.1003.1.ebuild?rev=1.1&view=markup |
139 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-18.0.1003.1.ebuild?rev=1.1&content-type=text/plain |
140 |
|
141 |
Index: chromium-18.0.1003.1.ebuild |
142 |
=================================================================== |
143 |
# Copyright 1999-2012 Gentoo Foundation |
144 |
# Distributed under the terms of the GNU General Public License v2 |
145 |
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-18.0.1003.1.ebuild,v 1.1 2012/01/11 17:38:00 phajdan.jr Exp $ |
146 |
|
147 |
EAPI="4" |
148 |
PYTHON_DEPEND="2:2.6" |
149 |
|
150 |
inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \ |
151 |
pax-utils portability python toolchain-funcs versionator virtualx |
152 |
|
153 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
154 |
HOMEPAGE="http://chromium.org/" |
155 |
SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2" |
156 |
|
157 |
LICENSE="BSD" |
158 |
SLOT="0" |
159 |
KEYWORDS="~amd64 ~x86" |
160 |
IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio" |
161 |
|
162 |
# en_US is ommitted on purpose from the list below. It must always be available. |
163 |
LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr |
164 |
hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th |
165 |
tr uk vi zh_CN zh_TW" |
166 |
for lang in ${LANGS}; do |
167 |
IUSE+=" linguas_${lang}" |
168 |
done |
169 |
|
170 |
RDEPEND="app-arch/bzip2 |
171 |
cups? ( |
172 |
dev-libs/libgcrypt |
173 |
>=net-print/cups-1.3.11 |
174 |
) |
175 |
>=dev-lang/v8-3.7.6 |
176 |
dev-libs/dbus-glib |
177 |
dev-libs/elfutils |
178 |
>=dev-libs/icu-4.4.1 |
179 |
>=dev-libs/libevent-1.4.13 |
180 |
dev-libs/libxml2[icu] |
181 |
dev-libs/libxslt |
182 |
>=dev-libs/nss-3.12.3 |
183 |
gnome? ( >=gnome-base/gconf-2.24.0 ) |
184 |
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) |
185 |
>=media-libs/alsa-lib-1.0.19 |
186 |
media-libs/flac |
187 |
virtual/jpeg |
188 |
media-libs/libpng |
189 |
>=media-libs/libwebp-0.1.2 |
190 |
media-libs/speex |
191 |
pulseaudio? ( media-sound/pulseaudio ) |
192 |
sys-libs/zlib |
193 |
x11-libs/gtk+:2 |
194 |
x11-libs/libXinerama |
195 |
x11-libs/libXScrnSaver |
196 |
x11-libs/libXtst |
197 |
kerberos? ( virtual/krb5 )" |
198 |
DEPEND="${RDEPEND} |
199 |
>=dev-lang/nacl-toolchain-newlib-0_p7311 |
200 |
dev-lang/perl |
201 |
dev-lang/yasm |
202 |
dev-python/simplejson |
203 |
>=dev-util/gperf-3.0.3 |
204 |
>=dev-util/pkgconfig-0.23 |
205 |
>=sys-devel/bison-2.4.3 |
206 |
sys-devel/flex |
207 |
>=sys-devel/make-3.81-r2 |
208 |
test? ( dev-python/pyftpdlib )" |
209 |
RDEPEND+=" |
210 |
!=www-client/chromium-9999 |
211 |
x11-misc/xdg-utils |
212 |
virtual/ttf-fonts" |
213 |
|
214 |
gyp_use() { |
215 |
if [[ $# -lt 2 ]]; then |
216 |
echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2 |
217 |
return 1 |
218 |
fi |
219 |
if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi |
220 |
} |
221 |
|
222 |
egyp() { |
223 |
set -- build/gyp_chromium --depth=. "${@}" |
224 |
echo "${@}" >&2 |
225 |
"${@}" |
226 |
} |
227 |
|
228 |
# Chromium uses different names for some langs, |
229 |
# return Chromium name corresponding to a Gentoo lang. |
230 |
chromium_lang() { |
231 |
if [[ "$1" == "es_LA" ]]; then |
232 |
echo "es_419" |
233 |
else |
234 |
echo "$1" |
235 |
fi |
236 |
} |
237 |
|
238 |
get_bundled_v8_version() { |
239 |
"$(PYTHON -2)" "${FILESDIR}"/extract_v8_version.py v8/src/version.cc |
240 |
} |
241 |
|
242 |
get_installed_v8_version() { |
243 |
best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g' |
244 |
} |
245 |
|
246 |
if ! has chromium-pkg_die ${EBUILD_DEATH_HOOKS}; then |
247 |
EBUILD_DEATH_HOOKS+=" chromium-pkg_die"; |
248 |
fi |
249 |
|
250 |
chromium-pkg_die() { |
251 |
if [[ "${EBUILD_PHASE}" != "compile" ]]; then |
252 |
return |
253 |
fi |
254 |
|
255 |
# Prevent user problems like bug #348235. |
256 |
eshopts_push -s extglob |
257 |
if is-flagq '-g?(gdb)?([1-9])'; then |
258 |
ewarn |
259 |
ewarn "You have enabled debug info (i.e. -g or -ggdb in your CFLAGS/CXXFLAGS)." |
260 |
ewarn "Please try removing -g{,gdb} before reporting a bug." |
261 |
ewarn |
262 |
fi |
263 |
eshopts_pop |
264 |
|
265 |
# ccache often causes bogus compile failures, especially when the cache gets |
266 |
# corrupted. |
267 |
if has ccache ${FEATURES}; then |
268 |
ewarn |
269 |
ewarn "You have enabled ccache. Please try disabling ccache" |
270 |
ewarn "before reporting a bug." |
271 |
ewarn |
272 |
fi |
273 |
|
274 |
# No ricer bugs. |
275 |
if use custom-cflags; then |
276 |
ewarn |
277 |
ewarn "You have enabled the custom-cflags USE flag." |
278 |
ewarn "Please disable it before reporting a bug." |
279 |
ewarn |
280 |
fi |
281 |
|
282 |
# If the system doesn't have enough memory, the compilation is known to |
283 |
# fail. Print info about memory to recognize this condition. |
284 |
einfo |
285 |
einfo "$(grep MemTotal /proc/meminfo)" |
286 |
einfo "$(grep SwapTotal /proc/meminfo)" |
287 |
einfo |
288 |
} |
289 |
|
290 |
pkg_setup() { |
291 |
if [[ "${SLOT}" == "0" ]]; then |
292 |
CHROMIUM_SUFFIX="" |
293 |
else |
294 |
CHROMIUM_SUFFIX="-${SLOT}" |
295 |
fi |
296 |
CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" |
297 |
|
298 |
# Make sure the build system will use the right tools, bug #340795. |
299 |
tc-export AR CC CXX RANLIB |
300 |
|
301 |
# Make sure the build system will use the right python, bug #344367. |
302 |
python_set_active_version 2 |
303 |
python_pkg_setup |
304 |
|
305 |
if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then |
306 |
# Fail if the kernel doesn't support features needed for sandboxing, |
307 |
# bug #363907. |
308 |
ERROR_PID_NS="PID_NS is required for sandbox to work" |
309 |
ERROR_NET_NS="NET_NS is required for sandbox to work" |
310 |
CONFIG_CHECK="~PID_NS ~NET_NS" |
311 |
check_extra_config |
312 |
fi |
313 |
|
314 |
if use bindist; then |
315 |
elog "bindist enabled: H.264 video support will be disabled." |
316 |
else |
317 |
elog "bindist disabled: Resulting binaries may not be legal to re-distribute." |
318 |
fi |
319 |
} |
320 |
|
321 |
src_prepare() { |
322 |
ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \ |
323 |
native_client/toolchain/linux_x86_newlib || die |
324 |
|
325 |
# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371. |
326 |
sed -i '1i#define OF(x) x' \ |
327 |
third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \ |
328 |
chrome/common/zip*.cc || die |
329 |
|
330 |
# Revert WebKit changeset responsible for Gentoo bug #393471. |
331 |
epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r1.patch" |
332 |
|
333 |
epatch_user |
334 |
|
335 |
# Remove most bundled libraries. Some are still needed. |
336 |
find third_party -type f \! -iname '*.gyp*' \ |
337 |
\! -path 'third_party/WebKit/*' \ |
338 |
\! -path 'third_party/angle/*' \ |
339 |
\! -path 'third_party/cacheinvalidation/*' \ |
340 |
\! -path 'third_party/cld/*' \ |
341 |
\! -path 'third_party/expat/*' \ |
342 |
\! -path 'third_party/ffmpeg/*' \ |
343 |
\! -path 'third_party/flac/flac.h' \ |
344 |
\! -path 'third_party/gpsd/*' \ |
345 |
\! -path 'third_party/harfbuzz/*' \ |
346 |
\! -path 'third_party/hunspell/*' \ |
347 |
\! -path 'third_party/iccjpeg/*' \ |
348 |
\! -path 'third_party/jsoncpp/*' \ |
349 |
\! -path 'third_party/khronos/*' \ |
350 |
\! -path 'third_party/launchpad_translations/*' \ |
351 |
\! -path 'third_party/leveldb/*' \ |
352 |
\! -path 'third_party/leveldatabase/*' \ |
353 |
\! -path 'third_party/libjingle/*' \ |
354 |
\! -path 'third_party/libphonenumber/*' \ |
355 |
\! -path 'third_party/libvpx/*' \ |
356 |
\! -path 'third_party/libyuv/*' \ |
357 |
\! -path 'third_party/lss/*' \ |
358 |
\! -path 'third_party/mesa/*' \ |
359 |
\! -path 'third_party/modp_b64/*' \ |
360 |
\! -path 'third_party/mongoose/*' \ |
361 |
\! -path 'third_party/npapi/*' \ |
362 |
\! -path 'third_party/openmax/*' \ |
363 |
\! -path 'third_party/ots/*' \ |
364 |
\! -path 'third_party/protobuf/*' \ |
365 |
\! -path 'third_party/scons-2.0.1/*' \ |
366 |
\! -path 'third_party/sfntly/*' \ |
367 |
\! -path 'third_party/skia/*' \ |
368 |
\! -path 'third_party/smhasher/*' \ |
369 |
\! -path 'third_party/speex/speex.h' \ |
370 |
\! -path 'third_party/sqlite/*' \ |
371 |
\! -path 'third_party/tcmalloc/*' \ |
372 |
\! -path 'third_party/tlslite/*' \ |
373 |
\! -path 'third_party/undoview/*' \ |
374 |
\! -path 'third_party/v8-i18n/*' \ |
375 |
\! -path 'third_party/webdriver/*' \ |
376 |
\! -path 'third_party/webgl_conformance/*' \ |
377 |
\! -path 'third_party/webrtc/*' \ |
378 |
\! -path 'third_party/zlib/contrib/minizip/*' \ |
379 |
-delete || die |
380 |
|
381 |
local v8_bundled="$(get_bundled_v8_version)" |
382 |
local v8_installed="$(get_installed_v8_version)" |
383 |
elog "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}" |
384 |
|
385 |
# Remove bundled v8. |
386 |
find v8 -type f \! -iname '*.gyp*' -delete || die |
387 |
|
388 |
# The implementation files include v8 headers with full path, |
389 |
# like #include "v8/include/v8.h". Make sure the system headers |
390 |
# will be used. |
391 |
# TODO: find a solution that can be upstreamed. |
392 |
rmdir v8/include || die |
393 |
ln -s /usr/include v8/include || die |
394 |
|
395 |
# Make sure the build system will use the right python, bug #344367. |
396 |
# Only convert directories that need it, to save time. |
397 |
python_convert_shebangs -q -r 2 build tools |
398 |
} |
399 |
|
400 |
src_configure() { |
401 |
local myconf="" |
402 |
|
403 |
# Never tell the build system to "enable" SSE2, it has a few unexpected |
404 |
# additions, bug #336871. |
405 |
myconf+=" -Ddisable_sse2=1" |
406 |
|
407 |
# Use system-provided libraries. |
408 |
# TODO: use_system_ffmpeg |
409 |
# TODO: use_system_hunspell (upstream changes needed). |
410 |
# TODO: use_system_ssl (http://crbug.com/58087). |
411 |
# TODO: use_system_sqlite (http://crbug.com/22208). |
412 |
# TODO: use_system_vpx |
413 |
myconf+=" |
414 |
-Duse_system_bzip2=1 |
415 |
-Duse_system_flac=1 |
416 |
-Duse_system_icu=1 |
417 |
-Duse_system_libevent=1 |
418 |
-Duse_system_libjpeg=1 |
419 |
-Duse_system_libpng=1 |
420 |
-Duse_system_libwebp=1 |
421 |
-Duse_system_libxml=1 |
422 |
-Duse_system_speex=1 |
423 |
-Duse_system_v8=1 |
424 |
-Duse_system_xdg_utils=1 |
425 |
-Duse_system_yasm=1 |
426 |
-Duse_system_zlib=1" |
427 |
|
428 |
# Optional dependencies. |
429 |
# TODO: linux_link_kerberos, bug #381289. |
430 |
myconf+=" |
431 |
$(gyp_use cups use_cups) |
432 |
$(gyp_use gnome use_gconf) |
433 |
$(gyp_use gnome-keyring use_gnome_keyring) |
434 |
$(gyp_use gnome-keyring linux_link_gnome_keyring) |
435 |
$(gyp_use kerberos use_kerberos) |
436 |
$(gyp_use pulseaudio use_pulseaudio)" |
437 |
|
438 |
# Enable sandbox. |
439 |
myconf+=" |
440 |
-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
441 |
-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
442 |
|
443 |
# if host-is-pax; then |
444 |
# # Prevent the build from failing (bug #301880). The performance |
445 |
# # difference is very small. |
446 |
# myconf+=" -Dv8_use_snapshot=0" |
447 |
# fi |
448 |
|
449 |
# Our system ffmpeg should support more codecs than the bundled one |
450 |
# for Chromium. |
451 |
# myconf+=" -Dproprietary_codecs=1" |
452 |
|
453 |
if ! use bindist; then |
454 |
# Enable H.624 support in bundled ffmpeg. |
455 |
myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" |
456 |
fi |
457 |
|
458 |
local myarch="$(tc-arch)" |
459 |
if [[ $myarch = amd64 ]] ; then |
460 |
myconf+=" -Dtarget_arch=x64" |
461 |
elif [[ $myarch = x86 ]] ; then |
462 |
myconf+=" -Dtarget_arch=ia32" |
463 |
elif [[ $myarch = arm ]] ; then |
464 |
# TODO: check this again after |
465 |
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. |
466 |
append-flags -fno-tree-sink |
467 |
|
468 |
myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" |
469 |
else |
470 |
die "Failed to determine target arch, got '$myarch'." |
471 |
fi |
472 |
|
473 |
# Make sure that -Werror doesn't get added to CFLAGS by the build system. |
474 |
# Depending on GCC version the warnings are different and we don't want |
475 |
# the build to fail because of that. |
476 |
myconf+=" -Dwerror=" |
477 |
|
478 |
# Avoid CFLAGS problems, bug #352457, bug #390147. |
479 |
if ! use custom-cflags; then |
480 |
replace-flags "-Os" "-O2" |
481 |
strip-flags |
482 |
fi |
483 |
|
484 |
egyp ${myconf} || die |
485 |
} |
486 |
|
487 |
src_compile() { |
488 |
emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die |
489 |
pax-mark m out/Release/chrome |
490 |
if use test; then |
491 |
emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 || die |
492 |
pax-mark m out/Release/{base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests |
493 |
fi |
494 |
} |
495 |
|
496 |
src_test() { |
497 |
# For more info see bug #350349. |
498 |
local mylocale='en_US.utf8' |
499 |
if ! locale -a | grep -q "$mylocale"; then |
500 |
eerror "${PN} requires ${mylocale} locale for tests" |
501 |
eerror "Please read the following guides for more information:" |
502 |
eerror " http://www.gentoo.org/doc/en/guide-localization.xml" |
503 |
eerror " http://www.gentoo.org/doc/en/utf-8.xml" |
504 |
die "locale ${mylocale} is not supported" |
505 |
fi |
506 |
|
507 |
# For more info see bug #370957. |
508 |
if [[ $UID -eq 0 ]]; then |
509 |
die "Tests must be run as non-root. Please use FEATURES=userpriv." |
510 |
fi |
511 |
|
512 |
# ICUStringConversionsTest: bug #350347. |
513 |
# MessagePumpLibeventTest: bug #398501. |
514 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ |
515 |
'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*' |
516 |
|
517 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake |
518 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake |
519 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake |
520 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake |
521 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake |
522 |
|
523 |
# NetUtilTest: bug #361885. |
524 |
# DnsConfigServiceTest.GetSystemConfig: bug #394883. |
525 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ |
526 |
'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig' |
527 |
|
528 |
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake |
529 |
} |
530 |
|
531 |
src_install() { |
532 |
exeinto "${CHROMIUM_HOME}" |
533 |
doexe out/Release/chrome || die |
534 |
doexe out/Release/chrome_sandbox || die |
535 |
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
536 |
|
537 |
doexe out/Release/chromedriver || die |
538 |
|
539 |
# Install Native Client files on platforms that support it. |
540 |
insinto "${CHROMIUM_HOME}" |
541 |
case "$(tc-arch)" in |
542 |
amd64) |
543 |
doexe out/Release/nacl_helper{,_bootstrap} || die |
544 |
doins out/Release/nacl_irt_x86_64.nexe || die |
545 |
doins out/Release/libppGoogleNaClPluginChrome.so || die |
546 |
;; |
547 |
x86) |
548 |
doexe out/Release/nacl_helper{,_bootstrap} || die |
549 |
doins out/Release/nacl_irt_x86_32.nexe || die |
550 |
doins out/Release/libppGoogleNaClPluginChrome.so || die |
551 |
;; |
552 |
esac |
553 |
|
554 |
newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die |
555 |
if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then |
556 |
sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \ |
557 |
-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die |
558 |
sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \ |
559 |
-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die |
560 |
sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \ |
561 |
-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die |
562 |
fi |
563 |
|
564 |
# It is important that we name the target "chromium-browser", |
565 |
# xdg-utils expect it; bug #355517. |
566 |
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die |
567 |
# keep the old symlink around for consistency |
568 |
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die |
569 |
|
570 |
# Allow users to override command-line options, bug #357629. |
571 |
dodir /etc/chromium || die |
572 |
insinto /etc/chromium |
573 |
newins "${FILESDIR}/chromium.default" "default" || die |
574 |
|
575 |
# Support LINGUAS, bug #332751. |
576 |
local pak |
577 |
for pak in out/Release/locales/*.pak; do |
578 |
local pakbasename="$(basename ${pak})" |
579 |
local pakname="${pakbasename%.pak}" |
580 |
local langname="${pakname//-/_}" |
581 |
|
582 |
# Do not issue warning for en_US locale. This is the fallback |
583 |
# locale so it should always be installed. |
584 |
if [[ "${langname}" == "en_US" ]]; then |
585 |
continue |
586 |
fi |
587 |
|
588 |
local found=false |
589 |
local lang |
590 |
for lang in ${LANGS}; do |
591 |
local crlang="$(chromium_lang ${lang})" |
592 |
if [[ "${langname}" == "${crlang}" ]]; then |
593 |
found=true |
594 |
break |
595 |
fi |
596 |
done |
597 |
if ! $found; then |
598 |
ewarn "LINGUAS warning: no ${langname} in LANGS" |
599 |
fi |
600 |
done |
601 |
local lang |
602 |
for lang in ${LANGS}; do |
603 |
local crlang="$(chromium_lang ${lang})" |
604 |
local pakfile="out/Release/locales/${crlang//_/-}.pak" |
605 |
if [ ! -f "${pakfile}" ]; then |
606 |
ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)" |
607 |
fi |
608 |
if ! use linguas_${lang}; then |
609 |
rm "${pakfile}" || die |
610 |
fi |
611 |
done |
612 |
|
613 |
insinto "${CHROMIUM_HOME}" |
614 |
doins out/Release/chrome.pak || die |
615 |
doins out/Release/resources.pak || die |
616 |
|
617 |
doins -r out/Release/locales || die |
618 |
doins -r out/Release/resources || die |
619 |
|
620 |
newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die |
621 |
newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die |
622 |
|
623 |
# Chromium looks for these in its folder |
624 |
# See media_posix.cc and base_paths_linux.cc |
625 |
# dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die |
626 |
# dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die |
627 |
# dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die |
628 |
doexe out/Release/libffmpegsumo.so || die |
629 |
|
630 |
# Install icons and desktop entry. |
631 |
for SIZE in 16 22 24 32 48 64 128 256 ; do |
632 |
insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps |
633 |
newins chrome/app/theme/chromium/product_logo_${SIZE}.png \ |
634 |
chromium-browser${CHROMIUM_SUFFIX}.png || die |
635 |
done |
636 |
local mime_types="text/html;text/xml;application/xhtml+xml;" |
637 |
mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 |
638 |
make_desktop_entry \ |
639 |
chromium-browser${CHROMIUM_SUFFIX} \ |
640 |
"Chromium${CHROMIUM_SUFFIX}" \ |
641 |
chromium-browser${CHROMIUM_SUFFIX} \ |
642 |
"Network;WebBrowser" \ |
643 |
"MimeType=${mime_types}\nStartupWMClass=chromium-browser" |
644 |
sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die |
645 |
|
646 |
# Install GNOME default application entry (bug #303100). |
647 |
if use gnome; then |
648 |
dodir /usr/share/gnome-control-center/default-apps || die |
649 |
insinto /usr/share/gnome-control-center/default-apps |
650 |
newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die |
651 |
if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then |
652 |
sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ |
653 |
"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml |
654 |
fi |
655 |
fi |
656 |
} |
657 |
|
658 |
pkg_preinst() { |
659 |
gnome2_icon_savelist |
660 |
} |
661 |
|
662 |
pkg_postinst() { |
663 |
fdo-mime_desktop_database_update |
664 |
gnome2_icon_cache_update |
665 |
|
666 |
# For more info see bug #292201, bug #352263, bug #361859. |
667 |
elog |
668 |
elog "Depending on your desktop environment, you may need" |
669 |
elog "to install additional packages to get icons on the Downloads page." |
670 |
elog |
671 |
elog "For KDE, the required package is kde-base/oxygen-icons." |
672 |
elog |
673 |
elog "For other desktop environments, try one of the following:" |
674 |
elog " - x11-themes/gnome-icon-theme" |
675 |
elog " - x11-themes/tango-icon-theme" |
676 |
|
677 |
# For more info see bug #359153. |
678 |
elog |
679 |
elog "Some web pages may require additional fonts to display properly." |
680 |
elog "Try installing some of the following packages if some characters" |
681 |
elog "are not displayed properly:" |
682 |
elog " - media-fonts/arphicfonts" |
683 |
elog " - media-fonts/bitstream-cyberbit" |
684 |
elog " - media-fonts/droid" |
685 |
elog " - media-fonts/ipamonafont" |
686 |
elog " - media-fonts/ja-ipafonts" |
687 |
elog " - media-fonts/takao-fonts" |
688 |
elog " - media-fonts/wqy-microhei" |
689 |
elog " - media-fonts/wqy-zenhei" |
690 |
} |
691 |
|
692 |
pkg_postrm() { |
693 |
gnome2_icon_cache_update |
694 |
} |