summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-08 15:00:32 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-08 15:00:32 +0000
commit2e58e11e96bc185f9618f036f9881b82c0bc47f1 (patch)
tree6ba48f800059804433048460e42a05163f53eea3 /media-libs/imlib2/imlib2-1.4.2-r1.ebuild
parentFix building with libpng14. (diff)
downloadgentoo-2-2e58e11e96bc185f9618f036f9881b82c0bc47f1.tar.gz
gentoo-2-2e58e11e96bc185f9618f036f9881b82c0bc47f1.tar.bz2
gentoo-2-2e58e11e96bc185f9618f036f9881b82c0bc47f1.zip
Clean up after myself. The patch is working fine also with libpng12.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/imlib2/imlib2-1.4.2-r1.ebuild')
-rw-r--r--media-libs/imlib2/imlib2-1.4.2-r1.ebuild7
1 files changed, 2 insertions, 5 deletions
diff --git a/media-libs/imlib2/imlib2-1.4.2-r1.ebuild b/media-libs/imlib2/imlib2-1.4.2-r1.ebuild
index 276239e0d807..fb3d6deed839 100644
--- a/media-libs/imlib2/imlib2-1.4.2-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.2-r1.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/media-libs/imlib2/imlib2-1.4.2-r1.ebuild,v 1.9 2010/03/08 10:01:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.2-r1.ebuild,v 1.10 2010/03/08 15:00:32 ssuominen Exp $
EAPI=1
inherit enlightenment toolchain-funcs eutils
@@ -25,10 +25,7 @@ DEPEND="=media-libs/freetype-2*
src_unpack() {
unpack ${A}
cd "${S}"
-
- has_version ">=media-libs/libpng-1.4" && epatch \
- "${FILESDIR}"/${P}-libpng14.patch
-
+ epatch "${FILESDIR}"/${P}-libpng14.patch
epatch "${FILESDIR}"/${P}-CVE-2008-5187.patch #248057
sed -i '/bumpmap_la_LIBADD/s:$: -lm:' src/modules/filters/Makefile.in #276285
}