Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-21.0.1180.89.ebuild ChangeLog
Date: Fri, 31 Aug 2012 20:02:04
Message-Id: 20120831200149.6533720DE2@flycatcher.gentoo.org
1 floppym 12/08/31 20:01:47
2
3 Modified: ChangeLog
4 Added: chromium-21.0.1180.89.ebuild
5 Log:
6 Version bump for stable channel release. Fails gpu_unittests.
7
8 (Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.703 www-client/chromium/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.703&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.703&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.702&r2=1.703
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
20 retrieving revision 1.702
21 retrieving revision 1.703
22 diff -u -r1.702 -r1.703
23 --- ChangeLog 30 Aug 2012 22:04:12 -0000 1.702
24 +++ ChangeLog 31 Aug 2012 20:01:47 -0000 1.703
25 @@ -1,6 +1,11 @@
26 # ChangeLog for www-client/chromium
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.702 2012/08/30 22:04:12 floppym Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.703 2012/08/31 20:01:47 floppym Exp $
30 +
31 +*chromium-21.0.1180.89 (31 Aug 2012)
32 +
33 + 31 Aug 2012; Mike Gilbert <floppym@g.o> +chromium-21.0.1180.89.ebuild:
34 + Version bump for stable channel release. Fails gpu_unittests.
35
36 *chromium-22.0.1229.26 (30 Aug 2012)
37
38
39
40
41 1.1 www-client/chromium/chromium-21.0.1180.89.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-21.0.1180.89.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-21.0.1180.89.ebuild?rev=1.1&content-type=text/plain
45
46 Index: chromium-21.0.1180.89.ebuild
47 ===================================================================
48 # Copyright 1999-2012 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1180.89.ebuild,v 1.1 2012/08/31 20:01:47 floppym Exp $
51
52 EAPI="4"
53 PYTHON_DEPEND="2:2.6"
54
55 CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
56 hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
57 sv sw ta te th tr uk vi zh_CN zh_TW"
58
59 inherit chromium eutils flag-o-matic multilib \
60 pax-utils portability python toolchain-funcs versionator virtualx
61
62 DESCRIPTION="Open-source version of Google Chrome web browser"
63 HOMEPAGE="http://chromium.org/"
64 SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
65
66 LICENSE="BSD"
67 SLOT="0"
68 KEYWORDS="~amd64 ~x86"
69 IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
70
71 RDEPEND="app-arch/bzip2
72 cups? (
73 dev-libs/libgcrypt
74 >=net-print/cups-1.3.11
75 )
76 >=dev-lang/v8-3.11.10.6
77 dev-libs/dbus-glib
78 >=dev-libs/elfutils-0.149
79 dev-libs/expat
80 >=dev-libs/icu-49.1.1-r1
81 >=dev-libs/libevent-1.4.13
82 dev-libs/libxml2[icu]
83 dev-libs/libxslt
84 >=dev-libs/nss-3.12.3
85 gnome? ( >=gnome-base/gconf-2.24.0 )
86 gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
87 >=media-libs/alsa-lib-1.0.19
88 media-libs/flac
89 >=media-libs/libjpeg-turbo-1.2.0-r1
90 media-libs/libpng
91 >=media-libs/libwebp-0.2.0_rc1
92 media-libs/speex
93 pulseaudio? ( media-sound/pulseaudio )
94 sys-fs/udev
95 sys-libs/zlib
96 virtual/libusb:1
97 x11-libs/gtk+:2
98 x11-libs/libXinerama
99 x11-libs/libXScrnSaver
100 x11-libs/libXtst
101 kerberos? ( virtual/krb5 )
102 selinux? ( sys-libs/libselinux )"
103 DEPEND="${RDEPEND}
104 >=dev-lang/nacl-toolchain-newlib-0_p7311
105 dev-lang/perl
106 dev-lang/yasm
107 dev-python/ply
108 dev-python/simplejson
109 >=dev-util/gperf-3.0.3
110 >=sys-devel/bison-2.4.3
111 sys-devel/flex
112 >=sys-devel/make-3.81-r2
113 virtual/pkgconfig
114 test? (
115 dev-python/pyftpdlib
116 )"
117 RDEPEND+="
118 !=www-client/chromium-9999
119 x11-misc/xdg-utils
120 virtual/ttf-fonts"
121
122 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
123 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
124 fi
125
126 pkg_setup() {
127 if [[ "${SLOT}" == "0" ]]; then
128 CHROMIUM_SUFFIX=""
129 else
130 CHROMIUM_SUFFIX="-${SLOT}"
131 fi
132 CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
133
134 # Make sure the build system will use the right tools, bug #340795.
135 tc-export AR CC CXX RANLIB
136
137 # Make sure the build system will use the right python, bug #344367.
138 python_set_active_version 2
139 python_pkg_setup
140
141 if ! use selinux; then
142 chromium_suid_sandbox_check_kernel_config
143 fi
144
145 if use bindist; then
146 elog "bindist enabled: H.264 video support will be disabled."
147 else
148 elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
149 fi
150 }
151
152 src_prepare() {
153 ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
154 native_client/toolchain/linux_x86_newlib || die
155
156 # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
157 sed -i '1i#define OF(x) x' \
158 third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
159
160 # Fix build without NaCl glibc toolchain.
161 epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
162
163 # Bug 427438.
164 epatch "${FILESDIR}/${PN}-bison-2.6-r0.patch"
165
166 epatch_user
167
168 # Remove most bundled libraries. Some are still needed.
169 find third_party -type f \! -iname '*.gyp*' \
170 \! -path 'third_party/WebKit/*' \
171 \! -path 'third_party/angle/*' \
172 \! -path 'third_party/cacheinvalidation/*' \
173 \! -path 'third_party/cld/*' \
174 \! -path 'third_party/ffmpeg/*' \
175 \! -path 'third_party/flac/flac.h' \
176 \! -path 'third_party/gpsd/*' \
177 \! -path 'third_party/harfbuzz/*' \
178 \! -path 'third_party/hunspell/*' \
179 \! -path 'third_party/iccjpeg/*' \
180 \! -path 'third_party/jsoncpp/*' \
181 \! -path 'third_party/khronos/*' \
182 \! -path 'third_party/launchpad_translations/*' \
183 \! -path 'third_party/leveldatabase/*' \
184 \! -path 'third_party/libjingle/*' \
185 \! -path 'third_party/libphonenumber/*' \
186 \! -path 'third_party/libsrtp/*' \
187 \! -path 'third_party/libusb/libusb.h' \
188 \! -path 'third_party/libvpx/*' \
189 \! -path 'third_party/libxml/chromium/*' \
190 \! -path 'third_party/libyuv/*' \
191 \! -path 'third_party/lss/*' \
192 \! -path 'third_party/mesa/*' \
193 \! -path 'third_party/modp_b64/*' \
194 \! -path 'third_party/mongoose/*' \
195 \! -path 'third_party/npapi/*' \
196 \! -path 'third_party/openmax/*' \
197 \! -path 'third_party/ots/*' \
198 \! -path 'third_party/protobuf/*' \
199 \! -path 'third_party/scons-2.0.1/*' \
200 \! -path 'third_party/sfntly/*' \
201 \! -path 'third_party/skia/*' \
202 \! -path 'third_party/smhasher/*' \
203 \! -path 'third_party/speex/speex.h' \
204 \! -path 'third_party/sqlite/*' \
205 \! -path 'third_party/tlslite/*' \
206 \! -path 'third_party/trace-viewer/*' \
207 \! -path 'third_party/undoview/*' \
208 \! -path 'third_party/v8-i18n/*' \
209 \! -path 'third_party/webdriver/*' \
210 \! -path 'third_party/webgl_conformance/*' \
211 \! -path 'third_party/webrtc/*' \
212 \! -path 'third_party/zlib/contrib/minizip/*' \
213 -delete || die
214
215 local v8_bundled="$(chromium_bundled_v8_version)"
216 local v8_installed="$(chromium_installed_v8_version)"
217 einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
218
219 # Remove bundled v8.
220 find v8 -type f \! -iname '*.gyp*' -delete || die
221
222 # The implementation files include v8 headers with full path,
223 # like #include "v8/include/v8.h". Make sure the system headers
224 # will be used.
225 # TODO: find a solution that can be upstreamed.
226 rmdir v8/include || die
227 ln -s /usr/include v8/include || die
228
229 # Make sure the build system will use the right python, bug #344367.
230 # Only convert directories that need it, to save time.
231 python_convert_shebangs -q -r 2 build tools
232 }
233
234 src_configure() {
235 local myconf=""
236
237 # Never tell the build system to "enable" SSE2, it has a few unexpected
238 # additions, bug #336871.
239 myconf+=" -Ddisable_sse2=1"
240
241 # Disable tcmalloc, it causes problems with e.g. NVIDIA
242 # drivers, bug #413637.
243 myconf+=" -Dlinux_use_tcmalloc=0"
244
245 # Disable glibc Native Client toolchain, we don't need it (bug #417019).
246 myconf+=" -Ddisable_glibc=1"
247
248 # Make it possible to remove third_party/adobe.
249 echo > "${T}/flapper_version.h" || die
250 myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
251
252 # Use system-provided libraries.
253 # TODO: use_system_ffmpeg
254 # TODO: use_system_hunspell (upstream changes needed).
255 # TODO: use_system_ssl (http://crbug.com/58087).
256 # TODO: use_system_sqlite (http://crbug.com/22208).
257 # TODO: use_system_vpx
258 myconf+="
259 -Duse_system_bzip2=1
260 -Duse_system_flac=1
261 -Duse_system_icu=1
262 -Duse_system_libevent=1
263 -Duse_system_libjpeg=1
264 -Duse_system_libpng=1
265 -Duse_system_libusb=1
266 -Duse_system_libwebp=1
267 -Duse_system_libxml=1
268 -Duse_system_speex=1
269 -Duse_system_v8=1
270 -Duse_system_xdg_utils=1
271 -Duse_system_yasm=1
272 -Duse_system_zlib=1"
273
274 # Optional dependencies.
275 # TODO: linux_link_kerberos, bug #381289.
276 myconf+="
277 $(gyp_use cups)
278 $(gyp_use gnome use_gconf)
279 $(gyp_use gnome-keyring use_gnome_keyring)
280 $(gyp_use gnome-keyring linux_link_gnome_keyring)
281 $(gyp_use kerberos)
282 $(gyp_use pulseaudio)
283 $(gyp_use selinux selinux)"
284
285 # Use explicit library dependencies instead of dlopen.
286 # This makes breakages easier to detect by revdep-rebuild.
287 myconf+="
288 -Dlinux_link_gsettings=1"
289
290 if ! use selinux; then
291 # Enable SUID sandbox.
292 myconf+="
293 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
294 -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
295 fi
296
297 # Never use bundled gold binary. Disable gold linker flags for now.
298 myconf+="
299 -Dlinux_use_gold_binary=0
300 -Dlinux_use_gold_flags=0"
301
302 if ! use bindist; then
303 # Enable H.624 support in bundled ffmpeg.
304 myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
305 fi
306
307 local myarch="$(tc-arch)"
308 if [[ $myarch = amd64 ]] ; then
309 myconf+=" -Dtarget_arch=x64"
310 elif [[ $myarch = x86 ]] ; then
311 myconf+=" -Dtarget_arch=ia32"
312 else
313 die "Failed to determine target arch, got '$myarch'."
314 fi
315
316 # Make sure that -Werror doesn't get added to CFLAGS by the build system.
317 # Depending on GCC version the warnings are different and we don't want
318 # the build to fail because of that.
319 myconf+=" -Dwerror="
320
321 # Avoid CFLAGS problems, bug #352457, bug #390147.
322 if ! use custom-cflags; then
323 replace-flags "-Os" "-O2"
324 strip-flags
325 fi
326
327 egyp_chromium ${myconf} || die
328 }
329
330 src_compile() {
331 local test_targets
332 for x in base cacheinvalidation crypto \
333 googleurl gpu media net printing sql; do
334 test_targets+=" ${x}_unittests"
335 done
336
337 local make_targets="chrome chromedriver"
338 if ! use selinux; then
339 make_targets+=" chrome_sandbox"
340 fi
341 if use test; then
342 make_targets+=$test_targets
343 fi
344
345 # See bug #410883 for more info about the .host mess.
346 emake ${make_targets} BUILDTYPE=Release V=1 \
347 CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
348 CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
349 LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
350 AR.host="$(tc-getAR)" || die
351
352 pax-mark m out/Release/chrome
353 if use test; then
354 for x in $test_targets; do
355 pax-mark m out/Release/${x}
356 done
357 fi
358 }
359
360 src_test() {
361 # For more info see bug #350349.
362 local mylocale='en_US.utf8'
363 if ! locale -a | grep -q "$mylocale"; then
364 eerror "${PN} requires ${mylocale} locale for tests"
365 eerror "Please read the following guides for more information:"
366 eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
367 eerror " http://www.gentoo.org/doc/en/utf-8.xml"
368 die "locale ${mylocale} is not supported"
369 fi
370
371 # For more info see bug #370957.
372 if [[ $UID -eq 0 ]]; then
373 die "Tests must be run as non-root. Please use FEATURES=userpriv."
374 fi
375
376 # ICUStringConversionsTest: bug #350347.
377 # MessagePumpLibeventTest: bug #398501.
378 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
379 '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
380
381 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
382 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
383 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
384 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
385 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
386
387 # NetUtilTest: bug #361885.
388 # DnsConfigServiceTest.GetSystemConfig: bug #394883.
389 # CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
390 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
391 '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned:URLFetcher*'
392
393 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
394 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/sql_unittests virtualmake
395 }
396
397 src_install() {
398 exeinto "${CHROMIUM_HOME}"
399 doexe out/Release/chrome || die
400
401 if ! use selinux; then
402 doexe out/Release/chrome_sandbox || die
403 fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
404 fi
405
406 doexe out/Release/chromedriver || die
407
408 doexe out/Release/nacl_helper{,_bootstrap} || die
409 insinto "${CHROMIUM_HOME}"
410 doins out/Release/nacl_irt_*.nexe || die
411 doins out/Release/libppGoogleNaClPluginChrome.so || die
412
413 newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
414 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
415 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
416 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
417 sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
418 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
419 sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
420 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
421 fi
422
423 # It is important that we name the target "chromium-browser",
424 # xdg-utils expect it; bug #355517.
425 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
426 # keep the old symlink around for consistency
427 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
428
429 # Allow users to override command-line options, bug #357629.
430 dodir /etc/chromium || die
431 insinto /etc/chromium
432 newins "${FILESDIR}/chromium.default" "default" || die
433
434 pushd out/Release/locales > /dev/null || die
435 chromium_remove_language_paks
436 popd
437
438 insinto "${CHROMIUM_HOME}"
439 doins out/Release/*.pak || die
440
441 doins -r out/Release/locales || die
442 doins -r out/Release/resources || die
443
444 newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
445 newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
446
447 doexe out/Release/libffmpegsumo.so || die
448
449 # Install icons and desktop entry.
450 local branding size
451 for size in 16 22 24 32 48 64 128 256 ; do
452 case ${size} in
453 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
454 *) branding="chrome/app/theme/chromium" ;;
455 esac
456 newicon -s ${size} "${branding}/product_logo_${size}.png" \
457 chromium-browser${CHROMIUM_SUFFIX}.png
458 done
459
460 local mime_types="text/html;text/xml;application/xhtml+xml;"
461 mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
462 mime_types+="x-scheme-handler/ftp;" # bug #412185
463 mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
464 make_desktop_entry \
465 chromium-browser${CHROMIUM_SUFFIX} \
466 "Chromium${CHROMIUM_SUFFIX}" \
467 chromium-browser${CHROMIUM_SUFFIX} \
468 "Network;WebBrowser" \
469 "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
470 sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
471
472 # Install GNOME default application entry (bug #303100).
473 if use gnome; then
474 dodir /usr/share/gnome-control-center/default-apps || die
475 insinto /usr/share/gnome-control-center/default-apps
476 newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
477 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
478 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
479 "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
480 fi
481 fi
482 }