summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-02-25 09:06:18 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-02-25 09:06:18 +0000
commit073906c4b0477f6e14735ecb0fd80d1a42056a74 (patch)
tree9ff505129e25abd86861d123fd8664c81911e8dd /www-client
parentFix grep for odd names (like /usr/bin/[) (diff)
downloadgentoo-2-073906c4b0477f6e14735ecb0fd80d1a42056a74.tar.gz
gentoo-2-073906c4b0477f6e14735ecb0fd80d1a42056a74.tar.bz2
gentoo-2-073906c4b0477f6e14735ecb0fd80d1a42056a74.zip
Version bump for dev channel release. Remove old.
(Portage version: 2.1.7.16/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/chromium-5.0.335.0.ebuild (renamed from www-client/chromium/chromium-5.0.307.5.ebuild)9
2 files changed, 14 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e59e3545738d..8ac53fe79b1b 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.59 2010/02/23 18:26:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.60 2010/02/25 09:06:18 phajdan.jr Exp $
+
+*chromium-5.0.335.0 (25 Feb 2010)
+
+ 25 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-5.0.307.5.ebuild, +chromium-5.0.335.0.ebuild:
+ Version bump for dev channel release. Remove old.
23 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-5.0.322.2.ebuild,
chromium-9999.ebuild:
diff --git a/www-client/chromium/chromium-5.0.307.5.ebuild b/www-client/chromium/chromium-5.0.335.0.ebuild
index 24d73f73cd4d..62cb9f2c9a90 100644
--- a/www-client/chromium/chromium-5.0.307.5.ebuild
+++ b/www-client/chromium/chromium-5.0.335.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.5.ebuild,v 1.5 2010/02/16 12:21:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.335.0.ebuild,v 1.1 2010/02/25 09:06:18 phajdan.jr Exp $
EAPI="2"
inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -73,6 +73,9 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-drop_sse2.patch
# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+ # Prevent the make build from filling entire disk space on some systems,
+ # bug 297273.
+ epatch "${FILESDIR}"/${PN}-fix-make-build.patch
# Disable prefixing to allow linking against system zlib
sed -e '/^#include "mozzconf.h"$/d' \
@@ -83,6 +86,9 @@ src_prepare() {
src_configure() {
export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+ # Fails to build on arm if we don't do this
+ use arm && append-flags -fno-tree-sink
+
# CFLAGS/LDFLAGS
mkdir -p "${S}"/.gyp
cat << EOF > "${S}"/.gyp/include.gypi
@@ -113,7 +119,6 @@ EOF
if use arm; then
myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
- append-flags -fno-tree-sink
fi
if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then