summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-06-16 19:59:32 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-06-16 19:59:32 +0000
commitc8fedb9575de1838ea284f9d896b54a62ef6adfd (patch)
treeaddee8c49624bf2b416ef09de26b4f15a5447389 /www-client/chromium
parentMakefiles are parallel-unsafe, so adding -j1 until it is properly fixed. See ... (diff)
downloadhistorical-c8fedb9575de1838ea284f9d896b54a62ef6adfd.tar.gz
historical-c8fedb9575de1838ea284f9d896b54a62ef6adfd.tar.bz2
historical-c8fedb9575de1838ea284f9d896b54a62ef6adfd.zip
Apply the ffmpeg build workaround to the 5.0.x.x series, bug #324359 by flameeyes.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/ChangeLog7
-rw-r--r--www-client/chromium/Manifest4
-rw-r--r--www-client/chromium/chromium-5.0.375.70.ebuild6
3 files changed, 13 insertions, 4 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index a1d3a9b2bc6a..2be1a87dae3f 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
# 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.113 2010/06/11 09:44:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.114 2010/06/16 19:59:32 phajdan.jr Exp $
+
+ 16 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ chromium-5.0.375.70.ebuild:
+ Apply the ffmpeg build workaround to the 5.0.x.x series, bug #324359 by
+ flameeyes.
11 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org>
chromium-6.0.427.0.ebuild, chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 65f6a1a1daeb..eb2a1973f941 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,8 +7,8 @@ AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506
AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
DIST chromium-5.0.375.70.tar.bz2 163191937 RMD160 cb43307d095dc7ba146762b2a997ba32c5c12907 SHA1 96234ce716e5124f8c8ada92ed9a8cbe6183c5ed SHA256 dd2e440b1a230b1adcc8941d825155e5aeaf887fe67702697a845bd459455902
DIST chromium-6.0.427.0.tar.bz2 179247836 RMD160 6b42d4145514557eba30b99a0799e181e2f45a16 SHA1 65897ae8d05e04e821333fca05d77cbe0b08771f SHA256 e5ab816d0b39511d6718c2f76c3436c4db3664c06496fe413273a70864d4f3d8
-EBUILD chromium-5.0.375.70.ebuild 5523 RMD160 ad6897c84fc64165953ac4e59067fb887205c061 SHA1 ad30da87532e64fada347f7226eadb15c3d55b66 SHA256 828c2d43c6b465e227280abb31d1cc466bbb5ec2c5567f5acde4b8dd2a178b12
+EBUILD chromium-5.0.375.70.ebuild 5653 RMD160 accd9bebc41a61e8544e2d2073bfa8eb558cb8cc SHA1 c48b195937ea1c65bde66fdf9be0dabba470644c SHA256 68904b0221796b90cbf779d107dd81c7f31bcab12068e27fe22d24c38977133a
EBUILD chromium-6.0.427.0.ebuild 5869 RMD160 3db0e8f2a551247e1bf370dcc09f22af48dbb628 SHA1 7499494a3540b3e802dd5cbc75f857d7075c9e1d SHA256 caf0867efaa0c786653342e0e0b62b52f49f3ac705590bac62b978d80963883c
EBUILD chromium-9999.ebuild 7650 RMD160 7f30b97c3c890767905d0e8d9bd5144808a1e245 SHA1 ad0ec22cb6408555de734ecebc64ceee3a9f18a6 SHA256 5d00de48c051c2228c16541385bcf130a6da0db54fc66f802562715552fb9744
-MISC ChangeLog 25494 RMD160 1a2509d47d94e310e4f125928675bd6ef65574ee SHA1 d8b54fffd897c26217c40c97e23ef70d7a64d2a0 SHA256 0eba41bc7d8827f94368b0f7320428da15497d5a03437cd9dad7a080e86a8bc7
+MISC ChangeLog 25669 RMD160 7f5297e7106306478f4b89ccfda90c94655025e5 SHA1 47e7f8635b6307237a57fe1e05546a455ac095af SHA256 30d20d55baddd253e0fbba665683f4e90cace8d9ab81f1c41b60d7e26172ab5a
MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-5.0.375.70.ebuild b/www-client/chromium/chromium-5.0.375.70.ebuild
index 9ad640db6d16..765157ee867d 100644
--- a/www-client/chromium/chromium-5.0.375.70.ebuild
+++ b/www-client/chromium/chromium-5.0.375.70.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.375.70.ebuild,v 1.2 2010/06/11 09:35:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.70.ebuild,v 1.3 2010/06/16 19:59:32 phajdan.jr Exp $
EAPI="2"
@@ -66,6 +66,10 @@ src_prepare() {
src_configure() {
export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+ # Workaround for bug #318969.
+ # TODO: remove when http://crbug.com/43778 is fixed.
+ append-flags -D__STDC_CONSTANT_MACROS
+
# Fails to build on arm if we don't do this
use arm && append-flags -fno-tree-sink