summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-05-04 11:15:54 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-05-04 11:15:54 +0000
commitd0b561bd4294c13a0c080373cf1049b3fe575f09 (patch)
tree9c06b573ead627e6e843ede10083fb65b473334c /www-client
parentdos2unix (diff)
downloadhistorical-d0b561bd4294c13a0c080373cf1049b3fe575f09.tar.gz
historical-d0b561bd4294c13a0c080373cf1049b3fe575f09.tar.bz2
historical-d0b561bd4294c13a0c080373cf1049b3fe575f09.zip
Do not apply the libpng-1.4 patch, it has been applied upstream. Bug
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/Manifest4
-rw-r--r--www-client/chromium/chromium-9999.ebuild5
3 files changed, 8 insertions, 7 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 4dd8e7cd6798..2dbda94c20f5 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
# 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.92 2010/04/29 10:48:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.93 2010/05/04 11:15:54 phajdan.jr Exp $
+
+ 04 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild:
+ Do not apply the libpng-1.4 patch, it has been applied upstream. Bug
+ #318361 by Zeke Connor <xzekex@live.co.uk>
29 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
chromium-5.0.375.23.ebuild, chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 837994c3fc3e..c672aee8cd36 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -14,6 +14,6 @@ DIST chromium-5.0.375.9.tar.bz2 248611435 RMD160 5fdf9ed277f0464ec4b925b3047658c
EBUILD chromium-5.0.342.9.ebuild 6548 RMD160 abb9d41541d252a60a61641ea76f6f7b1298bbcf SHA1 7f4e1c7f970b8f7a50247f27ca89bda3f064bb2a SHA256 6845b8905a1376ba8ec24ea09276d05b89d3b3c4da136d385260a4170b9e9d29
EBUILD chromium-5.0.375.23.ebuild 6436 RMD160 d0d01d6761e605408d9d3bc07f66b33dc3f4407b SHA1 2eda56005b7f6b465497f62f548ab251d2a41f6b SHA256 504816c00293dab6da66b27740a7710fcb0328f6a0162176dd68757e0a773721
EBUILD chromium-5.0.375.9.ebuild 6589 RMD160 1888aebc34e494b2bd640a970dbad4da615f4613 SHA1 3e1b189006d98fbfb677cad8db0da5743ff82180 SHA256 5bcc45d7f187ab3cc5ac247f4d2e6d604ce80f7069b71e2e0467a9fab7797f3a
-EBUILD chromium-9999.ebuild 8188 RMD160 f1b4996bbfc913311b20059fc089fd5936fe8d7a SHA1 bb8ee50ad2880ab0e3399ecf1fb34bfd93cd40a6 SHA256 29da4d65eb20f75d3de9071cfb5df7907f43d5c4a07150689e78c0548413fb89
-MISC ChangeLog 21153 RMD160 b2ee549dc80cd714f5edfea76ad936da87b4f06b SHA1 452080fb5798109e7f7a0cfc3b5c45b7119acb7e SHA256 e3ee53c29b2a123ec395cfa25e50685aa09fc6612d4f386df62647916003a107
+EBUILD chromium-9999.ebuild 8092 RMD160 bf2161a03364ac1c4bacc9f08b942b51bfbe7e0d SHA1 e7f46c1b95f7bc082b3a4c9b62ede48378677c77 SHA256 abfd215a095dabd4ea18056bf7ae2b7045d656f6ea3f3e64c3411ca595f49ad6
+MISC ChangeLog 21347 RMD160 1aa14b0fbeabb99f56befde2002d381a81c8eb07 SHA1 82af56c9a02e1e5852c383e1bea13c59e71bfcff SHA256 581c700f644a573e508e02dace89bc0d7601a5a262f95b4f91a0ab55a16d04dc
MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 9ca0cfc4c92f..47630709846e 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.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-9999.ebuild,v 1.47 2010/04/29 10:48:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.48 2010/05/04 11:15:54 phajdan.jr Exp $
EAPI="2"
inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -124,9 +124,6 @@ src_prepare() {
# Allow supporting more media types provided system ffmpeg supports them.
epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch
-
- # Fix build failure with libpng-1.4, bug 310959.
- epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
}
src_configure() {