summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2011-11-15 18:25:55 +0000
committerMike Gilbert <floppym@gentoo.org>2011-11-15 18:25:55 +0000
commit3452038c39150d2a58b61faeb699556c12d180cb (patch)
tree9b15bb97455c01111752acd8df64386cef14a9ae
parentVersion bump (diff)
downloadgentoo-2-3452038c39150d2a58b61faeb699556c12d180cb.tar.gz
gentoo-2-3452038c39150d2a58b61faeb699556c12d180cb.tar.bz2
gentoo-2-3452038c39150d2a58b61faeb699556c12d180cb.zip
Apply workaround for bug 383371 to zip_internal.cc. Bug 390633.
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
-rw-r--r--www-client/chromium/ChangeLog5
-rw-r--r--www-client/chromium/chromium-17.0.938.0.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index aa1ad82b68cf..702a3a2ce69d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,9 @@
# 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.501 2011/11/15 10:33:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.502 2011/11/15 18:25:55 floppym Exp $
+
+ 15 Nov 2011; Mike Gilbert <floppym@gentoo.org> chromium-17.0.938.0.ebuild:
+ Apply workaround for bug 383371 to zip_internal.cc. Bug 390633.
*chromium-17.0.938.0 (15 Nov 2011)
diff --git a/www-client/chromium/chromium-17.0.938.0.ebuild b/www-client/chromium/chromium-17.0.938.0.ebuild
index 5d6cdc1b00df..331a55e66bad 100644
--- a/www-client/chromium/chromium-17.0.938.0.ebuild
+++ b/www-client/chromium/chromium-17.0.938.0.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-17.0.938.0.ebuild,v 1.1 2011/11/15 10:33:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.938.0.ebuild,v 1.2 2011/11/15 18:25:55 floppym Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -175,7 +175,7 @@ src_prepare() {
# 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
+ chrome/common/zip{,_internal}.cc || die
epatch_user