diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 20:06:18 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 20:06:18 +0000 |
| commit | 26756d24301b26c70df2ad9503c11f60c7057bdb (patch) | |
| tree | 0bb46576a31f7dd412a6344c61bdf3d249a0d5e1 /net-proxy/ziproxy | |
| parent | amd64 stable, bug #308043 (diff) | |
| download | gentoo-2-26756d24301b26c70df2ad9503c11f60c7057bdb.tar.gz gentoo-2-26756d24301b26c70df2ad9503c11f60c7057bdb.tar.bz2 gentoo-2-26756d24301b26c70df2ad9503c11f60c7057bdb.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy/ziproxy')
| -rw-r--r-- | net-proxy/ziproxy/ChangeLog | 8 | ||||
| -rw-r--r-- | net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch | 23 | ||||
| -rw-r--r-- | net-proxy/ziproxy/ziproxy-2.7.2.ebuild | 10 |
3 files changed, 36 insertions, 5 deletions
diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog index 780c8ee08efb..554cc300b5c1 100644 --- a/net-proxy/ziproxy/ChangeLog +++ b/net-proxy/ziproxy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-proxy/ziproxy -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.23 2009/12/17 14:12:24 sbriesen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.24 2010/03/08 20:06:17 ssuominen Exp $ + + 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> ziproxy-2.7.2.ebuild, + +files/ziproxy-2.7.2-libpng14.patch: + Fix building with libpng14. *ziproxy-2.7.2 (17 Dec 2009) diff --git a/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch b/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch new file mode 100644 index 000000000000..b5bc7ff42d7b --- /dev/null +++ b/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch @@ -0,0 +1,23 @@ +--- configure.in ++++ configure.in +@@ -24,7 +24,7 @@ + AC_CHECK_LIB(jpeg, jpeg_start_decompress,, AC_MSG_ERROR([libjpeg not found.])) + + USE_LIB(png) +-AC_CHECK_LIB(png, png_check_sig,, AC_MSG_ERROR([libpng not found.]), -lz -lm) ++AC_CHECK_LIB(png, png_sig_cmp,, AC_MSG_ERROR([libpng not found.]), -lz -lm) + + USE_LIB(pthread) + AC_CHECK_LIB(pthread, pthread_create,, AC_MSG_ERROR([libpthread not found.]), -lpthread) +diff -ur ziproxy-2.7.2.orig/src/image.c ziproxy-2.7.2/src/image.c +--- ziproxy-2.7.2.orig/src/image.c 2009-09-28 18:07:39.000000000 +0300 ++++ ziproxy-2.7.2/src/image.c 2010-03-08 22:12:55.000000000 +0200 +@@ -457,7 +457,7 @@ + color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + { + grayscale=1; +- if(bit_depth < 8) png_set_gray_1_2_4_to_8(png_ptr); ++ if(bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr); + }else grayscale=0; + + if (bit_depth == 16) diff --git a/net-proxy/ziproxy/ziproxy-2.7.2.ebuild b/net-proxy/ziproxy/ziproxy-2.7.2.ebuild index 533110a221e8..5f6597f1185e 100644 --- a/net-proxy/ziproxy/ziproxy-2.7.2.ebuild +++ b/net-proxy/ziproxy/ziproxy-2.7.2.ebuild @@ -1,10 +1,10 @@ -# 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/net-proxy/ziproxy/ziproxy-2.7.2.ebuild,v 1.1 2009/12/17 14:12:24 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-2.7.2.ebuild,v 1.2 2010/03/08 20:06:17 ssuominen Exp $ EAPI="2" -inherit eutils +inherit autotools eutils DESCRIPTION="A forwarding, non-caching, compressing web proxy server" HOMEPAGE="http://ziproxy.sourceforge.net/" @@ -38,6 +38,10 @@ src_prepare() { sed -i -e "s:/usr/bin/:/usr/sbin/:g" \ -e "s:\(.*port.*\):\1\n\ttype\t\t\t= UNLISTED:g" \ -e "s:root:ziproxy:g" etc/xinetd.d/ziproxy + + epatch "${FILESDIR}"/${P}-libpng14.patch + + AT_M4DIR="config" eautoreconf } src_configure() { |