diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 10:01:27 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 10:01:27 +0000 |
| commit | b19036b5a53627473cd920b168ffa04fc8a98a1c (patch) | |
| tree | 4c459f0bf9e6817134ce1da20febea123f1697b1 /media-libs/imlib2 | |
| parent | Fix building with libpng14 wrt #305101 by Lars Wendler. (diff) | |
| download | gentoo-2-b19036b5a53627473cd920b168ffa04fc8a98a1c.tar.gz gentoo-2-b19036b5a53627473cd920b168ffa04fc8a98a1c.tar.bz2 gentoo-2-b19036b5a53627473cd920b168ffa04fc8a98a1c.zip | |
Fix implicit declaration of function png_check_sig with libpng14.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/imlib2')
| -rw-r--r-- | media-libs/imlib2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch | 13 | ||||
| -rw-r--r-- | media-libs/imlib2/imlib2-1.4.2-r1.ebuild | 6 |
3 files changed, 23 insertions, 2 deletions
diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog index 6ea0d1589323..606e4eb1c5ca 100644 --- a/media-libs/imlib2/ChangeLog +++ b/media-libs/imlib2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/imlib2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.93 2010/01/22 17:04:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.94 2010/03/08 10:01:26 ssuominen Exp $ + + 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + imlib2-1.4.2-r1.ebuild, +files/imlib2-1.4.2-libpng14.patch: + Fix implicit declaration of function png_check_sig with libpng14. 22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> imlib2-1.4.2-r1.ebuild: diff --git a/media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch b/media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch new file mode 100644 index 000000000000..a338bc693dd6 --- /dev/null +++ b/media-libs/imlib2/files/imlib2-1.4.2-libpng14.patch @@ -0,0 +1,13 @@ +http://repos.archlinux.org/wsvn/packages/imlib2/trunk/libpng14.patch + +--- src/modules/loaders/loader_png.c ++++ src/modules/loaders/loader_png.c +@@ -38,7 +38,7 @@ + + /* if we haven't read the header before, set the header data */ + fread(buf, 1, PNG_BYTES_TO_CHECK, f); +- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK)) ++ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) + { + fclose(f); + return 0; diff --git a/media-libs/imlib2/imlib2-1.4.2-r1.ebuild b/media-libs/imlib2/imlib2-1.4.2-r1.ebuild index 9069c12a0a98..276239e0d807 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.8 2010/01/22 17:04:39 ssuominen Exp $ +# $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 $ EAPI=1 inherit enlightenment toolchain-funcs eutils @@ -25,6 +25,10 @@ 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}-CVE-2008-5187.patch #248057 sed -i '/bumpmap_la_LIBADD/s:$: -lm:' src/modules/filters/Makefile.in #276285 } |