diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 09:42:44 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 09:42:44 +0000 |
| commit | fd6219809654e2e864c59e48a256e2d5ff009c89 (patch) | |
| tree | e716dd426c122575e99f2ac7bd621a7033ed8cc9 /media-libs/gd | |
| parent | Fix libpng14 detection wrt #305117 by Lars Wendler. (diff) | |
| download | historical-fd6219809654e2e864c59e48a256e2d5ff009c89.tar.gz historical-fd6219809654e2e864c59e48a256e2d5ff009c89.tar.bz2 historical-fd6219809654e2e864c59e48a256e2d5ff009c89.zip | |
Fix building with libpng14 wrt #305101 by Lars Wendler.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'media-libs/gd')
| -rw-r--r-- | media-libs/gd/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/gd/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/gd/files/gd-2.0.35-libpng14.patch | 14 | ||||
| -rw-r--r-- | media-libs/gd/gd-2.0.35-r1.ebuild | 8 |
4 files changed, 29 insertions, 6 deletions
diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog index 92bb5f58efbf..caded3be24c5 100644 --- a/media-libs/gd/ChangeLog +++ b/media-libs/gd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/gd -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.61 2009/11/21 20:08:13 nixnut Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.62 2010/03/08 09:42:43 ssuominen Exp $ + + 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r1.ebuild, + +files/gd-2.0.35-libpng14.patch: + Fix building with libpng14 wrt #305101 by Lars Wendler. 21 Nov 2009; nixnut <nixnut@gentoo.org> gd-2.0.35-r1.ebuild: ppc stable #292130 diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest index cc2e1833e417..4a3d76a4c19f 100644 --- a/media-libs/gd/Manifest +++ b/media-libs/gd/Manifest @@ -1,6 +1,7 @@ +AUX gd-2.0.35-libpng14.patch 331 RMD160 109e44c20a8fb776f0b524802b0e932cfc85183c SHA1 aa41ec05d7a83b3e490f255024ace59801c81d0a SHA256 8558e5638f3762e5c416645683af63e5ad86ceb9dad747fcd6543ff50427b384 AUX gd-2.0.35-maxcolors.patch 414 RMD160 6a6cefb35a49d69b8739d7406a909aa67f3a9904 SHA1 14c395c21e7ece6f182603774a1d65979c9eb10a SHA256 022a650d6d2e03281b94bf6665b0084c79d75ab499b7266c7d2cf620b260a15b DIST gd-2.0.35.tar.bz2 1212730 RMD160 f452a2c333b2ba9b7b4c143983ec2af18a335516 SHA1 ccf34a610abff2dbf133a20c4d2a4aa94939018a SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9 -EBUILD gd-2.0.35-r1.ebuild 1196 RMD160 6a1b27a96584027c538f46731bdc6e6f03c0252f SHA1 0bdb0521846a67c1e0fe28c5f3e5f541c445b0c2 SHA256 8d6462e66623ce415a6b7f591c00669ec393a5b34b1c5ebec23ff7bfbcd46e94 +EBUILD gd-2.0.35-r1.ebuild 1288 RMD160 65056df89b9261c9dd1595279cf622c54dcc248f SHA1 02b32e7c6ffdb77665f7325c2d70a3284b5a5864 SHA256 328e2a25bd8e22cfbcfe534867d5eb3cdcf79897688e6edfc6d2e41d728a1b4c EBUILD gd-2.0.35.ebuild 1129 RMD160 f636fe590034636f7c88ccad2e8122e98017a87a SHA1 a71d19b9c2bec4324cdb7a1d049003a9c559f513 SHA256 832f7e2baae6f569c0553f62938d05eae8d193d42ee9f9bbe5f2466ee3aa7621 -MISC ChangeLog 13268 RMD160 d25f7f871e92c4c857651d2dd030494e9b21356f SHA1 1704be64e3eae528eff125124167396e87a68321 SHA256 99cc1960251dffc7e7c8d9e79515a88f53b9fe3ddaa57d72ef09f4cb6b7a66e9 +MISC ChangeLog 13440 RMD160 f551aa2231bd31d7c31be7d8710d4701841479a6 SHA1 f9ebe7ff1317081fa5b7e78984e26c35e234ecc8 SHA256 a0df24eae7e44917dc58fd33628b478efb7d5fd606853db08246550fd13792aa MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843 diff --git a/media-libs/gd/files/gd-2.0.35-libpng14.patch b/media-libs/gd/files/gd-2.0.35-libpng14.patch new file mode 100644 index 000000000000..98b6461267d9 --- /dev/null +++ b/media-libs/gd/files/gd-2.0.35-libpng14.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/show_bug.cgi?id=305101 +http://repos.archlinux.org/wsvn/packages/gd/trunk/libpng14.patch + +--- gd_png.c ++++ gd_png.c +@@ -149,7 +149,7 @@ + return NULL; + } + +- if (!png_check_sig (sig, 8)) { /* bad signature */ ++ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ + return NULL; /* bad signature */ + } + diff --git a/media-libs/gd/gd-2.0.35-r1.ebuild b/media-libs/gd/gd-2.0.35-r1.ebuild index c1f14276f921..866924b1f3e9 100644 --- a/media-libs/gd/gd-2.0.35-r1.ebuild +++ b/media-libs/gd/gd-2.0.35-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.7 2009/11/21 20:08:13 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.8 2010/03/08 09:42:43 ssuominen Exp $ inherit autotools @@ -23,6 +23,10 @@ DEPEND="${RDEPEND}" src_unpack() { unpack ${A} cd "${S}" + + has_version ">=media-libs/libpng-1.4" && epatch \ + "${FILESDIR}"/${P}-libpng14.patch + epatch "${FILESDIR}"/${P}-maxcolors.patch eautoconf find . -type f -print0 | xargs -0 touch -r configure |