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

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

3 files changed, 104 insertions, 1 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/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
+}