diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 15:00:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 15:00:32 +0000 |
| commit | f9c69fc6c0787cb0ddc7196af3d7cf1fc4e8df2c (patch) | |
| tree | 0073c9493767ceafb79338e10fdfaf06e79197e0 /media-libs | |
| parent | Fix building with libpng14. (diff) | |
| download | historical-f9c69fc6c0787cb0ddc7196af3d7cf1fc4e8df2c.tar.gz historical-f9c69fc6c0787cb0ddc7196af3d7cf1fc4e8df2c.tar.bz2 historical-f9c69fc6c0787cb0ddc7196af3d7cf1fc4e8df2c.zip | |
Clean up after myself. The patch is working fine also with libpng12.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/imlib2/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/imlib2/imlib2-1.4.2-r1.ebuild | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest index 479211f7db2f..cd055e3dfc79 100644 --- a/media-libs/imlib2/Manifest +++ b/media-libs/imlib2/Manifest @@ -1,6 +1,6 @@ AUX imlib2-1.4.2-CVE-2008-5187.patch 678 RMD160 fd7b0078640a3bc7a297d6b32f3063ed48227319 SHA1 aafad3c0692b6f1d78b3d0db902b2c3e7c4a178e SHA256 30e1e7a1185e71efb0c822a01553b2322d4f25dc4da997a02366ab7b365b5852 AUX imlib2-1.4.2-libpng14.patch 454 RMD160 410ae852f25c3bcc374195e542b3397840531199 SHA1 549f5a26fc5fb5c85b164c5d5fdcd92219c40f10 SHA256 694606bfb3678600aac675ecd392af1d45508eef328f3490def7cda1c5b093ba DIST imlib2-1.4.2.tar.gz 932684 RMD160 9b1f40ee392c1e27c6a75bbf7e8c7fb379e74695 SHA1 769ea1da26774cd7531d1d66432cf8d7d7b30c2b SHA256 9099c7c33e4150ba6b43d12d1fbe2b7479cfe30285af49a531337c18c088110a -EBUILD imlib2-1.4.2-r1.ebuild 1656 RMD160 ddb71b49ece79735ab89220f3a5f05a46dd5f8d1 SHA1 4eed6fa46560ae0d8c3f320a7a3f162e18e4eb5c SHA256 48044935f5c258248e501d8804ee1eba0027f77ad60e84f781ed48c51fb3192a +EBUILD imlib2-1.4.2-r1.ebuild 1610 RMD160 91ff8c9477b05e62e18f8d538f9c305ebfba152b SHA1 eec3237898dee2bbde0cfaf299dfd059c207039e SHA256 1e5a595c031bfa8d2a11121d7a98c288aa0b54f3547c87c93151f46af478ec20 MISC ChangeLog 11291 RMD160 00e4e95b5e745b5d7ab82e38fd61fdf63fb1891d SHA1 a4d26ae84d8d4a8505036b0a9aceec37174eeac7 SHA256 f4e0beca91369ffd61029b5d2ab8ba3fafb1785c3f428a2f4c21d3b8096cdbc3 MISC metadata.xml 2255 RMD160 da6c5bba4102a0a0bf263ed8f986704d74292a8f SHA1 5e968e9ca6c3640ee5e3c98c6939099014edbb27 SHA256 81f9771e8e64255ed50d174fe917f9ed0507db9afe88df9f29ce311a6075b30f 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 } |