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-20.0.1132.39.ebuild ChangeLog chromium-20.0.1132.27-r1.ebuild
Date: Thu, 21 Jun 2012 02:23:01
Message-Id: 20120621022249.53F942004C@flycatcher.gentoo.org
1 floppym 12/06/21 02:22:49
2
3 Modified: ChangeLog
4 Added: chromium-20.0.1132.39.ebuild
5 Removed: chromium-20.0.1132.27-r1.ebuild
6 Log:
7 Version bump for beta channel release.
8
9 (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.660 www-client/chromium/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.660&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.660&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.659&r2=1.660
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
21 retrieving revision 1.659
22 retrieving revision 1.660
23 diff -u -r1.659 -r1.660
24 --- ChangeLog 20 Jun 2012 13:41:20 -0000 1.659
25 +++ ChangeLog 21 Jun 2012 02:22:49 -0000 1.660
26 @@ -1,6 +1,12 @@
27 # ChangeLog for www-client/chromium
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.659 2012/06/20 13:41:20 phajdan.jr Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.660 2012/06/21 02:22:49 floppym Exp $
31 +
32 +*chromium-20.0.1132.39 (21 Jun 2012)
33 +
34 + 21 Jun 2012; Mike Gilbert <floppym@g.o> +chromium-20.0.1132.39.ebuild,
35 + -chromium-20.0.1132.27-r1.ebuild:
36 + Version bump for beta channel release.
37
38 *chromium-21.0.1180.0 (20 Jun 2012)
39
40
41
42
43 1.1 www-client/chromium/chromium-20.0.1132.39.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-20.0.1132.39.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-20.0.1132.39.ebuild?rev=1.1&content-type=text/plain
47
48 Index: chromium-20.0.1132.39.ebuild
49 ===================================================================
50 # Copyright 1999-2012 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1132.39.ebuild,v 1.1 2012/06/21 02:22:49 floppym Exp $
53
54 EAPI="4"
55 PYTHON_DEPEND="2:2.6"
56
57 CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
58 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
59 sv sw ta te th tr uk vi zh_CN zh_TW"
60
61 inherit chromium eutils flag-o-matic multilib \
62 pax-utils portability python toolchain-funcs versionator virtualx
63
64 DESCRIPTION="Open-source version of Google Chrome web browser"
65 HOMEPAGE="http://chromium.org/"
66 SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
67
68 LICENSE="BSD"
69 SLOT="0"
70 KEYWORDS="~amd64 ~x86"
71 IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
72
73 RDEPEND="app-arch/bzip2
74 cups? (
75 dev-libs/libgcrypt
76 >=net-print/cups-1.3.11
77 )
78 >=dev-lang/v8-3.10.2.1
79 dev-libs/dbus-glib
80 dev-libs/elfutils
81 >=dev-libs/icu-49.1.1-r1
82 >=dev-libs/libevent-1.4.13
83 dev-libs/libxml2[icu]
84 dev-libs/libxslt
85 >=dev-libs/nss-3.12.3
86 gnome? ( >=gnome-base/gconf-2.24.0 )
87 gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
88 >=media-libs/alsa-lib-1.0.19
89 media-libs/flac
90 >=media-libs/libjpeg-turbo-1.2.0-r1
91 media-libs/libpng
92 >=media-libs/libwebp-0.1.3
93 media-libs/speex
94 pulseaudio? ( media-sound/pulseaudio )
95 sys-fs/udev
96 sys-libs/zlib
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 chromium_suid_sandbox_check_kernel_config
142
143 if use bindist; then
144 elog "bindist enabled: H.264 video support will be disabled."
145 else
146 elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
147 fi
148 }
149
150 src_prepare() {
151 ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
152 native_client/toolchain/linux_x86_newlib || die
153
154 # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
155 sed -i '1i#define OF(x) x' \
156 third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
157 chrome/common/zip*.cc || die
158
159 epatch "${FILESDIR}/${PN}-svnversion-r0.patch"
160
161 # Backport upstream fix for Gentoo bug #415601.
162 epatch "${FILESDIR}/${PN}-unistd-r0.patch"
163
164 # Fix build without tcmalloc. To be upstreamed.
165 epatch "${FILESDIR}/${PN}-tcmalloc-r0.patch"
166
167 # Backport a crash fix, bug #420357.
168 epatch "${FILESDIR}/${PN}-alignment-r0.patch"
169
170 epatch_user
171
172 # Remove most bundled libraries. Some are still needed.
173 find third_party -type f \! -iname '*.gyp*' \
174 \! -path 'third_party/WebKit/*' \
175 \! -path 'third_party/angle/*' \
176 \! -path 'third_party/cacheinvalidation/*' \
177 \! -path 'third_party/cld/*' \
178 \! -path 'third_party/expat/*' \
179 \! -path 'third_party/ffmpeg/*' \
180 \! -path 'third_party/flac/flac.h' \
181 \! -path 'third_party/gpsd/*' \
182 \! -path 'third_party/harfbuzz/*' \
183 \! -path 'third_party/hunspell/*' \
184 \! -path 'third_party/iccjpeg/*' \
185 \! -path 'third_party/jsoncpp/*' \
186 \! -path 'third_party/khronos/*' \
187 \! -path 'third_party/launchpad_translations/*' \
188 \! -path 'third_party/leveldatabase/*' \
189 \! -path 'third_party/libjingle/*' \
190 \! -path 'third_party/libphonenumber/*' \
191 \! -path 'third_party/libsrtp/*' \
192 \! -path 'third_party/libusb/*' \
193 \! -path 'third_party/libvpx/*' \
194 \! -path 'third_party/libxml/chromium/*' \
195 \! -path 'third_party/libyuv/*' \
196 \! -path 'third_party/lss/*' \
197 \! -path 'third_party/mesa/*' \
198 \! -path 'third_party/modp_b64/*' \
199 \! -path 'third_party/mongoose/*' \
200 \! -path 'third_party/npapi/*' \
201 \! -path 'third_party/openmax/*' \
202 \! -path 'third_party/ots/*' \
203 \! -path 'third_party/protobuf/*' \
204 \! -path 'third_party/scons-2.0.1/*' \
205 \! -path 'third_party/sfntly/*' \
206 \! -path 'third_party/skia/*' \
207 \! -path 'third_party/smhasher/*' \
208 \! -path 'third_party/speex/speex.h' \
209 \! -path 'third_party/sqlite/*' \
210 \! -path 'third_party/tlslite/*' \
211 \! -path 'third_party/undoview/*' \
212 \! -path 'third_party/v8-i18n/*' \
213 \! -path 'third_party/webdriver/*' \
214 \! -path 'third_party/webgl_conformance/*' \
215 \! -path 'third_party/webrtc/*' \
216 \! -path 'third_party/zlib/contrib/minizip/*' \
217 -delete || die
218
219 local v8_bundled="$(chromium_bundled_v8_version)"
220 local v8_installed="$(chromium_installed_v8_version)"
221 einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
222
223 # Remove bundled v8.
224 find v8 -type f \! -iname '*.gyp*' -delete || die
225
226 # The implementation files include v8 headers with full path,
227 # like #include "v8/include/v8.h". Make sure the system headers
228 # will be used.
229 # TODO: find a solution that can be upstreamed.
230 rmdir v8/include || die
231 ln -s /usr/include v8/include || die
232
233 # Make sure the build system will use the right python, bug #344367.
234 # Only convert directories that need it, to save time.
235 python_convert_shebangs -q -r 2 build tools
236 }
237
238 src_configure() {
239 local myconf=""
240
241 # Never tell the build system to "enable" SSE2, it has a few unexpected
242 # additions, bug #336871.
243 myconf+=" -Ddisable_sse2=1"
244
245 # Disable tcmalloc, it causes problems with e.g. NVIDIA
246 # drivers, bug #413637.
247 myconf+=" -Dlinux_use_tcmalloc=0"
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 myconf+="
260 -Duse_system_bzip2=1
261 -Duse_system_flac=1
262 -Duse_system_icu=1
263 -Duse_system_libevent=1
264 -Duse_system_libjpeg=1
265 -Duse_system_libpng=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 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 use_kerberos)
282 $(gyp_use pulseaudio use_pulseaudio)
283 $(gyp_use selinux selinux)"
284
285 if ! use selinux; then
286 # Enable SUID sandbox.
287 myconf+="
288 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
289 -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
290 fi
291
292 # Never use bundled gold binary. Disable gold linker flags for now.
293 myconf+="
294 -Dlinux_use_gold_binary=0
295 -Dlinux_use_gold_flags=0"
296
297 if ! use bindist; then
298 # Enable H.624 support in bundled ffmpeg.
299 myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
300 fi
301
302 local myarch="$(tc-arch)"
303 if [[ $myarch = amd64 ]] ; then
304 myconf+=" -Dtarget_arch=x64"
305 elif [[ $myarch = x86 ]] ; then
306 myconf+=" -Dtarget_arch=ia32"
307 else
308 die "Failed to determine target arch, got '$myarch'."
309 fi
310
311 # Make sure that -Werror doesn't get added to CFLAGS by the build system.
312 # Depending on GCC version the warnings are different and we don't want
313 # the build to fail because of that.
314 myconf+=" -Dwerror="
315
316 # Avoid CFLAGS problems, bug #352457, bug #390147.
317 if ! use custom-cflags; then
318 replace-flags "-Os" "-O2"
319 strip-flags
320 fi
321
322 egyp_chromium ${myconf} || die
323 }
324
325 src_compile() {
326 local test_targets
327 for x in base cacheinvalidation crypto \
328 googleurl gpu media net printing; do
329 test_targets+=" ${x}_unittests"
330 done
331
332 local make_targets="chrome chromedriver"
333 if ! use selinux; then
334 make_targets+=" chrome_sandbox"
335 fi
336 if use test; then
337 make_targets+=$test_targets
338 fi
339
340 # See bug #410883 for more info about the .host mess.
341 emake ${make_targets} BUILDTYPE=Release V=1 \
342 CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
343 CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
344 LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
345 AR.host="$(tc-getAR)" || die
346
347 pax-mark m out/Release/chrome
348 if use test; then
349 for x in $test_targets; do
350 pax-mark m out/Release/${x}
351 done
352 fi
353 }
354
355 src_test() {
356 # For more info see bug #350349.
357 local mylocale='en_US.utf8'
358 if ! locale -a | grep -q "$mylocale"; then
359 eerror "${PN} requires ${mylocale} locale for tests"
360 eerror "Please read the following guides for more information:"
361 eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
362 eerror " http://www.gentoo.org/doc/en/utf-8.xml"
363 die "locale ${mylocale} is not supported"
364 fi
365
366 # For more info see bug #370957.
367 if [[ $UID -eq 0 ]]; then
368 die "Tests must be run as non-root. Please use FEATURES=userpriv."
369 fi
370
371 # ICUStringConversionsTest: bug #350347.
372 # MessagePumpLibeventTest: bug #398501.
373 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
374 '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
375
376 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
377 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
378 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
379 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
380 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
381
382 # NetUtilTest: bug #361885.
383 # DnsConfigServiceTest.GetSystemConfig: bug #394883.
384 # CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
385 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
386 '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned'
387
388 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
389 }
390
391 src_install() {
392 exeinto "${CHROMIUM_HOME}"
393 doexe out/Release/chrome || die
394
395 if ! use selinux; then
396 doexe out/Release/chrome_sandbox || die
397 fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
398 fi
399
400 doexe out/Release/chromedriver || die
401
402 doexe out/Release/nacl_helper{,_bootstrap} || die
403 insinto "${CHROMIUM_HOME}"
404 doins out/Release/nacl_irt_*.nexe || die
405 doins out/Release/libppGoogleNaClPluginChrome.so || die
406
407 newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
408 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
409 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
410 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
411 sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
412 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
413 sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
414 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
415 fi
416
417 # It is important that we name the target "chromium-browser",
418 # xdg-utils expect it; bug #355517.
419 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
420 # keep the old symlink around for consistency
421 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
422
423 # Allow users to override command-line options, bug #357629.
424 dodir /etc/chromium || die
425 insinto /etc/chromium
426 newins "${FILESDIR}/chromium.default" "default" || die
427
428 pushd out/Release/locales > /dev/null || die
429 chromium_remove_language_paks
430 popd
431
432 insinto "${CHROMIUM_HOME}"
433 doins out/Release/*.pak || die
434
435 doins -r out/Release/locales || die
436 doins -r out/Release/resources || die
437
438 newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
439 newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
440
441 doexe out/Release/libffmpegsumo.so || die
442
443 # Install icons and desktop entry.
444 for SIZE in 16 22 24 32 48 64 128 256 ; do
445 insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
446 newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
447 chromium-browser${CHROMIUM_SUFFIX}.png || die
448 done
449 local mime_types="text/html;text/xml;application/xhtml+xml;"
450 mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
451 mime_types+="x-scheme-handler/ftp;" # bug #412185
452 mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
453 make_desktop_entry \
454 chromium-browser${CHROMIUM_SUFFIX} \
455 "Chromium${CHROMIUM_SUFFIX}" \
456 chromium-browser${CHROMIUM_SUFFIX} \
457 "Network;WebBrowser" \
458 "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
459 sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
460
461 # Install GNOME default application entry (bug #303100).
462 if use gnome; then
463 dodir /usr/share/gnome-control-center/default-apps || die
464 insinto /usr/share/gnome-control-center/default-apps
465 newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
466 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
467 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
468 "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
469 fi
470 fi
471 }