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