From: Paweł Hajdan Date: Wed, 19 Oct 2011 16:33:01 +0000 (+0000) Subject: Re-enable NaCl (previosuly broken by bug #386931 by Kamen Dokov). Remove old. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25544494807fa95df318214248db139fe2045e9f;p=gentoo.git Re-enable NaCl (previosuly broken by bug #386931 by Kamen Dokov). Remove old. Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index f5c416b34138..dc813376ef1f 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/chromium # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.470 2011/10/18 08:10:30 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.471 2011/10/19 16:33:01 phajdan.jr Exp $ + +*chromium-16.0.904.0-r3 (19 Oct 2011) + + 19 Oct 2011; Pawel Hajdan jr + -chromium-14.0.835.163.ebuild, -chromium-16.0.904.0-r1.ebuild, + +chromium-16.0.904.0-r3.ebuild, chromium-9999-r1.ebuild: + Re-enable NaCl (previosuly broken by bug #386931 by Kamen Dokov). Remove old. 18 Oct 2011; Pawel Hajdan jr chromium-16.0.904.0-r2.ebuild, chromium-9999-r1.ebuild: diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 20590f378fbf..10926864d337 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -10,27 +10,25 @@ AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1c AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SHA1 3dc5d6f9437f4b0ffb584395e19663450384b53a SHA256 4011f1e2f44bd18ad1266dffc1d3fbc13a6430afade2b19240b31ee9437dcbda AUX nacl.gypi 98 RMD160 fa4806fbc8c2e19763c1905a3bc431022b247825 SHA1 df4cee39e1d49e10f9c075f5e6e9db28e8260926 SHA256 25bddd2eee7821e18ddda06f6e69552c359e1c04a10971ac3985556c3d8ef059 -DIST chromium-14.0.835.163.tar.bz2 155868619 RMD160 36009ea3db7270a90ffe9d77ba3a52d86d5d5a84 SHA1 f38e8835f4c12a61734eb99ee0a16d1386e2726d SHA256 2a16908fce65fda294448c43ec16dbbe3ff07603f0695126e5e845f727c6b5aa DIST chromium-14.0.835.202.tar.bz2 155892873 RMD160 af580b4fa74416a66a701343dcd9fa7815e46041 SHA1 e1c2d7cacaa256b1d343ee012d07170dbb3beb2f SHA256 8fcbeda57e45c990257c0ef2a021fad5e58dca1686688ffaccc2d6fa421fe0db DIST chromium-15.0.874.83.tar.bz2 151411536 RMD160 40b1eabd45b87677e297e45517afae0bba41fde6 SHA1 e03c4ab7806e4fb33ecefc2bda2d820eec16b930 SHA256 6a7077cd75848671c3eac6e009272f35d3e2b505da41ddcd611317ab26e60732 DIST chromium-15.0.874.92.tar.bz2 151351532 RMD160 7417070450b52542e59472cd3e0a1927d74afd2d SHA1 928070975a6e02b4c97a697d94bf1650ef2e1f83 SHA256 daab6fbfbae252d649de40293a351b68e69a5d144339ba4540a3f360b4388c19 DIST chromium-16.0.899.0.tar.bz2 152410133 RMD160 2d306ea291e6f6f08633760df3d4051c20633588 SHA1 475ae2cf5958fd9f0ac057bf508a310e86080fae SHA256 e25a1e4570d3befd06fff5dac5ac633d5e3a680dbfad1f09ff6de6b13d53d491 DIST chromium-16.0.904.0.tar.bz2 153803371 RMD160 eed19b8e636c530e733a102690ce80e820d46c36 SHA1 80318609dcbdd03543ff32148c2346356e5fe61d SHA256 6dadb0aff96c7b5f86a4d5046d19d286591bdf40814cea7a59746812ef9a7611 -EBUILD chromium-14.0.835.163.ebuild 13690 RMD160 517fe75786dabe160892afa24d3e0f38cf485a6d SHA1 6670def7f3058d06cedf10f2a0e955c145786eb5 SHA256 fe6c30231eae1b79e4a3aee376e84bd65c4dae77bdc7f77394bec970cfc2f314 EBUILD chromium-14.0.835.202.ebuild 13789 RMD160 7a3c1f7d22f9285e5f89ec3a557d5dbf7e7cb118 SHA1 bc2a1024a5c347b283c4d932f7c2fcb29d24b64a SHA256 3b81df285e1053d7b7850edb5fcc79523f79ed236a269d1ca55c60df4d8338bb EBUILD chromium-15.0.874.83.ebuild 14224 RMD160 df78a96ac7bd075a4a8f21fd24a1fc3bac6a3cea SHA1 4bd640fe84767ef334c0682ef544a76aef225631 SHA256 73d9c3db531079bbed5559e9076047b895f60e3a131fb6108a29822f3f623ab2 EBUILD chromium-15.0.874.92.ebuild 14224 RMD160 0188245d09b5d7eb8152c5d6247fc54a36dafc59 SHA1 960f6920c927393948fca81dd93c26aef09d976f SHA256 47e9062d9f357861abc7592cf48a596003961d59a88b4ec2ac8bca4233b46093 EBUILD chromium-16.0.899.0.ebuild 13949 RMD160 5a5333ade34f2aacc504f70e16faf4b2ad4144b7 SHA1 06bb027a26c5517240ae9c2e4aef2a8eee7e5e70 SHA256 cd314d18256783329639ab69f9e088daad5c6fe5344a6c0e4a6c0c848c5a8cf4 -EBUILD chromium-16.0.904.0-r1.ebuild 14033 RMD160 10e2b2168b0b28fd5b0917a1f07da74403a0a51e SHA1 3e6312696579f3b30f4a71ba66b08649c80b8d79 SHA256 695c873b84ac7712f307de2c0d4a9cfee7b00d4e99b92a8375d57e6fba521682 EBUILD chromium-16.0.904.0-r2.ebuild 15515 RMD160 8784fe6b72e0785f5b4ff07e3cbf8f3846a49878 SHA1 5560da05ac544408b9bdcf13a0f85fd969b06f69 SHA256 af9b4c3336c973a682e474451362ed23aca979912ff70c37e742fe56bf435d08 -EBUILD chromium-9999-r1.ebuild 18092 RMD160 7e73a3728f150beb46d74ef0a5f280d4b7d6a672 SHA1 9b1a6dd1e04620c71056e739da4ccd5d88bd4cfd SHA256 e98d25d71ff987a136ecb53d25880444c302c36011984e48faabb9e21fd8e8ff -MISC ChangeLog 103640 RMD160 f0688d31e1581685cc9f65e782807c14aa20eeb1 SHA1 b704f2e1e438959d9aee7593c5d0c2667ccb75f4 SHA256 6205f6af2a65fb75d164914ca30e11245ab648074e2faa2c2f9742943bec1022 -MISC chromium-9999-r1.ebuild.orig 17326 RMD160 cf66e7261e9d5a890b4c06cd915d1bcf183b7faf SHA1 0e86aaf64abe72a3cba204060672631cfa480cef SHA256 5d6593c55705dbd7af2dbfd50abe042bda4d1f8f6bab4ed2b3a667357e1ddde9 +EBUILD chromium-16.0.904.0-r3.ebuild 15537 RMD160 0847795d5fddf930a82844e40bf6bf8657693a0d SHA1 f5197f0a4c6de0f2f60d25615f6362988f1a1bd6 SHA256 af1f747c107d0a575133922f174926a51646cb580c05be77d7a951fae3c72809 +EBUILD chromium-9999-r1.ebuild 18114 RMD160 351f6440c42c0293651332eb240e4de6c0d111fb SHA1 ff2f6b6177f6acc173aa3368b2e31fdff19b9921 SHA256 f9e13f8a12609c15fc66f3a034b9e1ffb1c96846ef01e67506b4b9fafe60dcbf +MISC ChangeLog 103939 RMD160 52358562044d450eaf6a594104d0729fa7405e72 SHA1 c015bf1bdec6be0fbd31fe9a21dea909b0c898c2 SHA256 90d3b7cbf8e28ab33939a96b7a8b6bcbe2bbf992d7cef6d918e03d23371c4367 +MISC chromium-9999-r1.ebuild.orig 18092 RMD160 7e73a3728f150beb46d74ef0a5f280d4b7d6a672 SHA1 9b1a6dd1e04620c71056e739da4ccd5d88bd4cfd SHA256 e98d25d71ff987a136ecb53d25880444c302c36011984e48faabb9e21fd8e8ff MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREKAAYFAk6dNH0ACgkQuUQtlDBCeQKuzgCfXQ69ZS2m0gxUpVsNy+k2Umhx -cwsAnRrRe6TTU0/vzy9KcpJjNcO6hYiN -=pdpQ +iEYEAREKAAYFAk6e+74ACgkQuUQtlDBCeQLWWACfb87xRJK9fUmZQXNBqSQJTPzo +cjwAnRpBY9VfLFmJsjSTIepfK1NLUdAe +=6eMP -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-14.0.835.163.ebuild b/www-client/chromium/chromium-14.0.835.163.ebuild deleted file mode 100644 index 5ec7c38908fc..000000000000 --- a/www-client/chromium/chromium-14.0.835.163.ebuild +++ /dev/null @@ -1,449 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.835.163.ebuild,v 1.6 2011/09/18 21:32:36 tomka Exp $ - -EAPI="3" -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://build.chromium.org/official/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="bindist cups gnome gnome-keyring kerberos" - -# 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 - dev-libs/dbus-glib - >=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 - cups? ( - dev-libs/libgcrypt - >=net-print/cups-1.3.11 - ) - sys-libs/zlib - x11-libs/gtk+:2 - x11-libs/libXinerama - x11-libs/libXScrnSaver - x11-libs/libXtst" -DEPEND="${RDEPEND} - dev-lang/perl - >=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 - dev-python/simplejson - virtual/krb5 - )" -RDEPEND+=" - kerberos? ( virtual/krb5 ) - 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 -} - -pkg_setup() { - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - - # 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 - - # Prevent user problems like bug #348235. - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug." - fi - eshopts_pop - - # Warn if the kernel doesn't support features useful for sandboxing, - # bug #363907. - CONFIG_CHECK="~PID_NS ~NET_NS" - check_extra_config - - 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() { - # bug #374903 - ICU 4.8 compatibility - epatch "${FILESDIR}/${PN}-icu-compatibility-r0.patch" - - # Fix build with system libevent, to be upstreamed. - epatch "${FILESDIR}/${PN}-system-libevent-r0.patch" - - # 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 - - 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/launchpad_translations/*' \ - \! -path 'third_party/leveldb/*' \ - \! -path 'third_party/libjingle/*' \ - \! -path 'third_party/libphonenumber/*' \ - \! -path 'third_party/libvpx/*' \ - \! -path 'third_party/mesa/*' \ - \! -path 'third_party/modp_b64/*' \ - \! -path 'third_party/npapi/*' \ - \! -path 'third_party/openmax/*' \ - \! -path 'third_party/ots/*' \ - \! -path 'third_party/protobuf/*' \ - \! -path 'third_party/sfntly/*' \ - \! -path 'third_party/skia/*' \ - \! -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/webgl_conformance/*' \ - \! -path 'third_party/webrtc/*' \ - \! -path 'third_party/yasm/*' \ - \! -path 'third_party/zlib/contrib/minizip/*' \ - -delete || 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" - - # Disable NaCl temporarily, this tarball doesn't have IRT. - myconf+=" -Ddisable_nacl=1" - - # Disable WebRTC until they make PulseAudio dependency optional, - # bug #377847. - myconf+=" -Denable_webrtc=0" - - # 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_xdg_utils=1 - -Duse_system_zlib=1" - - # Optional dependencies. - 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)" - - # 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 a build error with -Os, bug #352457. - replace-flags "-Os" "-O2" - - egyp ${myconf} || die -} - -src_compile() { - emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die - pax-mark m out/Release/chrome - if use test; then - emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die - pax-mark m out/Release/{base,crypto,googleurl,net}_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 - - # For more info see bug #350347. - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ - '--gtest_filter=-ICUStringConversionsTest.*' - - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake - - # NetUtilTest: bug #361885. - # UDP: unstable, active development. We should revisit this later. - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ - '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:*UDP*' -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - - # Install Native Client files on platforms that support it. - # insinto "${CHROMIUM_HOME}" - # case "$(tc-arch)" in - # amd64) - # doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # ;; - # x86) - # doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # ;; - # esac - - newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die - - # 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 || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || 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.1 || die - newman out/Release/chrome.1 chromium-browser.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/ffmpegsumo_nolink || 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.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" chromium-browser \ - "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 - doins "${FILESDIR}"/chromium-browser.xml || die - 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-16.0.904.0-r1.ebuild b/www-client/chromium/chromium-16.0.904.0-r3.ebuild similarity index 85% rename from www-client/chromium/chromium-16.0.904.0-r1.ebuild rename to www-client/chromium/chromium-16.0.904.0-r3.ebuild index 1e4972baea02..79556d37f19e 100644 --- a/www-client/chromium/chromium-16.0.904.0-r1.ebuild +++ b/www-client/chromium/chromium-16.0.904.0-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.904.0-r1.ebuild,v 1.2 2011/10/13 03:48:58 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.904.0-r3.ebuild,v 1.1 2011/10/19 16:33:01 phajdan.jr Exp $ -EAPI="3" +EAPI="4" PYTHON_DEPEND="2:2.6" inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \ @@ -26,6 +26,7 @@ for lang in ${LANGS}; do done RDEPEND="app-arch/bzip2 + >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 @@ -90,29 +91,70 @@ chromium_lang() { fi } -pkg_setup() { - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" +get_bundled_v8_version() { + "$(PYTHON -2)" "${FILESDIR}"/extract_v8_version.py v8/src/version.cc +} - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB +get_installed_v8_version() { + best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g' +} - # Make sure the build system will use the right python, bug #344367. - python_set_active_version 2 - python_pkg_setup +pkg_pretend() { + 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 ! 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 "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug." + 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 - # Warn if the kernel doesn't support features useful for sandboxing, - # bug #363907. - CONFIG_CHECK="~PID_NS ~NET_NS" - check_extra_config + # 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 + + # 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() { + CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" + + # 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 use bindist; then elog "bindist enabled: H.264 video support will be disabled." @@ -122,8 +164,8 @@ pkg_setup() { } src_prepare() { - ln -s "/usr/$(get_libdir)/nacl-toolchain-newlib" \ - "native_client/toolchain/linux_x86_newlib" || die + 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' \ @@ -176,6 +218,20 @@ src_prepare() { \! -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 @@ -204,6 +260,7 @@ src_configure() { -Duse_system_libwebp=1 -Duse_system_libxml=1 -Duse_system_speex=1 + -Duse_system_v8=1 -Duse_system_xdg_utils=1 -Duse_system_zlib=1" @@ -222,11 +279,11 @@ src_configure() { -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 + # 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. diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index b1109ddb012d..8a368d97dc05 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.61 2011/10/18 08:10:30 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.62 2011/10/19 16:33:01 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -54,6 +54,7 @@ RDEPEND="app-arch/bzip2 x11-libs/libXtst kerberos? ( virtual/krb5 )" DEPEND="${RDEPEND} + dev-lang/nacl-toolchain-newlib dev-lang/perl dev-python/simplejson >=dev-util/gperf-3.0.3 @@ -216,6 +217,9 @@ pkg_setup() { } 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 \ @@ -293,9 +297,6 @@ src_configure() { # additions, bug #336871. myconf+=" -Ddisable_sse2=1" - # Disable NaCl temporarily, bug #386931 (amd64-specific). - myconf+=" -Ddisable_nacl=1" - # Use system-provided libraries. # TODO: use_system_ffmpeg # TODO: use_system_hunspell (upstream changes needed). @@ -425,17 +426,17 @@ src_install() { fi # Install Native Client files on platforms that support it. - # insinto "${CHROMIUM_HOME}" - # case "$(tc-arch)" in - # amd64) - # doins out/Release/nacl_irt_x86_64.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # ;; - # x86) - # doins out/Release/nacl_irt_x86_32.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # ;; - # esac + insinto "${CHROMIUM_HOME}" + case "$(tc-arch)" in + amd64) + doins out/Release/nacl_irt_x86_64.nexe || die + doins out/Release/libppGoogleNaClPluginChrome.so || die + ;; + x86) + 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 sed "s:chromium-browser:chromium-browser${SUFFIX}:g" \