Gentoo Archives: gentoo-commits

From: "PaweA Hajdan (phajdan.jr)" <phajdan.jr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-21.0.1163.0.ebuild chromium-21.0.1145.0-r1.ebuild
Date: Fri, 08 Jun 2012 17:24:18
Message-Id: 20120608172352.486002004B@flycatcher.gentoo.org
1 phajdan.jr 12/06/08 17:23:52
2
3 Modified: ChangeLog
4 Added: chromium-21.0.1163.0.ebuild
5 Removed: chromium-21.0.1145.0-r1.ebuild
6 Log:
7 Version bump for dev channel release. Remove old.
8
9 (Portage version: 2.1.10.49/cvs/Linux i686)
10
11 Revision Changes Path
12 1.653 www-client/chromium/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.653&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.653&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.652&r2=1.653
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
21 retrieving revision 1.652
22 retrieving revision 1.653
23 diff -u -r1.652 -r1.653
24 --- ChangeLog 7 Jun 2012 01:56:19 -0000 1.652
25 +++ ChangeLog 8 Jun 2012 17:23:52 -0000 1.653
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.652 2012/06/07 01:56:19 floppym Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.653 2012/06/08 17:23:52 phajdan.jr Exp $
31 +
32 +*chromium-21.0.1163.0 (08 Jun 2012)
33 +
34 + 08 Jun 2012; Pawel Hajdan jr <phajdan.jr@g.o>
35 + -chromium-21.0.1145.0-r1.ebuild, +chromium-21.0.1163.0.ebuild:
36 + Version bump for dev channel release. Remove old.
37
38 *chromium-20.0.1132.27 (07 Jun 2012)
39
40
41
42
43 1.1 www-client/chromium/chromium-21.0.1163.0.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-21.0.1163.0.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-21.0.1163.0.ebuild?rev=1.1&content-type=text/plain
47
48 Index: chromium-21.0.1163.0.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-21.0.1163.0.ebuild,v 1.1 2012/06/08 17:23:52 phajdan.jr 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/expat
82 >=dev-libs/icu-49.1.1-r1
83 >=dev-libs/libevent-1.4.13
84 dev-libs/libxml2[icu]
85 dev-libs/libxslt
86 >=dev-libs/nss-3.12.3
87 gnome? ( >=gnome-base/gconf-2.24.0 )
88 gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
89 >=media-libs/alsa-lib-1.0.19
90 media-libs/flac
91 >=media-libs/libjpeg-turbo-1.2.0-r1
92 media-libs/libpng
93 >=media-libs/libwebp-0.1.3
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/flex
114 >=sys-devel/make-3.81-r2
115 virtual/pkgconfig
116 test? (
117 dev-python/pyftpdlib
118 )"
119 RDEPEND+="
120 !=www-client/chromium-9999
121 x11-misc/xdg-utils
122 virtual/ttf-fonts"
123
124 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
125 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
126 fi
127
128 pkg_setup() {
129 if [[ "${SLOT}" == "0" ]]; then
130 CHROMIUM_SUFFIX=""
131 else
132 CHROMIUM_SUFFIX="-${SLOT}"
133 fi
134 CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
135
136 # Make sure the build system will use the right tools, bug #340795.
137 tc-export AR CC CXX RANLIB
138
139 # Make sure the build system will use the right python, bug #344367.
140 python_set_active_version 2
141 python_pkg_setup
142
143 if ! use selinux; then
144 chromium_suid_sandbox_check_kernel_config
145 fi
146
147 if use bindist; then
148 elog "bindist enabled: H.264 video support will be disabled."
149 else
150 elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
151 fi
152 }
153
154 src_prepare() {
155 ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
156 native_client/toolchain/linux_x86_newlib || die
157
158 # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
159 sed -i '1i#define OF(x) x' \
160 third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
161
162 # Unbundle expat, bug #384773.
163 epatch "${FILESDIR}/${PN}-expat-r0.patch"
164
165 epatch_user
166
167 # Remove most bundled libraries. Some are still needed.
168 find third_party -type f \! -iname '*.gyp*' \
169 \! -path 'third_party/WebKit/*' \
170 \! -path 'third_party/angle/*' \
171 \! -path 'third_party/cacheinvalidation/*' \
172 \! -path 'third_party/cld/*' \
173 \! -path 'third_party/ffmpeg/*' \
174 \! -path 'third_party/flac/flac.h' \
175 \! -path 'third_party/gpsd/*' \
176 \! -path 'third_party/harfbuzz/*' \
177 \! -path 'third_party/hunspell/*' \
178 \! -path 'third_party/iccjpeg/*' \
179 \! -path 'third_party/jsoncpp/*' \
180 \! -path 'third_party/khronos/*' \
181 \! -path 'third_party/launchpad_translations/*' \
182 \! -path 'third_party/leveldatabase/*' \
183 \! -path 'third_party/libjingle/*' \
184 \! -path 'third_party/libphonenumber/*' \
185 \! -path 'third_party/libsrtp/*' \
186 \! -path 'third_party/libusb/libusb.h' \
187 \! -path 'third_party/libvpx/*' \
188 \! -path 'third_party/libxml/chromium/*' \
189 \! -path 'third_party/libyuv/*' \
190 \! -path 'third_party/lss/*' \
191 \! -path 'third_party/mesa/*' \
192 \! -path 'third_party/modp_b64/*' \
193 \! -path 'third_party/mongoose/*' \
194 \! -path 'third_party/npapi/*' \
195 \! -path 'third_party/openmax/*' \
196 \! -path 'third_party/ots/*' \
197 \! -path 'third_party/protobuf/*' \
198 \! -path 'third_party/scons-2.0.1/*' \
199 \! -path 'third_party/sfntly/*' \
200 \! -path 'third_party/skia/*' \
201 \! -path 'third_party/smhasher/*' \
202 \! -path 'third_party/speex/speex.h' \
203 \! -path 'third_party/sqlite/*' \
204 \! -path 'third_party/tlslite/*' \
205 \! -path 'third_party/undoview/*' \
206 \! -path 'third_party/v8-i18n/*' \
207 \! -path 'third_party/webdriver/*' \
208 \! -path 'third_party/webgl_conformance/*' \
209 \! -path 'third_party/webrtc/*' \
210 \! -path 'third_party/zlib/contrib/minizip/*' \
211 -delete || die
212
213 local v8_bundled="$(chromium_bundled_v8_version)"
214 local v8_installed="$(chromium_installed_v8_version)"
215 elog "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
216
217 # Remove bundled v8.
218 find v8 -type f \! -iname '*.gyp*' -delete || die
219
220 # The implementation files include v8 headers with full path,
221 # like #include "v8/include/v8.h". Make sure the system headers
222 # will be used.
223 # TODO: find a solution that can be upstreamed.
224 rmdir v8/include || die
225 ln -s /usr/include v8/include || die
226
227 # Make sure the build system will use the right python, bug #344367.
228 # Only convert directories that need it, to save time.
229 python_convert_shebangs -q -r 2 build tools
230 }
231
232 src_configure() {
233 local myconf=""
234
235 # Never tell the build system to "enable" SSE2, it has a few unexpected
236 # additions, bug #336871.
237 myconf+=" -Ddisable_sse2=1"
238
239 # Disable tcmalloc, it causes problems with e.g. NVIDIA
240 # drivers, bug #413637.
241 myconf+=" -Dlinux_use_tcmalloc=0"
242
243 # Disable glibc Native Client toolchain, we don't need it (bug #417019).
244 myconf+=" -Ddisable_glibc=1"
245
246 # Make it possible to remove third_party/adobe.
247 echo > "${T}/flapper_version.h" || die
248 myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
249
250 # Use system-provided libraries.
251 # TODO: use_system_ffmpeg
252 # TODO: use_system_hunspell (upstream changes needed).
253 # TODO: use_system_ssl (http://crbug.com/58087).
254 # TODO: use_system_sqlite (http://crbug.com/22208).
255 # TODO: use_system_vpx
256 myconf+="
257 -Duse_system_bzip2=1
258 -Duse_system_flac=1
259 -Duse_system_icu=1
260 -Duse_system_libevent=1
261 -Duse_system_libjpeg=1
262 -Duse_system_libpng=1
263 -Duse_system_libusb=1
264 -Duse_system_libwebp=1
265 -Duse_system_libxml=1
266 -Duse_system_speex=1
267 -Duse_system_v8=1
268 -Duse_system_xdg_utils=1
269 -Duse_system_yasm=1
270 -Duse_system_zlib=1"
271
272 # Optional dependencies.
273 # TODO: linux_link_kerberos, bug #381289.
274 myconf+="
275 $(gyp_use cups)
276 $(gyp_use gnome use_gconf)
277 $(gyp_use gnome-keyring use_gnome_keyring)
278 $(gyp_use gnome-keyring linux_link_gnome_keyring)
279 $(gyp_use kerberos)
280 $(gyp_use pulseaudio)
281 $(gyp_use selinux selinux)"
282
283 if ! use selinux; then
284 # Enable SUID sandbox.
285 myconf+="
286 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
287 -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
288 fi
289
290 # Never use bundled gold binary. Disable gold linker flags for now.
291 myconf+="
292 -Dlinux_use_gold_binary=0
293 -Dlinux_use_gold_flags=0"
294
295 if ! use bindist; then
296 # Enable H.624 support in bundled ffmpeg.
297 myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
298 fi
299
300 local myarch="$(tc-arch)"
301 if [[ $myarch = amd64 ]] ; then
302 myconf+=" -Dtarget_arch=x64"
303 elif [[ $myarch = x86 ]] ; then
304 myconf+=" -Dtarget_arch=ia32"
305 else
306 die "Failed to determine target arch, got '$myarch'."
307 fi
308
309 # Make sure that -Werror doesn't get added to CFLAGS by the build system.
310 # Depending on GCC version the warnings are different and we don't want
311 # the build to fail because of that.
312 myconf+=" -Dwerror="
313
314 # Avoid CFLAGS problems, bug #352457, bug #390147.
315 if ! use custom-cflags; then
316 replace-flags "-Os" "-O2"
317 strip-flags
318 fi
319
320 egyp_chromium ${myconf} || die
321 }
322
323 src_compile() {
324 local test_targets
325 for x in base cacheinvalidation crypto \
326 googleurl gpu media net printing sql; do
327 test_targets+=" ${x}_unittests"
328 done
329
330 local make_targets="chrome chromedriver"
331 if ! use selinux; then
332 make_targets+=" chrome_sandbox"
333 fi
334 if use test; then
335 make_targets+=$test_targets
336 fi
337
338 # See bug #410883 for more info about the .host mess.
339 emake ${make_targets} BUILDTYPE=Release V=1 \
340 CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
341 CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
342 LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
343 AR.host="$(tc-getAR)" || die
344
345 pax-mark m out/Release/chrome
346 if use test; then
347 for x in $test_targets; do
348 pax-mark m out/Release/${x}
349 done
350 fi
351 }
352
353 src_test() {
354 # For more info see bug #350349.
355 local mylocale='en_US.utf8'
356 if ! locale -a | grep -q "$mylocale"; then
357 eerror "${PN} requires ${mylocale} locale for tests"
358 eerror "Please read the following guides for more information:"
359 eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
360 eerror " http://www.gentoo.org/doc/en/utf-8.xml"
361 die "locale ${mylocale} is not supported"
362 fi
363
364 # For more info see bug #370957.
365 if [[ $UID -eq 0 ]]; then
366 die "Tests must be run as non-root. Please use FEATURES=userpriv."
367 fi
368
369 # ICUStringConversionsTest: bug #350347.
370 # MessagePumpLibeventTest: bug #398501.
371 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
372 '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
373
374 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
375 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
376 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
377 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
378 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
379
380 # NetUtilTest: bug #361885.
381 # DnsConfigServiceTest.GetSystemConfig: bug #394883.
382 # CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
383 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
384 '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned'
385
386 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
387 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/sql_unittests virtualmake
388 }
389
390 src_install() {
391 exeinto "${CHROMIUM_HOME}"
392 doexe out/Release/chrome || die
393
394 if ! use selinux; then
395 doexe out/Release/chrome_sandbox || die
396 fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
397 fi
398
399 doexe out/Release/chromedriver || die
400
401 doexe out/Release/nacl_helper{,_bootstrap} || die
402 insinto "${CHROMIUM_HOME}"
403 doins out/Release/nacl_irt_*.nexe || die
404 doins out/Release/libppGoogleNaClPluginChrome.so || die
405
406 newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
407 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
408 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
409 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
410 sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
411 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
412 sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
413 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
414 fi
415
416 # It is important that we name the target "chromium-browser",
417 # xdg-utils expect it; bug #355517.
418 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
419 # keep the old symlink around for consistency
420 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
421
422 # Allow users to override command-line options, bug #357629.
423 dodir /etc/chromium || die
424 insinto /etc/chromium
425 newins "${FILESDIR}/chromium.default" "default" || die
426
427 pushd out/Release/locales > /dev/null || die
428 chromium_remove_language_paks
429 popd
430
431 insinto "${CHROMIUM_HOME}"
432 doins out/Release/*.pak || die
433
434 doins -r out/Release/locales || die
435 doins -r out/Release/resources || die
436
437 newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
438 newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
439
440 doexe out/Release/libffmpegsumo.so || die
441
442 # Install icons and desktop entry.
443 for SIZE in 16 22 24 32 48 64 128 256 ; do
444 insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
445 newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
446 chromium-browser${CHROMIUM_SUFFIX}.png || die
447 done
448 local mime_types="text/html;text/xml;application/xhtml+xml;"
449 mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
450 mime_types+="x-scheme-handler/ftp;" # bug #412185
451 mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
452 make_desktop_entry \
453 chromium-browser${CHROMIUM_SUFFIX} \
454 "Chromium${CHROMIUM_SUFFIX}" \
455 chromium-browser${CHROMIUM_SUFFIX} \
456 "Network;WebBrowser" \
457 "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
458 sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
459
460 # Install GNOME default application entry (bug #303100).
461 if use gnome; then
462 dodir /usr/share/gnome-control-center/default-apps || die
463 insinto /usr/share/gnome-control-center/default-apps
464 newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
465 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
466 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
467 "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
468 fi
469 fi
470 }