diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-13 18:23:23 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-13 18:23:23 +0000 |
| commit | 824e3b25c98cceaaf458d317bb5af16d88738bf4 (patch) | |
| tree | cada9ee58b86417f1036c7206ec81a2f670bb275 /dev-lang/php | |
| parent | Version bump. Set SUPPORT_PYTHON_ABIS. Disable installation with Python 3 (bu... (diff) | |
| download | gentoo-2-824e3b25c98cceaaf458d317bb5af16d88738bf4.tar.gz gentoo-2-824e3b25c98cceaaf458d317bb5af16d88738bf4.tar.bz2 gentoo-2-824e3b25c98cceaaf458d317bb5af16d88738bf4.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/files/php-5.2.12-libpng14.patch | 11 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.12.ebuild | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index c87ca43ea17d..68c663e56346 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/php # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.368 2010/01/31 19:53:09 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.369 2010/03/13 18:23:23 ssuominen Exp $ + + 13 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> php-5.2.12.ebuild, + +files/php-5.2.12-libpng14.patch: + Fix building with libpng14. 31 Jan 2010; Torsten Veller <tove@gentoo.org> php-5.2.9-r2.ebuild, php-5.2.10.ebuild, php-5.2.10-r1.ebuild, php-5.2.10-r2.ebuild, diff --git a/dev-lang/php/files/php-5.2.12-libpng14.patch b/dev-lang/php/files/php-5.2.12-libpng14.patch new file mode 100644 index 000000000000..90f015f0f55f --- /dev/null +++ b/dev-lang/php/files/php-5.2.12-libpng14.patch @@ -0,0 +1,11 @@ +--- ext/gd/libgd/gd_png.c ++++ ext/gd/libgd/gd_png.c +@@ -139,7 +139,7 @@ + return NULL; + } + +- if (!png_check_sig (sig, 8)) { /* bad signature */ ++ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ + return NULL; + } + diff --git a/dev-lang/php/php-5.2.12.ebuild b/dev-lang/php/php-5.2.12.ebuild index ce35b75c92d6..b9ad8774e43e 100644 --- a/dev-lang/php/php-5.2.12.ebuild +++ b/dev-lang/php/php-5.2.12.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/dev-lang/php/php-5.2.12.ebuild,v 1.9 2010/01/31 19:53:09 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.12.ebuild,v 1.10 2010/03/13 18:23:23 ssuominen Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -136,6 +136,8 @@ src_unpack() { cd "${S}" + epatch "${FILESDIR}"/${P}-libpng14.patch + # Concurrent PHP Apache2 modules support if use apache2 ; then if use concurrentmodphp ; then |