diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-09 11:15:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-09 11:15:13 +0000 |
| commit | b0ee85f32951d453bf3ae00b5f97679d754eeedb (patch) | |
| tree | 89d4a8b4969c2bdfee9022a9a176ed246d6e4010 /net-proxy | |
| parent | added ~x86-interix prefix keyword (diff) | |
| download | gentoo-2-b0ee85f32951d453bf3ae00b5f97679d754eeedb.tar.gz gentoo-2-b0ee85f32951d453bf3ae00b5f97679d754eeedb.tar.bz2 gentoo-2-b0ee85f32951d453bf3ae00b5f97679d754eeedb.zip | |
Fix building with libpng15 wrt #378475 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/ziproxy/ChangeLog | 6 | ||||
| -rw-r--r-- | net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch | 20 | ||||
| -rw-r--r-- | net-proxy/ziproxy/ziproxy-3.1.3.ebuild | 18 |
3 files changed, 34 insertions, 10 deletions
diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog index 5ed6edd60953..2838dd659744 100644 --- a/net-proxy/ziproxy/ChangeLog +++ b/net-proxy/ziproxy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-proxy/ziproxy # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.28 2011/02/26 22:11:49 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.29 2011/08/09 11:15:13 ssuominen Exp $ + + 09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> ziproxy-3.1.3.ebuild, + +files/ziproxy-3.1.3-libpng15.patch: + Fix building with libpng15 wrt #378475 by Diego Elio Pettenò 26 Feb 2011; Kevin McCarthy <signals@gentoo.org> ziproxy-2.7.2.ebuild, ziproxy-3.1.1.ebuild, ziproxy-3.1.3.ebuild: diff --git a/net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch b/net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch new file mode 100644 index 000000000000..148a513e6f7d --- /dev/null +++ b/net-proxy/ziproxy/files/ziproxy-3.1.3-libpng15.patch @@ -0,0 +1,20 @@ +--- src/image.c ++++ src/image.c +@@ -17,6 +17,8 @@ + #include <stdlib.h> + #include <assert.h> + ++#include <zlib.h> ++ + #include <gif_lib.h> + + #include <jpeglib.h> +@@ -515,7 +517,7 @@ + bmp = new_raw_bitmap(); + *out = bmp; + +- png_set_read_fn (png_ptr, (voidp) &desc, mem_to_png); ++ png_set_read_fn (png_ptr, (png_voidp) &desc, mem_to_png); + + png_read_info (png_ptr,info_ptr); + png_get_IHDR (png_ptr, info_ptr, &width_png_uint_32, &height_png_uint_32, diff --git a/net-proxy/ziproxy/ziproxy-3.1.3.ebuild b/net-proxy/ziproxy/ziproxy-3.1.3.ebuild index 58a36db14888..14300f2dd5ca 100644 --- a/net-proxy/ziproxy/ziproxy-3.1.3.ebuild +++ b/net-proxy/ziproxy/ziproxy-3.1.3.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-3.1.3.ebuild,v 1.2 2011/02/26 22:11:49 signals Exp $ - -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ziproxy-3.1.3.ebuild,v 1.3 2011/08/09 11:15:13 ssuominen Exp $ +EAPI=4 inherit autotools eutils DESCRIPTION="A forwarding, non-caching, compressing web proxy server" @@ -20,7 +19,6 @@ DEPEND="media-libs/giflib virtual/jpeg sys-libs/zlib jpeg2k? ( media-libs/jasper )" - RDEPEND="${DEPEND} xinetd? ( virtual/inetd )" @@ -30,6 +28,8 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch + # fix sample config file sed -i \ -e "s:/var/ziproxy/:/var/lib/ziproxy/:g" \ @@ -56,12 +56,12 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodir /usr/sbin mv -vf "${D}"usr/{,s}bin/ziproxy || die - dobin src/tools/ziproxy_genhtml_stats.sh || die + dobin src/tools/ziproxy_genhtml_stats.sh newinitd "${FILESDIR}"/${PN}.initd ${PN} newconfd "${FILESDIR}"/${PN}.confd ${PN} @@ -70,14 +70,14 @@ src_install() { use jpeg2k && dodoc JPEG2000.txt insinto /etc - doins -r etc/ziproxy || die + doins -r etc/ziproxy insinto /var/lib/ziproxy/error - doins var/ziproxy/error/*.html || die + doins var/ziproxy/error/*.html if use xinetd; then insinto /etc/xinetd.d - doins etc/xinetd.d/ziproxy || die + doins etc/xinetd.d/ziproxy fi diropts -m0750 -o ziproxy -g ziproxy |