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 | 0ff8e256551dc3f0d62479d9e324e7f3d1734445 (patch) | |
| tree | f58c1db768de4066e35fe73e86d2b73a978b1edb /media-libs | |
| parent | Fix building with libpng14 wrt #305101 by Lars Wendler. (diff) | |
| download | historical-0ff8e256551dc3f0d62479d9e324e7f3d1734445.tar.gz historical-0ff8e256551dc3f0d62479d9e324e7f3d1734445.tar.bz2 historical-0ff8e256551dc3f0d62479d9e324e7f3d1734445.zip | |
Fix implicit declaration of function png_check_sig with libpng14.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/imlib2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/imlib2/Manifest | 5 | ||||
| -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 |
4 files changed, 26 insertions, 4 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/Manifest b/media-libs/imlib2/Manifest index 59a2e7aee96a..479211f7db2f 100644 --- a/media-libs/imlib2/Manifest +++ b/media-libs/imlib2/Manifest @@ -1,5 +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 1567 RMD160 7fa2c67ec9da666fea7069b6640c65601a91eaca SHA1 1c4f0d36e5a8305844075c1609e46131b1f39117 SHA256 ce3e2137f9f366e73885153066458f57a4a0c567603085467b58b30891f1a031 -MISC ChangeLog 11106 RMD160 a5313fceec71e473661b544206b160cfe67c7d1a SHA1 cdce1e6e06967dc6cb4b47bf5945a192fdd95fc8 SHA256 a9a8db9e5a2fb669b656eec93902404d5936ae0baa9985c0897a938148c4eb9e +EBUILD imlib2-1.4.2-r1.ebuild 1656 RMD160 ddb71b49ece79735ab89220f3a5f05a46dd5f8d1 SHA1 4eed6fa46560ae0d8c3f320a7a3f162e18e4eb5c SHA256 48044935f5c258248e501d8804ee1eba0027f77ad60e84f781ed48c51fb3192a +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/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 } |