Add patch for zlib-1.2.6 gzgetc -> gzgetc_, #402069

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

4 files changed, 111 insertions, 10 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index a35defbfa599..21833b5f09d4 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.44 2012/02/15 02:14:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.45 2012/02/20 12:50:31 jlec Exp $
+
+*tkimg-1.4-r5 (20 Feb 2012)
+
+  20 Feb 2012; Justin Lecher <jlec@gentoo.org> +tkimg-1.4-r5.ebuild,
+  +files/tkimg-1.4-zlib-1.2.6.patch:
+  Add patch for zlib-1.2.6 gzgetc -> gzgetc_, #402069
 
   15 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> tkimg-1.4-r4.ebuild:
   ppc stable wrt #399771
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 30bfd974823f..d15399a81e88 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX tkimg-1.4-jbig.patch 910 RMD160 26df09bb627c645b03301f75988f1738b9dfcbdd SHA1 0fe27edef929b9317e118a07d2d36101b472d20b SHA256 7ee39eb27556b3e990ff2514065a8a8c4b1e128aa1d7e2e61afb19d1e2384714
+AUX tkimg-1.4-zlib-1.2.6.patch 496 RMD160 ecd38c3d44a366469a90a476711c2b8bffefb31d SHA1 fa28d6e7fb7512c71aff229abcf4c7d215f9f9a5 SHA256 4abf9ccffb9ddc186211b9955d52d566ecf6d9d7c3e11324dab18a86ac1dcc2d
 AUX tkimg-1.4.20100510-boolean.patch 373 RMD160 ff69fb2a48110947f38e30a0fe01c8827628bef8 SHA1 e9b12c418d87e7933fa64f6b183ec8802a1c9b37 SHA256 b68d29f6396bda665c5b11996a9f4c3b8295059a876ed7499509c6460e06fb97
 AUX tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch 6257 RMD160 c326a3fb052747c1494805f922a75b8f9cab455a SHA1 51b7f03a5095bcc7bd1443b9b64b4daffe4dc528 SHA256 b8b6eb2b2fe94fcb18fda0dd8d690abe963fd4e1422488942e8e9f770cafe718
 AUX tkimg-1.5_pre324-unbundle.patch 9950 RMD160 ceda455ef2abc0417eab3b5cee9473937a071f9f SHA1 c894acae64e0f408b12cb6b92048b057c2e4413a SHA256 6a83f1490ab55635cdf9d48255ad7a2910914b908ca164645afa0ed02c90a1f3
@@ -10,16 +11,13 @@ DIST tkimg-1.4-gentoo.patch.xz 12132 RMD160 74af1404b50c971f7817fe1d9373acb7af79
 DIST tkimg1.4.tar.bz2 4912894 RMD160 a05adf3e911ce7ab9304bddd89cf53c55c27b8fc SHA1 aa519474e3eb9640977a0ea7c61da6ba5129220b SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3ab87379fb69b473e73e3b1
 EBUILD tkimg-1.4-r3.ebuild 1672 RMD160 b030a91034702211d385e61ead1cce6d118df5f5 SHA1 becd7cab9bc4ecb8578019e88d7da411dab9dbd4 SHA256 601488309a35324a44164577794590ce543bcb2912e9ce895bada06df8b7ffdf
 EBUILD tkimg-1.4-r4.ebuild 1725 RMD160 9103a4dccce2c1fbf10d10c9ef756f19c6920518 SHA1 8ca2f7d54cf0c061f14c1882302eb8703b0e2758 SHA256 47362ec4b56598e01fc8c25538a850af2ee5bc2ea9f728c0b3462520f45e0b68
-MISC ChangeLog 7730 RMD160 4d5bce06b2c4f20a69b88adba47abb9ec6f770aa SHA1 b5c7ba3e571946451a7fbcafc92a78f1c7a7f527 SHA256 5310422e456a45043b14dc9791f5afa367e304f56a480c872f99001b47933224
+EBUILD tkimg-1.4-r5.ebuild 1771 RMD160 c1f02a38a289908ad2ee4613811b5d5db9b87f5a SHA1 8b6de1b9815cddb8e1c4e11db71f67c6678d3b92 SHA256 dfa220bfcc9a501ca2007e681c2fdf50d251d4ec8900b62307ee393cf22ba58a
+MISC ChangeLog 7915 RMD160 1976e2e9f4a012056f77651b4e9d59d5e1403280 SHA1 abc23152001773129037fb9b7fd2b66961f1e88f SHA256 a8ddf9b8c1571aa3ea4fc4185dfc4a171cd18eef55a3e6b6671350a6b267f4cd
 MISC metadata.xml 266 RMD160 d7c5f086c7291a9ac127633d31c5f78b0dbf6297 SHA1 88e958c8725427b9ce9156c4457703914a19992c SHA256 fe07b2bee63764c9cb9e3aaeac927f511dd11d3ff45e40021def110ac46cebbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPOxQ+AAoJEEdUh39IaPFNx7YH/1O9e6tAyKjFkfOYO93bqzWE
-6bRjtbjLbB1HZ6krcuNy7fxvfMK1RqWmtbdEky9qRBuh4AKQkeHZ5PB9vvN+9bVc
-pdVFjRpgGZ3LRRDIK8rAcgyyPQRmSBJNRISvcyYEPOmzLOxHHT7lutGImcDmfsO2
-qEbyNHzQ68PhJdgC4Pd6OLyiOiF2ey3vLbJv5VCTGAELcuKmwr+jElLVqO8PCbpy
-eyjWNpecZfyem1jWNpyPZgfVjiynShRhFfqFGzwQxvgMzXVCT9HV97DgKc7vJWKm
-U4u1dCprsVwn5wjwQgjugwLjYREp2r4CqlnHtYtcZmbmzejN9qwH68SuDlOrLXs=
-=4KuZ
+iEYEAREKAAYFAk9CQZwACgkQgAnW8HDreRZn+wCgsQdd0icjdD/JkOci5HCba1y1
+BGcAnR3gY/hZLfHemeVTYYPHmsMQSdtF
+=nnxh
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-zlib-1.2.6.patch b/dev-tcltk/tkimg/files/tkimg-1.4-zlib-1.2.6.patch
new file mode 100644
index 000000000000..e6b55133d616
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4-zlib-1.2.6.patch
@@ -0,0 +1,16 @@
+ zlib/zlibtclDecls.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h
+index d6666ab..416f42d 100644
+--- a/zlib/zlibtclDecls.h
++++ b/zlib/zlibtclDecls.h
+@@ -120,7 +120,7 @@ ZEXTERN char *		gzgets(gzFile file, char *buf, int len);
+ /* 38 */
+ ZEXTERN int		gzputc(gzFile file, int c);
+ /* 39 */
+-ZEXTERN int		gzgetc(gzFile file);
++ZEXTERN int		gzgetc_(gzFile file);
+ /* 40 */
+ ZEXTERN int		gzflush(gzFile file, int flush);
+ /* 41 */
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild
new file mode 100644
index 000000000000..dfdaa2d55745
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild,v 1.1 2012/02/20 12:50:31 jlec Exp $
+
+EAPI=3
+
+VIRTUALX_USE=test
+
+inherit eutils prefix virtualx
+
+MYP="${PN}${PV}"
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz
+	mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
+
+IUSE="doc test"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-lang/tk
+	>=dev-tcltk/tcllib-1.11
+	media-libs/tiff:0
+	media-libs/libpng:0
+	>=sys-libs/zlib-1.2.6
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	test? (
+		x11-apps/xhost
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+# Fails with jpeg-turbo silently, #386253
+RESTRICT="test"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \
+		"${FILESDIR}"/${P}-jbig.patch \
+		"${FILESDIR}"/${P}-zlib-1.2.6.patch
+	find compat/{libjpeg,libpng,zlib} -delete
+	sed \
+		-e 's:-O2 -fomit-frame-pointer::g' \
+		-e 's: -pipe::g' \
+		-i */configure  || die
+	eprefixify */*.h
+}
+
+src_test() {
+	Xemake test || die "Xmake failed"
+}
+
+src_install() {
+	local l bl
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install || die "emake install failed"
+
+	# Make library links
+	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+		bl=$(basename $l)
+		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+	done
+
+	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl || die
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/* || die
+	fi
+}