diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-05-23 18:09:11 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-05-23 18:09:11 +0000 |
| commit | 9d8a92fd9762179dfbf5ec8a4a8b436aaf73a8f3 (patch) | |
| tree | 278c1fbe564ccf183231942b3ae2389dacf62aaf /www-client | |
| parent | Version bump (diff) | |
| download | gentoo-2-9d8a92fd9762179dfbf5ec8a4a8b436aaf73a8f3.tar.gz gentoo-2-9d8a92fd9762179dfbf5ec8a4a8b436aaf73a8f3.tar.bz2 gentoo-2-9d8a92fd9762179dfbf5ec8a4a8b436aaf73a8f3.zip | |
Define OF macro in minizip headers instead of each individual source file. Bug 417219 by jlec.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/chromium/chromium-21.0.1145.0.ebuild | 5 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999-r1.ebuild | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index f6a49166a891..a51be898b82a 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # 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.642 2012/05/22 19:49:43 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.643 2012/05/23 18:09:11 floppym Exp $ + + 23 May 2012; Mike Gilbert <floppym@gentoo.org> chromium-21.0.1145.0.ebuild, + chromium-9999-r1.ebuild: + Define OF macro in minizip headers instead of each individual source file. Bug + 417219 by jlec. *chromium-21.0.1145.0 (22 May 2012) diff --git a/www-client/chromium/chromium-21.0.1145.0.ebuild b/www-client/chromium/chromium-21.0.1145.0.ebuild index 3772ed561766..86ac0abe315c 100644 --- a/www-client/chromium/chromium-21.0.1145.0.ebuild +++ b/www-client/chromium/chromium-21.0.1145.0.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-21.0.1145.0.ebuild,v 1.1 2012/05/22 19:49:43 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1145.0.ebuild,v 1.2 2012/05/23 18:09:11 floppym Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -104,8 +104,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 + third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die epatch "${FILESDIR}/${PN}-svnversion-r0.patch" diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index 2807db353944..ba6fec481898 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.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-9999-r1.ebuild,v 1.115 2012/05/22 19:49:43 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.116 2012/05/23 18:09:11 floppym Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -160,8 +160,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 + third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die epatch_user |