From: Paweł Hajdan Date: Wed, 11 Jan 2012 17:38:00 +0000 (+0000) Subject: Version bump for dev channel release. Disable DnsConfigServiceTest.GetSystemConfig... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e251ccb256f3d395fba27fe0acec969dde335072;p=gentoo.git Version bump for dev channel release. Disable DnsConfigServiceTest.GetSystemConfig test, bug #394883 by Jonathan Lovelace. Disable MessagePumpLibeventTest.DeleteWatcher test, bug #398501. NaCl binaries should work now, bug #389479 by Tatsh fixed upstream. Package-Manager: portage-2.1.10.41/cvs/Linux i686 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index c49b1161ed29..f9fe55964066 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for www-client/chromium # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.533 2012/01/06 18:34:57 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.534 2012/01/11 17:38:00 phajdan.jr Exp $ + +*chromium-18.0.1003.1 (11 Jan 2012) + + 11 Jan 2012; Pawel Hajdan jr + +files/chromium-revert-jpeg-swizzle-r1.patch, chromium-17.0.963.26.ebuild, + +chromium-18.0.1003.1.ebuild, chromium-9999-r1.ebuild: + Version bump for dev channel release. Disable + DnsConfigServiceTest.GetSystemConfig test, bug #394883 by Jonathan Lovelace. + Disable MessagePumpLibeventTest.DeleteWatcher test, bug #398501. NaCl + binaries should work now, bug #389479 by Tatsh fixed upstream. 06 Jan 2012; Richard Freeman chromium-16.0.912.75.ebuild: amd64 stable - 397907 diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index aca17e96e048..12c09537c850 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff AUX chromium-cups-r0.patch 726 RMD160 f3193ce9f987b6e5ad05a67d090ab4f9e1cb7b41 SHA1 8efd3479977e89429237d49fefbfcc63d250089e SHA256 800a669839ca7e033bb360b0cd9db92dde93505609c0b9184bf3901d2ec1535b @@ -7,6 +7,7 @@ AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd AUX chromium-kerberos-r0.patch 944 RMD160 25fccaa4406b1f964d72c94fd414a9955fc69ddd SHA1 b8b8f2cf6df1bade7af45d8f24b65acc602e781f SHA256 75b75f241675178dff914e0ddacc910a2583b2e2077e805f3ea1b2eed8513e21 AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89 SHA1 9630a36af707a810cbd646f3bac5deba984439f6 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e AUX chromium-revert-jpeg-swizzle-r0.patch 2305 RMD160 2a69ce73c33d5a79b901840adf97656a12c0db4a SHA1 e6bc2233e90c5b2e07ace00a9af879691b2b97da SHA256 a39647def088bd41a7ddce3def9de1455c8b633460da4fe4bfdf205f2ba3a598 +AUX chromium-revert-jpeg-swizzle-r1.patch 2227 RMD160 1a84eac97e0e8804e0c0d950379983492bda032e SHA1 0fd28fa540f1f0badd124842807d96ea90ca7c1a SHA256 d96b2e277d5bd8ed6f8f7359255cc3e1cdfdd4c40c4ac6976989e35cf58efe1e AUX chromium-system-libevent-r0.patch 404 RMD160 0dc32cfbd0770e4be1b6f9d3cf8ac08987a5992d SHA1 f6127a903eeb4ce13a4f8fc75dda0102e68d759a SHA256 127945ad45ede0e2aefbc28d8d5eb241675abb83f3aedc2569133e437f98a841 AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1cdcbcd4a3517f70ba67c749da95c2a307971846 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9 AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf @@ -16,19 +17,21 @@ DIST chromium-16.0.912.63.tar.bz2 154351760 RMD160 fecf2c21a9ae54ee67668b2542936 DIST chromium-16.0.912.75.tar.bz2 154371278 RMD160 a91f808f30a5bb09c8a84ad29838f1b03ee76cae SHA1 bcd74d03933cc4ae9773835df6c3a4bfc48f6698 SHA256 88c931479ae2f92c7fb31e14c044e9732a5f765dd872b27d449efd6c99c83e95 DIST chromium-17.0.963.12.tar.bz2 165123944 RMD160 88b9b9c121d138b4f28dcb1293659219ca06eea9 SHA1 0e92d9f052b2d8e519517f9b673ed23c57d5cc3c SHA256 9412b6c049e3df729319fbd6b91a0e8baa78d33d39232db2ac68ec97c3439cdf DIST chromium-17.0.963.26.tar.bz2 165611366 RMD160 898baadf5b4ac50dd6a4357218fd230cd65b33dd SHA1 c5c8b415477273fe84e4ec06e54a389bb93a2af3 SHA256 839046de11453e9dc14c5880e7c7dabd4ad82b6bc2b157557d09890e04b10766 +DIST chromium-18.0.1003.1.tar.bz2 172191832 RMD160 25a27ac28e787030730c28b1910ea51ac5fd2b6c SHA1 6452ad3992e8665dacfc0b4d20056894899e43fd SHA256 c718b5a940089505c90d169cd0a37fea4bc3cbf27109cd1fd0a085d16d483222 EBUILD chromium-16.0.912.63.ebuild 16596 RMD160 402a5a9bf38f99380fc422c48d947405af1c1f08 SHA1 b8048658c591a9ff4f6d1643cdb9ecc4e02460b4 SHA256 d69e866f68f0a6ff9e0928dfe1d73494b0736b8e1c5c437708433141c910ec11 EBUILD chromium-16.0.912.75.ebuild 16598 RMD160 af466a178c2f60361261bedbf4c50d8b6db90ada SHA1 6bfd261ef4d6fb8963039ee1c75879170b7f4368 SHA256 0300c2d7b152076bf59fa45b39173a91e6ebef3cbbb9a030e4ffbd81cb61ed09 EBUILD chromium-17.0.963.12-r1.ebuild 17397 RMD160 b59e4b255fd17c627553854fc4fef0a4ca3cd30c SHA1 48e4bea89345c6624cd55bad6c909dbc92b8b5de SHA256 97ad2654d56df2effc44f7714754c1f85775098cee3031a78d796bed7bfd2372 EBUILD chromium-17.0.963.12.ebuild 17049 RMD160 383eee61bc9a8f57b6d3fcd20eef46a07e8edc30 SHA1 dd8276aabe10b7e974514323c9af69b587ce04c3 SHA256 aaaf6f461dc8fdc53d62b3bd1a8e378fa6176b8b5cade11d09bc4e0d36f86e07 -EBUILD chromium-17.0.963.26.ebuild 17394 RMD160 007cd8f9a27d729b862eae48801e9ee152defadd SHA1 5b155591fdb642d481db5856d5548a953db7ce23 SHA256 b725f55ebd935707a34118fbc79811cea7d4bf9f03f8132f2e63df930f92f611 -EBUILD chromium-9999-r1.ebuild 19378 RMD160 2415001db9c5b1bdde92ff5d48181efecbc43ec8 SHA1 7c73dffdf40c7a27dea14a3bc9c851e0e0466146 SHA256 634a709b337badfd8c9100daedf9e498e27147a5b46162d158126630348087aa -MISC ChangeLog 1209 RMD160 32339566ce2f887b4d9c1f900f7b04e88b611146 SHA1 893da91df8cb7dc6205f6465e7b196da31ec870f SHA256 158b32afbfd467b1e8f788c1921caff3b341ebd1e5c73a29109714aa3534940b +EBUILD chromium-17.0.963.26.ebuild 17472 RMD160 b21f0c76ccd63fbca0eaf072482a9e535d07833f SHA1 3feaef9557d0c40604198399e1cc7e63772fd02d SHA256 f9daa281612a6461a1bdeef60983aa52aa40fa92a096edbaf8a4e82e9934f96f +EBUILD chromium-18.0.1003.1.ebuild 17433 RMD160 39f6bdfe44dfa4c052a9eba17faf40ff9ea08443 SHA1 41ba1a927ae767f895e11562356f82618b867c5c SHA256 9e425bd83a75c18d11de5c1880694ab5f8dda02158630beb7ebb15a180a2c5d6 +EBUILD chromium-9999-r1.ebuild 19381 RMD160 042fda9c0995b2d4cb53e3b71e3f8d4ce427ef2a SHA1 d71f67b711c603604b6ebf3978b6e1ec77a31725 SHA256 d7cff73b1bacb742168a0ac11be5c6481f1f66c42cc0d08b8d538934380dbda0 +MISC ChangeLog 1705 RMD160 17e258455bd56d83f93529e2d40c0ebd306a29b9 SHA1 68b064ce032b2a8da68ff2f705abbfc576ef05f0 SHA256 9244110b8add42c1536f85565bda8d779f53fec97f1a3a9a3749fa7e9a3ea27a MISC ChangeLog-2011 114031 RMD160 819d2187b876e03ba1a5f23369eca56e554bcfe6 SHA1 c449259648a4f2633b8812e7761e8cdeaea7f948 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk8HPtoACgkQCMFw3lXsEjqvtgD/eKzhYXasInwOyS+YkFNd0yst -uju00hyrgezBWSCI5MgA/jSfypGHRqKv3RUr3vTxGcheQpx70Oh5THdpZjL+frcZ -=I1Qu +iEYEAREKAAYFAk8NyQUACgkQuUQtlDBCeQLrowCfYoPbm/2+EsgkRp++XcQMHc29 +j/QAn084uo4MxF3IJ/op8He7Njfm2WuX +=l1zc -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-17.0.963.26.ebuild b/www-client/chromium/chromium-17.0.963.26.ebuild index 0be692f37f0e..53d07a72dd70 100644 --- a/www-client/chromium/chromium-17.0.963.26.ebuild +++ b/www-client/chromium/chromium-17.0.963.26.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.26.ebuild,v 1.1 2012/01/05 17:02:02 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.26.ebuild,v 1.2 2012/01/11 17:38:00 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -366,9 +366,10 @@ src_test() { die "Tests must be run as non-root. Please use FEATURES=userpriv." fi - # For more info see bug #350347. + # ICUStringConversionsTest: bug #350347. + # MessagePumpLibeventTest: bug #398501. LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ - '--gtest_filter=-ICUStringConversionsTest.*' + '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*' LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake diff --git a/www-client/chromium/chromium-18.0.1003.1.ebuild b/www-client/chromium/chromium-18.0.1003.1.ebuild new file mode 100644 index 000000000000..a6ac7c847b2e --- /dev/null +++ b/www-client/chromium/chromium-18.0.1003.1.ebuild @@ -0,0 +1,552 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-18.0.1003.1.ebuild,v 1.1 2012/01/11 17:38:00 phajdan.jr Exp $ + +EAPI="4" +PYTHON_DEPEND="2:2.6" + +inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \ + pax-utils portability python toolchain-funcs versionator virtualx + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio" + +# en_US is ommitted on purpose from the list below. It must always be available. +LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr +hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th +tr uk vi zh_CN zh_TW" +for lang in ${LANGS}; do + IUSE+=" linguas_${lang}" +done + +RDEPEND="app-arch/bzip2 + cups? ( + dev-libs/libgcrypt + >=net-print/cups-1.3.11 + ) + >=dev-lang/v8-3.7.6 + dev-libs/dbus-glib + dev-libs/elfutils + >=dev-libs/icu-4.4.1 + >=dev-libs/libevent-1.4.13 + dev-libs/libxml2[icu] + dev-libs/libxslt + >=dev-libs/nss-3.12.3 + gnome? ( >=gnome-base/gconf-2.24.0 ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) + >=media-libs/alsa-lib-1.0.19 + media-libs/flac + virtual/jpeg + media-libs/libpng + >=media-libs/libwebp-0.1.2 + media-libs/speex + pulseaudio? ( media-sound/pulseaudio ) + sys-libs/zlib + x11-libs/gtk+:2 + x11-libs/libXinerama + x11-libs/libXScrnSaver + x11-libs/libXtst + kerberos? ( virtual/krb5 )" +DEPEND="${RDEPEND} + >=dev-lang/nacl-toolchain-newlib-0_p7311 + dev-lang/perl + dev-lang/yasm + dev-python/simplejson + >=dev-util/gperf-3.0.3 + >=dev-util/pkgconfig-0.23 + >=sys-devel/bison-2.4.3 + sys-devel/flex + >=sys-devel/make-3.81-r2 + test? ( dev-python/pyftpdlib )" +RDEPEND+=" + !=www-client/chromium-9999 + x11-misc/xdg-utils + virtual/ttf-fonts" + +gyp_use() { + if [[ $# -lt 2 ]]; then + echo "!!! usage: gyp_use " >&2 + return 1 + fi + if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi +} + +egyp() { + set -- build/gyp_chromium --depth=. "${@}" + echo "${@}" >&2 + "${@}" +} + +# Chromium uses different names for some langs, +# return Chromium name corresponding to a Gentoo lang. +chromium_lang() { + if [[ "$1" == "es_LA" ]]; then + echo "es_419" + else + echo "$1" + fi +} + +get_bundled_v8_version() { + "$(PYTHON -2)" "${FILESDIR}"/extract_v8_version.py v8/src/version.cc +} + +get_installed_v8_version() { + best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g' +} + +if ! has chromium-pkg_die ${EBUILD_DEATH_HOOKS}; then + EBUILD_DEATH_HOOKS+=" chromium-pkg_die"; +fi + +chromium-pkg_die() { + if [[ "${EBUILD_PHASE}" != "compile" ]]; then + return + fi + + # Prevent user problems like bug #348235. + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + ewarn + ewarn "You have enabled debug info (i.e. -g or -ggdb in your CFLAGS/CXXFLAGS)." + ewarn "Please try removing -g{,gdb} before reporting a bug." + ewarn + fi + eshopts_pop + + # ccache often causes bogus compile failures, especially when the cache gets + # corrupted. + if has ccache ${FEATURES}; then + ewarn + ewarn "You have enabled ccache. Please try disabling ccache" + ewarn "before reporting a bug." + ewarn + fi + + # No ricer bugs. + if use custom-cflags; then + ewarn + ewarn "You have enabled the custom-cflags USE flag." + ewarn "Please disable it before reporting a bug." + ewarn + fi + + # If the system doesn't have enough memory, the compilation is known to + # fail. Print info about memory to recognize this condition. + einfo + einfo "$(grep MemTotal /proc/meminfo)" + einfo "$(grep SwapTotal /proc/meminfo)" + einfo +} + +pkg_setup() { + if [[ "${SLOT}" == "0" ]]; then + CHROMIUM_SUFFIX="" + else + CHROMIUM_SUFFIX="-${SLOT}" + fi + CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX RANLIB + + # Make sure the build system will use the right python, bug #344367. + python_set_active_version 2 + python_pkg_setup + + if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then + # Fail if the kernel doesn't support features needed for sandboxing, + # bug #363907. + ERROR_PID_NS="PID_NS is required for sandbox to work" + ERROR_NET_NS="NET_NS is required for sandbox to work" + CONFIG_CHECK="~PID_NS ~NET_NS" + check_extra_config + fi + + if use bindist; then + elog "bindist enabled: H.264 video support will be disabled." + else + elog "bindist disabled: Resulting binaries may not be legal to re-distribute." + fi +} + +src_prepare() { + ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \ + native_client/toolchain/linux_x86_newlib || die + + # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371. + sed -i '1i#define OF(x) x' \ + third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \ + chrome/common/zip*.cc || die + + # Revert WebKit changeset responsible for Gentoo bug #393471. + epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r1.patch" + + epatch_user + + # Remove most bundled libraries. Some are still needed. + find third_party -type f \! -iname '*.gyp*' \ + \! -path 'third_party/WebKit/*' \ + \! -path 'third_party/angle/*' \ + \! -path 'third_party/cacheinvalidation/*' \ + \! -path 'third_party/cld/*' \ + \! -path 'third_party/expat/*' \ + \! -path 'third_party/ffmpeg/*' \ + \! -path 'third_party/flac/flac.h' \ + \! -path 'third_party/gpsd/*' \ + \! -path 'third_party/harfbuzz/*' \ + \! -path 'third_party/hunspell/*' \ + \! -path 'third_party/iccjpeg/*' \ + \! -path 'third_party/jsoncpp/*' \ + \! -path 'third_party/khronos/*' \ + \! -path 'third_party/launchpad_translations/*' \ + \! -path 'third_party/leveldb/*' \ + \! -path 'third_party/leveldatabase/*' \ + \! -path 'third_party/libjingle/*' \ + \! -path 'third_party/libphonenumber/*' \ + \! -path 'third_party/libvpx/*' \ + \! -path 'third_party/libyuv/*' \ + \! -path 'third_party/lss/*' \ + \! -path 'third_party/mesa/*' \ + \! -path 'third_party/modp_b64/*' \ + \! -path 'third_party/mongoose/*' \ + \! -path 'third_party/npapi/*' \ + \! -path 'third_party/openmax/*' \ + \! -path 'third_party/ots/*' \ + \! -path 'third_party/protobuf/*' \ + \! -path 'third_party/scons-2.0.1/*' \ + \! -path 'third_party/sfntly/*' \ + \! -path 'third_party/skia/*' \ + \! -path 'third_party/smhasher/*' \ + \! -path 'third_party/speex/speex.h' \ + \! -path 'third_party/sqlite/*' \ + \! -path 'third_party/tcmalloc/*' \ + \! -path 'third_party/tlslite/*' \ + \! -path 'third_party/undoview/*' \ + \! -path 'third_party/v8-i18n/*' \ + \! -path 'third_party/webdriver/*' \ + \! -path 'third_party/webgl_conformance/*' \ + \! -path 'third_party/webrtc/*' \ + \! -path 'third_party/zlib/contrib/minizip/*' \ + -delete || die + + local v8_bundled="$(get_bundled_v8_version)" + local v8_installed="$(get_installed_v8_version)" + elog "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}" + + # Remove bundled v8. + find v8 -type f \! -iname '*.gyp*' -delete || die + + # The implementation files include v8 headers with full path, + # like #include "v8/include/v8.h". Make sure the system headers + # will be used. + # TODO: find a solution that can be upstreamed. + rmdir v8/include || die + ln -s /usr/include v8/include || die + + # Make sure the build system will use the right python, bug #344367. + # Only convert directories that need it, to save time. + python_convert_shebangs -q -r 2 build tools +} + +src_configure() { + local myconf="" + + # Never tell the build system to "enable" SSE2, it has a few unexpected + # additions, bug #336871. + myconf+=" -Ddisable_sse2=1" + + # Use system-provided libraries. + # TODO: use_system_ffmpeg + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + # TODO: use_system_vpx + myconf+=" + -Duse_system_bzip2=1 + -Duse_system_flac=1 + -Duse_system_icu=1 + -Duse_system_libevent=1 + -Duse_system_libjpeg=1 + -Duse_system_libpng=1 + -Duse_system_libwebp=1 + -Duse_system_libxml=1 + -Duse_system_speex=1 + -Duse_system_v8=1 + -Duse_system_xdg_utils=1 + -Duse_system_yasm=1 + -Duse_system_zlib=1" + + # Optional dependencies. + # TODO: linux_link_kerberos, bug #381289. + myconf+=" + $(gyp_use cups use_cups) + $(gyp_use gnome use_gconf) + $(gyp_use gnome-keyring use_gnome_keyring) + $(gyp_use gnome-keyring linux_link_gnome_keyring) + $(gyp_use kerberos use_kerberos) + $(gyp_use pulseaudio use_pulseaudio)" + + # Enable sandbox. + myconf+=" + -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox + -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" + + # if host-is-pax; then + # # Prevent the build from failing (bug #301880). The performance + # # difference is very small. + # myconf+=" -Dv8_use_snapshot=0" + # fi + + # Our system ffmpeg should support more codecs than the bundled one + # for Chromium. + # myconf+=" -Dproprietary_codecs=1" + + if ! use bindist; then + # Enable H.624 support in bundled ffmpeg. + myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" + fi + + local myarch="$(tc-arch)" + if [[ $myarch = amd64 ]] ; then + myconf+=" -Dtarget_arch=x64" + elif [[ $myarch = x86 ]] ; then + myconf+=" -Dtarget_arch=ia32" + elif [[ $myarch = arm ]] ; then + # TODO: check this again after + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. + append-flags -fno-tree-sink + + myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" + else + die "Failed to determine target arch, got '$myarch'." + fi + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf+=" -Dwerror=" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + fi + + egyp ${myconf} || die +} + +src_compile() { + emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die + pax-mark m out/Release/chrome + if use test; then + emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 || die + pax-mark m out/Release/{base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests + fi +} + +src_test() { + # For more info see bug #350349. + local mylocale='en_US.utf8' + if ! locale -a | grep -q "$mylocale"; then + eerror "${PN} requires ${mylocale} locale for tests" + eerror "Please read the following guides for more information:" + eerror " http://www.gentoo.org/doc/en/guide-localization.xml" + eerror " http://www.gentoo.org/doc/en/utf-8.xml" + die "locale ${mylocale} is not supported" + fi + + # For more info see bug #370957. + if [[ $UID -eq 0 ]]; then + die "Tests must be run as non-root. Please use FEATURES=userpriv." + fi + + # ICUStringConversionsTest: bug #350347. + # MessagePumpLibeventTest: bug #398501. + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ + '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*' + + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake + + # NetUtilTest: bug #361885. + # DnsConfigServiceTest.GetSystemConfig: bug #394883. + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ + '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig' + + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake +} + +src_install() { + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome || die + doexe out/Release/chrome_sandbox || die + fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" + + doexe out/Release/chromedriver || die + + # Install Native Client files on platforms that support it. + insinto "${CHROMIUM_HOME}" + case "$(tc-arch)" in + amd64) + doexe out/Release/nacl_helper{,_bootstrap} || die + doins out/Release/nacl_irt_x86_64.nexe || die + doins out/Release/libppGoogleNaClPluginChrome.so || die + ;; + x86) + doexe out/Release/nacl_helper{,_bootstrap} || die + doins out/Release/nacl_irt_x86_32.nexe || die + doins out/Release/libppGoogleNaClPluginChrome.so || die + ;; + esac + + newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die + if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then + sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \ + -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die + sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \ + -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die + sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \ + -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die + fi + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die + + # Allow users to override command-line options, bug #357629. + dodir /etc/chromium || die + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" || die + + # Support LINGUAS, bug #332751. + local pak + for pak in out/Release/locales/*.pak; do + local pakbasename="$(basename ${pak})" + local pakname="${pakbasename%.pak}" + local langname="${pakname//-/_}" + + # Do not issue warning for en_US locale. This is the fallback + # locale so it should always be installed. + if [[ "${langname}" == "en_US" ]]; then + continue + fi + + local found=false + local lang + for lang in ${LANGS}; do + local crlang="$(chromium_lang ${lang})" + if [[ "${langname}" == "${crlang}" ]]; then + found=true + break + fi + done + if ! $found; then + ewarn "LINGUAS warning: no ${langname} in LANGS" + fi + done + local lang + for lang in ${LANGS}; do + local crlang="$(chromium_lang ${lang})" + local pakfile="out/Release/locales/${crlang//_/-}.pak" + if [ ! -f "${pakfile}" ]; then + ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)" + fi + if ! use linguas_${lang}; then + rm "${pakfile}" || die + fi + done + + insinto "${CHROMIUM_HOME}" + doins out/Release/chrome.pak || die + doins out/Release/resources.pak || die + + doins -r out/Release/locales || die + doins -r out/Release/resources || die + + newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die + newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die + + # Chromium looks for these in its folder + # See media_posix.cc and base_paths_linux.cc + # dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die + # dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die + # dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die + doexe out/Release/libffmpegsumo.so || die + + # Install icons and desktop entry. + for SIZE in 16 22 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps + newins chrome/app/theme/chromium/product_logo_${SIZE}.png \ + chromium-browser${CHROMIUM_SUFFIX}.png || die + done + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + make_desktop_entry \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Chromium${CHROMIUM_SUFFIX}" \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + if use gnome; then + dodir /usr/share/gnome-control-center/default-apps || die + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die + if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then + sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ + "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml + fi + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + + # For more info see bug #292201, bug #352263, bug #361859. + elog + elog "Depending on your desktop environment, you may need" + elog "to install additional packages to get icons on the Downloads page." + elog + elog "For KDE, the required package is kde-base/oxygen-icons." + elog + elog "For other desktop environments, try one of the following:" + elog " - x11-themes/gnome-icon-theme" + elog " - x11-themes/tango-icon-theme" + + # For more info see bug #359153. + elog + elog "Some web pages may require additional fonts to display properly." + elog "Try installing some of the following packages if some characters" + elog "are not displayed properly:" + elog " - media-fonts/arphicfonts" + elog " - media-fonts/bitstream-cyberbit" + elog " - media-fonts/droid" + elog " - media-fonts/ipamonafont" + elog " - media-fonts/ja-ipafonts" + elog " - media-fonts/takao-fonts" + elog " - media-fonts/wqy-microhei" + elog " - media-fonts/wqy-zenhei" +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index ef07964f6be4..765d5109d9a3 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.85 2012/01/01 10:57:38 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.86 2012/01/11 17:38:00 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -418,9 +418,10 @@ src_test() { die "Tests must be run as non-root. Please use FEATURES=userpriv." fi - # For more info see bug #350347. + # ICUStringConversionsTest: bug #350347. + # MessagePumpLibeventTest: bug #398501. LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ - '--gtest_filter=-ICUStringConversionsTest.*' + '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*' LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake @@ -429,10 +430,9 @@ src_test() { LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake # NetUtilTest: bug #361885. - # NetUtilTest.GenerateFileName: some locale-related mismatch. - # UDP: unstable, active development. We should revisit this later. + # DnsConfigServiceTest.GetSystemConfig: bug #394883. LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ - '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*' + '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig' LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake } diff --git a/www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch b/www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch new file mode 100644 index 000000000000..5cf6a0966f4c --- /dev/null +++ b/www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch @@ -0,0 +1,61 @@ +This reverts http://trac.webkit.org/changeset/101286 +to fix Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=393471 + +Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp +=================================================================== +--- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 96970) ++++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 101286) +@@ -67,24 +67,6 @@ + + #include + +-#if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN) +-#define ASSUME_LITTLE_ENDIAN 0 +-#else +-#define ASSUME_LITTLE_ENDIAN 1 +-#endif +- +-#if defined(JCS_EXTENSIONS) && ASSUME_LITTLE_ENDIAN +-#define TURBO_JPEG_RGB_SWIZZLE +-#if USE(SKIA) && (!SK_R32_SHIFT && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16) +-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBX; } +-#else +-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRX; } +-#endif +-inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); } +-#else +-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; } +-#endif +- + namespace WebCore { + + struct decoder_error_mgr { +@@ -270,7 +252,7 @@ + case JCS_RGB: + case JCS_YCbCr: + // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB. +- m_info.out_color_space = rgbOutputColorSpace(); ++ m_info.out_color_space = JCS_RGB; + break; + case JCS_CMYK: + case JCS_YCCK: +@@ -525,19 +507,6 @@ + } + + jpeg_decompress_struct* info = m_reader->info(); +- +-#if !ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE) +- if (turboSwizzled(info->out_color_space)) { +- ASSERT(!m_scaled); +- while (info->output_scanline < info->output_height) { +- unsigned char* row = reinterpret_cast(buffer.getAddr(0, info->output_scanline)); +- if (jpeg_read_scanlines(info, &row, 1) != 1) +- return false; +- } +- return true; +- } +-#endif +- + JSAMPARRAY samples = m_reader->samples(); + + while (info->output_scanline < info->output_height) {