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-18.0.1025.168.ebuild ChangeLog
Date: Tue, 01 May 2012 02:17:24
Message-Id: 20120501021714.0B9742004C@flycatcher.gentoo.org
1 floppym 12/05/01 02:17:14
2
3 Modified: ChangeLog
4 Added: chromium-18.0.1025.168.ebuild
5 Log:
6 Version bump for stable channel release.
7
8 (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.618 www-client/chromium/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.618&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.618&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.617&r2=1.618
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
20 retrieving revision 1.617
21 retrieving revision 1.618
22 diff -u -r1.617 -r1.618
23 --- ChangeLog 26 Apr 2012 06:35:27 -0000 1.617
24 +++ ChangeLog 1 May 2012 02:17:13 -0000 1.618
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.617 2012/04/26 06:35:27 phajdan.jr Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.618 2012/05/01 02:17:13 floppym Exp $
30 +
31 +*chromium-18.0.1025.168 (01 May 2012)
32 +
33 + 01 May 2012; Mike Gilbert <floppym@g.o> +chromium-18.0.1025.168.ebuild:
34 + Version bump for stable channel release.
35
36 *chromium-20.0.1115.1 (26 Apr 2012)
37
38
39
40
41 1.1 www-client/chromium/chromium-18.0.1025.168.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-18.0.1025.168.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-18.0.1025.168.ebuild?rev=1.1&content-type=text/plain
45
46 Index: chromium-18.0.1025.168.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-18.0.1025.168.ebuild,v 1.1 2012/05/01 02:17:13 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"
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.8.9.4
77 dev-libs/dbus-glib
78 dev-libs/elfutils
79 >=dev-libs/icu-4.4.1
80 <dev-libs/icu-49
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 virtual/jpeg
90 media-libs/libpng
91 >=media-libs/libwebp-0.1.3
92 media-libs/speex
93 pulseaudio? ( media-sound/pulseaudio )
94 sys-fs/udev
95 sys-libs/zlib
96 x11-libs/gtk+:2
97 x11-libs/libXinerama
98 x11-libs/libXScrnSaver
99 x11-libs/libXtst
100 kerberos? ( virtual/krb5 )"
101 DEPEND="${RDEPEND}
102 >=dev-lang/nacl-toolchain-newlib-0_p7311
103 dev-lang/perl
104 dev-lang/yasm
105 dev-python/simplejson
106 >=dev-util/gperf-3.0.3
107 >=dev-util/pkgconfig-0.23
108 >=sys-devel/bison-2.4.3
109 sys-devel/flex
110 >=sys-devel/make-3.81-r2
111 test? ( dev-python/pyftpdlib )"
112 RDEPEND+="
113 !=www-client/chromium-9999
114 x11-misc/xdg-utils
115 virtual/ttf-fonts"
116
117 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
118 EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
119 fi
120
121 pkg_setup() {
122 if [[ "${SLOT}" == "0" ]]; then
123 CHROMIUM_SUFFIX=""
124 else
125 CHROMIUM_SUFFIX="-${SLOT}"
126 fi
127 CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
128
129 # Make sure the build system will use the right tools, bug #340795.
130 tc-export AR CC CXX RANLIB
131
132 # Make sure the build system will use the right python, bug #344367.
133 python_set_active_version 2
134 python_pkg_setup
135
136 chromium_check_kernel_config
137
138 if use bindist; then
139 elog "bindist enabled: H.264 video support will be disabled."
140 else
141 elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
142 fi
143 }
144
145 src_prepare() {
146 ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
147 native_client/toolchain/linux_x86_newlib || die
148
149 # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
150 sed -i '1i#define OF(x) x' \
151 third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
152 chrome/common/zip*.cc || die
153
154 # Revert WebKit changeset responsible for Gentoo bug #393471.
155 epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r2.patch"
156
157 # Prevent gyp failures caused by target type 'settings' instead of 'none'.
158 epatch "${FILESDIR}/${PN}-gyp-settings-r0.patch"
159
160 # Prevent compilation failures caused by missing zlib #include
161 # and dependency.
162 epatch "${FILESDIR}/${PN}-webkit-zlib-r0.patch"
163
164 # Fix crashes on illegal instructions, bug #401537.
165 epatch "${FILESDIR}/${PN}-media-no-sse-r0.patch"
166
167 # Backport fix for bug #395773.
168 epatch "${FILESDIR}/${PN}-glib-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/leveldb/*' \
189 \! -path 'third_party/leveldatabase/*' \
190 \! -path 'third_party/libjingle/*' \
191 \! -path 'third_party/libphonenumber/*' \
192 \! -path 'third_party/libsrtp/*' \
193 \! -path 'third_party/libvpx/*' \
194 \! -path 'third_party/libyuv/*' \
195 \! -path 'third_party/lss/*' \
196 \! -path 'third_party/mesa/*' \
197 \! -path 'third_party/modp_b64/*' \
198 \! -path 'third_party/mongoose/*' \
199 \! -path 'third_party/npapi/*' \
200 \! -path 'third_party/openmax/*' \
201 \! -path 'third_party/ots/*' \
202 \! -path 'third_party/protobuf/*' \
203 \! -path 'third_party/scons-2.0.1/*' \
204 \! -path 'third_party/sfntly/*' \
205 \! -path 'third_party/skia/*' \
206 \! -path 'third_party/smhasher/*' \
207 \! -path 'third_party/speex/speex.h' \
208 \! -path 'third_party/sqlite/*' \
209 \! -path 'third_party/tcmalloc/*' \
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 elog "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 # Use system-provided libraries.
246 # TODO: use_system_ffmpeg
247 # TODO: use_system_hunspell (upstream changes needed).
248 # TODO: use_system_ssl (http://crbug.com/58087).
249 # TODO: use_system_sqlite (http://crbug.com/22208).
250 # TODO: use_system_vpx
251 myconf+="
252 -Duse_system_bzip2=1
253 -Duse_system_flac=1
254 -Duse_system_icu=1
255 -Duse_system_libevent=1
256 -Duse_system_libjpeg=1
257 -Duse_system_libpng=1
258 -Duse_system_libwebp=1
259 -Duse_system_libxml=1
260 -Duse_system_speex=1
261 -Duse_system_v8=1
262 -Duse_system_xdg_utils=1
263 -Duse_system_yasm=1
264 -Duse_system_zlib=1"
265
266 # Optional dependencies.
267 # TODO: linux_link_kerberos, bug #381289.
268 myconf+="
269 $(gyp_use cups use_cups)
270 $(gyp_use gnome use_gconf)
271 $(gyp_use gnome-keyring use_gnome_keyring)
272 $(gyp_use gnome-keyring linux_link_gnome_keyring)
273 $(gyp_use kerberos use_kerberos)
274 $(gyp_use pulseaudio use_pulseaudio)"
275
276 # Enable sandbox.
277 myconf+="
278 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
279 -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
280
281 # if host-is-pax; then
282 # # Prevent the build from failing (bug #301880). The performance
283 # # difference is very small.
284 # myconf+=" -Dv8_use_snapshot=0"
285 # fi
286
287 # Our system ffmpeg should support more codecs than the bundled one
288 # for Chromium.
289 # myconf+=" -Dproprietary_codecs=1"
290
291 if ! use bindist; then
292 # Enable H.624 support in bundled ffmpeg.
293 myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
294 fi
295
296 local myarch="$(tc-arch)"
297 if [[ $myarch = amd64 ]] ; then
298 myconf+=" -Dtarget_arch=x64"
299 elif [[ $myarch = x86 ]] ; then
300 myconf+=" -Dtarget_arch=ia32"
301 elif [[ $myarch = arm ]] ; then
302 # TODO: check this again after
303 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
304 append-flags -fno-tree-sink
305
306 myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
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 emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die
327 pax-mark m out/Release/chrome
328 if use test; then
329 emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 || die
330 pax-mark m out/Release/{base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests
331 fi
332 }
333
334 src_test() {
335 # For more info see bug #350349.
336 local mylocale='en_US.utf8'
337 if ! locale -a | grep -q "$mylocale"; then
338 eerror "${PN} requires ${mylocale} locale for tests"
339 eerror "Please read the following guides for more information:"
340 eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
341 eerror " http://www.gentoo.org/doc/en/utf-8.xml"
342 die "locale ${mylocale} is not supported"
343 fi
344
345 # For more info see bug #370957.
346 if [[ $UID -eq 0 ]]; then
347 die "Tests must be run as non-root. Please use FEATURES=userpriv."
348 fi
349
350 # ICUStringConversionsTest: bug #350347.
351 # MessagePumpLibeventTest: bug #398501.
352 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
353 '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
354
355 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
356 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
357 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
358 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
359 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
360
361 # NetUtilTest: bug #361885.
362 # DnsConfigServiceTest.GetSystemConfig: bug #394883.
363 # CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
364 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
365 '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned'
366
367 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
368 }
369
370 src_install() {
371 exeinto "${CHROMIUM_HOME}"
372 doexe out/Release/chrome || die
373 doexe out/Release/chrome_sandbox || die
374 fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
375
376 doexe out/Release/chromedriver || die
377
378 # Install Native Client files on platforms that support it.
379 insinto "${CHROMIUM_HOME}"
380 case "$(tc-arch)" in
381 amd64)
382 doexe out/Release/nacl_helper{,_bootstrap} || die
383 doins out/Release/nacl_irt_x86_64.nexe || die
384 doins out/Release/libppGoogleNaClPluginChrome.so || die
385 ;;
386 x86)
387 doexe out/Release/nacl_helper{,_bootstrap} || die
388 doins out/Release/nacl_irt_x86_32.nexe || die
389 doins out/Release/libppGoogleNaClPluginChrome.so || die
390 ;;
391 esac
392
393 newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
394 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
395 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
396 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
397 sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
398 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
399 sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
400 -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
401 fi
402
403 # It is important that we name the target "chromium-browser",
404 # xdg-utils expect it; bug #355517.
405 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
406 # keep the old symlink around for consistency
407 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
408
409 # Allow users to override command-line options, bug #357629.
410 dodir /etc/chromium || die
411 insinto /etc/chromium
412 newins "${FILESDIR}/chromium.default" "default" || die
413
414 pushd out/Release/locales > /dev/null || die
415 chromium_remove_language_paks
416 popd
417
418 insinto "${CHROMIUM_HOME}"
419 doins out/Release/chrome.pak || die
420 doins out/Release/resources.pak || die
421
422 doins -r out/Release/locales || die
423 doins -r out/Release/resources || die
424
425 newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
426 newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
427
428 # Chromium looks for these in its folder
429 # See media_posix.cc and base_paths_linux.cc
430 # dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
431 # dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
432 # dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
433 doexe out/Release/libffmpegsumo.so || die
434
435 # Install icons and desktop entry.
436 for SIZE in 16 22 24 32 48 64 128 256 ; do
437 insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
438 newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
439 chromium-browser${CHROMIUM_SUFFIX}.png || die
440 done
441 local mime_types="text/html;text/xml;application/xhtml+xml;"
442 mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
443 make_desktop_entry \
444 chromium-browser${CHROMIUM_SUFFIX} \
445 "Chromium${CHROMIUM_SUFFIX}" \
446 chromium-browser${CHROMIUM_SUFFIX} \
447 "Network;WebBrowser" \
448 "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
449 sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
450
451 # Install GNOME default application entry (bug #303100).
452 if use gnome; then
453 dodir /usr/share/gnome-control-center/default-apps || die
454 insinto /usr/share/gnome-control-center/default-apps
455 newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
456 if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
457 sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
458 "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
459 fi
460 fi
461 }