summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-08-02 22:52:35 +0000
committerMike Gilbert <floppym@gentoo.org>2012-08-02 22:52:35 +0000
commit04513aa2667d7e1f69ee0071eb34a16bb30f9f5d (patch)
treea230a1ee94ff098349fd8ddd84859fd3a0a8f179 /www-client
parentVersion bump for dev channel release. (diff)
downloadgentoo-2-04513aa2667d7e1f69ee0071eb34a16bb30f9f5d.tar.gz
gentoo-2-04513aa2667d7e1f69ee0071eb34a16bb30f9f5d.tar.bz2
gentoo-2-04513aa2667d7e1f69ee0071eb34a16bb30f9f5d.zip
Version bump for dev channel release. This version builds with gcc-4.7.1, resolving bug 412615.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog9
-rw-r--r--www-client/chromium/chromium-22.0.1221.1.ebuild (renamed from www-client/chromium/chromium-22.0.1207.1.ebuild)7
2 files changed, 13 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 303a474a5369..2d0a01518024 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
# 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.682 2012/08/01 11:15:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.683 2012/08/02 22:52:35 floppym Exp $
+
+*chromium-22.0.1221.1 (02 Aug 2012)
+
+ 02 Aug 2012; Mike Gilbert <floppym@gentoo.org> +chromium-22.0.1221.1.ebuild,
+ -chromium-22.0.1207.1.ebuild:
+ Version bump for dev channel release. This version builds with gcc-4.7.1,
+ resolving bug 412615.
01 Aug 2012; Agostino Sarubbo <ago@gentoo.org> chromium-21.0.1180.57.ebuild:
Stable for AMD64, wrt bug #429174
diff --git a/www-client/chromium/chromium-22.0.1207.1.ebuild b/www-client/chromium/chromium-22.0.1221.1.ebuild
index cba7c13db1cb..b06705350bf0 100644
--- a/www-client/chromium/chromium-22.0.1207.1.ebuild
+++ b/www-client/chromium/chromium-22.0.1221.1.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-22.0.1207.1.ebuild,v 1.2 2012/07/22 16:52:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1221.1.ebuild,v 1.1 2012/08/02 22:52:35 floppym Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -60,7 +60,6 @@ DEPEND="${RDEPEND}
dev-python/simplejson
>=dev-util/gperf-3.0.3
>=sys-devel/bison-2.4.3
- <sys-devel/bison-2.6
sys-devel/flex
>=sys-devel/make-3.81-r2
virtual/pkgconfig
@@ -113,6 +112,9 @@ src_prepare() {
# Fix build without NaCl glibc toolchain.
epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+ # Bug 427438.
+ epatch "${FILESDIR}/${PN}-bison-2.6-r0.patch"
+
epatch_user
# Remove most bundled libraries. Some are still needed.
@@ -126,6 +128,7 @@ src_prepare() {
\! -path 'third_party/gpsd/*' \
\! -path 'third_party/harfbuzz/*' \
\! -path 'third_party/hunspell/*' \
+ \! -path 'third_party/hyphen/*' \
\! -path 'third_party/iccjpeg/*' \
\! -path 'third_party/jsoncpp/*' \
\! -path 'third_party/khronos/*' \