dev-tcltk/tkimg: Import fedora patch for zlib-1.2.7

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

4 files changed, 144 insertions, 5 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 94dcf8c09a96..8c194b3d10f4 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.49 2012/07/07 14:05:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.50 2012/10/06 09:49:18 jlec Exp $
+
+*tkimg-1.4-r7 (06 Oct 2012)
+
+  06 Oct 2012; Justin Lecher <jlec@gentoo.org> +tkimg-1.4-r7.ebuild,
+  +files/tkimg-1.4-zlib127-gzgetc_fix.patch:
+  Import fedora patch for zlib-1.2.7
 
 *tkimg-1.4-r6 (07 Jul 2012)
 
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index a7a6eb93f7c6..904574b4dd60 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -5,6 +5,7 @@ AUX tkimg-1.4-jbig.patch 910 SHA256 7ee39eb27556b3e990ff2514065a8a8c4b1e128aa1d7
 AUX tkimg-1.4-libtiff.patch 5069 SHA256 07c4f995aea0f135107a331b8df434b3af7ec934c108ace8367e61d9889c0f16 SHA512 123f3fed7121290164eefda5122cbe2705a642ca6826d96ea6be3cbc134d8ce5ed6adcb0a335599312a80fb8bf8b8d0dd35ec9f812fc25607ae489040b938e7e WHIRLPOOL e99ac303511968d2073ce247b7e0eaf3961410bd60b78d57199e7e27169186d2950179e4c092c6924f0c26cd55a054f1a153d542544a8c14fb70c47a56011f3b
 AUX tkimg-1.4-libtiff4.patch 33987 SHA256 f6441799ad59afc12011b0ded8f1d2f6e45f7a6316a83a4114438041a400090f SHA512 8b0e50bb1d440e95e2b5a4d9044a165bcafd0140287fbbabf589ff3514d27f06803e99f2ed38756a780206a01c7dc2e7aa3442500b0a2a75754155014fa93875 WHIRLPOOL ccd9cba9b4dbfb2afa902ec2de86c791e484e39ea281f28afad03c69cd106b8e379e0714e6960347b1851ac13209a2c794baa79faa41f09ae3195ad51fe91f09
 AUX tkimg-1.4-zlib-1.2.6.patch 496 SHA256 4abf9ccffb9ddc186211b9955d52d566ecf6d9d7c3e11324dab18a86ac1dcc2d SHA512 d9b698da5abfbd5b2a921200a139e1d01244a8d983f0801e76d77ebcba15ba224707fe4290317b2fd06e0b597a254fbb2a97943c0220cd3e6fe9786f30bc4a8f WHIRLPOOL 4440cb147f9eeb0139b82d1d66e1404608b7b6ef1f9ab193eb8f5d9c6b7e74731942bb8a1a1f05bdeb82aae6b18d30fe3b2bfd12adbeb5bc6fc7ad317e1fa957
+AUX tkimg-1.4-zlib127-gzgetc_fix.patch 1779 SHA256 aece5b5888e9d13c42e3a5c4c722d5671a4955c53907081197fb92fadd57a217 SHA512 023a75e28a4985e956bbf3dd5f31549fa0e0af9787cd3c808fa907ebacd03b68ee85476de0ab99d5e5f7bcb2eb29c082e28a5039038b9d258a89ac01d694a5a9 WHIRLPOOL c755db25b9207b4e9624b3c68e61b0817b1a97d396fe9fb1829ad31ead1b598f177742f956234a2b00499eeacd3b44b1927d9f75274f240793f22a748126df55
 AUX tkimg-1.4.20100510-boolean.patch 373 SHA256 b68d29f6396bda665c5b11996a9f4c3b8295059a876ed7499509c6460e06fb97 SHA512 a8c99184ba88bffc60050dcaf8ec7ac28b7b0da44aaa3943ec4cf3bd501a2a4864d901a41c08b2931d05fc73152449feb37dec03ae97185849ff4200a411ff80 WHIRLPOOL 431b18927f64c43499acac22b765e97ca321bf9430c7e96ee2587758dcf753a659735683930cb34b193aec577ae5126c65219dab9a8c1721b54a195b511c79e3
 AUX tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch 6257 SHA256 b8b6eb2b2fe94fcb18fda0dd8d690abe963fd4e1422488942e8e9f770cafe718 SHA512 aaf5eb451b3363793f1176613480c36d5404d9e7ffd2b694ddf7e7e068936880bb9b9b6a6b7deee2339bd98651abccc62da771de1374d19b692bf30faac0aa4a WHIRLPOOL afe28fe601530debbed659d34dcb82791a78d95d1672ff7d4730cbfafa5c58c8223e57339865ef32bcaf180435f3a001ab860af56254a035829036429650b442
 AUX tkimg-1.5_pre324-unbundle.patch 9950 SHA256 6a83f1490ab55635cdf9d48255ad7a2910914b908ca164645afa0ed02c90a1f3 SHA512 206794f7a6c6dbdffc2232499324bdd476f82ffa3aec2f006f5e73838695317d7aef2d70a111da9149c694a287d831cac252fccd4742475463df492280a3b623 WHIRLPOOL 34949af1a30ce3b506c1b79fcc0205ccc4c9d915e7bef0a1a3b3c8fa2f5f7cd296105051587e62c8f792f18e57b41f5b199b3e7a4bf6dc4c79e2aea97de4cea7
@@ -13,13 +14,14 @@ DIST tkimg1.4.tar.bz2 4912894 SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3a
 EBUILD tkimg-1.4-r4.ebuild 1718 SHA256 e650108e5fadc116b930f834e8002f5569a11fcdb3bf43ff90cc62595c985e56 SHA512 a8785da62264be314e34242d4ab9f4ea72cb3a24cfe700cdaae70165c5cce7256340cf3487b3678961532ec8566084f3d3851ee962d07e4a648b98c5b21953cf WHIRLPOOL 90ce2afbc875b1e58d92ea4b17b9b2f0878fa84cd3d4a9a8aa3fee2c68f960d949691e2b384f0bab98e99e661814a45c9ab6b57e53f5c8df61c4d4b87714ce41
 EBUILD tkimg-1.4-r5.ebuild 1769 SHA256 e033b9aa2b04338af48e12bd0f5ac29d8e6ff3cc8e34b3b7231a3381280fbe9f SHA512 6d88ac0d422bf036747b258f2c1d3bd892859cfec5acd9fe14408c5d91bad2bbeaf5f4e496f2d9b287ec0abfa15f2e89be8379583e5e23b975a3c4745975ce27 WHIRLPOOL 03e2c53fa77a9d2eb5823db51d45cf98b4a1d48faa13abb58b10c91f2dbd12d2792598b3e5f0092c61d5d3e29c6bf9fd06e82235f6ac81642a59839d6e124bd4
 EBUILD tkimg-1.4-r6.ebuild 1801 SHA256 8697cd8faedae20dba99c1fb64aa5f29cfd565f4b7dd7417e4d1c601c5832bd7 SHA512 0ae38fa856164a184fbe2681b65d87d4720ad225e4df1773ce245a69f80abb48343f38e7a0c2699f3df6b1c1b5501fdb0a6a69ffea73b76de2696b64ee81c30f WHIRLPOOL 8436c9520176e65c3cce499b64e02c384307055781a95e9f7481f4c1a0ce901ea72f6755cac9f19ce61aa71e1278932f8a23be8ae30433884da4eeb521cc11b2
-MISC ChangeLog 8503 SHA256 9262edfb8786df16a072e585fb925a1d099d380693c488e23a5c8890d7d4244e SHA512 0916379f90e95cb3edb3bd2ae5f66afe1d1d05474496678e9be9469882988fb04be3c09e751e437432830b7497717820f4fbe790b210ab2312cc107e863a8c6a WHIRLPOOL 64816e759dcfe87015d511250ac2b5969a901dffaebd979a26ee95d5f1c56c08e0027c3d8e07aca43256bb6043df31a12b48827d49b69eb3e20852bdda3c6268
+EBUILD tkimg-1.4-r7.ebuild 1849 SHA256 a72fc38ca19b232363e2d8ef0a04686f4cf8e44a203ab7b2b7245f7d5958fc9a SHA512 5d7acd1a42ad8af6fc07530d7920bdfdd0a4d37eca4581dd7b1ea3e62b46048b199a3e9ccbd3c922f36eff4a7727b522e9e4da2c139f14f4675689860fcb440f WHIRLPOOL cb00754c6897de0100f8e688f660a9d140a32ea53b9257df3fa8b3af18dbbc4f93227e1bffbb8a8bd1e5385dbce7f8bd26e54cc2007e476ecc75031cd3066ce4
+MISC ChangeLog 8684 SHA256 03a664a0018ebb422988b26c60fc870b2fc3e5291626112151db50a2f57dc66a SHA512 f212c05cc8334860c7b989b8fd435a7be9fbeb57fa8c2085c72320b61d252fceff79e721db228f803b3440171eb7eef497fec34a9b616d983b9ac41564dce9e3 WHIRLPOOL 8a5cdcf0ea264647b027a5ab335c5810151211a033bc3dc4bea6ae339eb48c097d06b15795e6928ba8e1686d8ec87c99ffd9577f3159d05e28bf352e6dfea9db
 MISC metadata.xml 266 SHA256 fe07b2bee63764c9cb9e3aaeac927f511dd11d3ff45e40021def110ac46cebbe SHA512 5c39d5e104372129a084cdeb01a4e83c6c38892336deacb42e67a5cbfa7d16fd7b0d91409efcbcbccefdddb49b77b380ad8720335f126f3b592c0e99e1e2ba8e WHIRLPOOL 6ee7f4e916fb5ae931ca42d910e3e5c3055f87d98e1bcb92c64587788a95b200c3688e345e43918b6c5383185ef9f0860ef5174f3b344f4f13e8de91d24c3344
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAk/4Qj8ACgkQgAnW8HDreRaxoQCfZFcZOwR6aXx+rW6dq1rNAEE4
-AQYAn0XFi9iKnTbpaOj+R99TV1EDQl3M
-=jPxF
+iEYEAREIAAYFAlBv/qYACgkQgAnW8HDreRYm3ACfUG+mCfmwPXp8f5aUGRjKpZYD
+bfgAn2nUt8tePHBdcFUOgy6k5fJwEVAs
+=ZW9F
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch b/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch
new file mode 100644
index 000000000000..1b9ce158ca73
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4-zlib127-gzgetc_fix.patch
@@ -0,0 +1,44 @@
+diff -up tkimg1.4/zlib/zlibtcl.decls.gzgetc_fix tkimg1.4/zlib/zlibtcl.decls
+--- tkimg1.4/zlib/zlibtcl.decls.gzgetc_fix	2012-07-31 14:54:11.104302862 -0400
++++ tkimg1.4/zlib/zlibtcl.decls	2012-07-31 14:54:24.846303790 -0400
+@@ -138,7 +138,7 @@ declare 38 {
+     int gzputc(gzFile file, int c)
+ }
+ declare 39 {
+-    int gzgetc(gzFile file)
++    int gzgetc_(gzFile file)
+ }
+ declare 40 {
+     int gzflush(gzFile file, int flush)
+diff -up tkimg1.4/zlib/zlibtclDecls.h.gzgetc_fix tkimg1.4/zlib/zlibtclDecls.h
+--- tkimg1.4/zlib/zlibtclDecls.h.gzgetc_fix	2012-07-31 14:55:12.754307116 -0400
++++ tkimg1.4/zlib/zlibtclDecls.h	2012-07-31 14:55:17.520307957 -0400
+@@ -120,7 +120,7 @@ ZEXTERN char *		gzgets(gzFile file, char
+ /* 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 */
+@@ -179,7 +179,7 @@ typedef struct ZlibtclStubs {
+     int (*gzputsPtr) (gzFile file, const char *s); /* 36 */
+     char * (*gzgetsPtr) (gzFile file, char *buf, int len); /* 37 */
+     int (*gzputcPtr) (gzFile file, int c); /* 38 */
+-    int (*gzgetcPtr) (gzFile file); /* 39 */
++    int (*gzgetc_Ptr) (gzFile file); /* 39 */
+     int (*gzflushPtr) (gzFile file, int flush); /* 40 */
+     z_off_t (*gzseekPtr) (gzFile file, z_off_t offset, int whence); /* 41 */
+     int (*gzrewindPtr) (gzFile file); /* 42 */
+@@ -273,8 +273,8 @@ ZEXTERN const ZlibtclStubs *zlibtclStubs
+ 	(zlibtclStubsPtr->gzgetsPtr) /* 37 */
+ #define gzputc \
+ 	(zlibtclStubsPtr->gzputcPtr) /* 38 */
+-#define gzgetc \
+-	(zlibtclStubsPtr->gzgetcPtr) /* 39 */
++#define gzgetc_ \
++	(zlibtclStubsPtr->gzgetc_Ptr) /* 39 */
+ #define gzflush \
+ 	(zlibtclStubsPtr->gzflushPtr) /* 40 */
+ #define gzseek \
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r7.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r7.ebuild
new file mode 100644
index 000000000000..43f24b1d9841
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4-r7.ebuild
@@ -0,0 +1,87 @@
+# 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-r7.ebuild,v 1.1 2012/10/06 09:49:18 jlec Exp $
+
+EAPI=4
+
+VIRTUALX_USE=test
+
+inherit eutils multilib 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="~amd64 ~ppc ~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.7
+	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 \
+		"${FILESDIR}"/${P}-libtiff.patch \
+		"${FILESDIR}"/${P}-libtiff4.patch \
+		"${FILESDIR}"/${P}-zlib127-gzgetc_fix.patch
+
+	find compat/{libjpeg,libpng,zlib,libtiff} -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
+
+	# 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
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/*
+	fi
+}