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