Added patch for disabled jbig in bundled tiff, 356907; thanks Jesper Saxtorph for the patch; Probably also fixes 343525

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

3 files changed, 92 insertions, 1 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 1aa227ca2c8b..2abdf0624a4f 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.25 2011/07/13 07:25:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.26 2011/07/21 18:51:14 jlec Exp $
+
+*tkimg-1.4-r1 (21 Jul 2011)
+
+  21 Jul 2011; Justin Lecher <jlec@gentoo.org> +tkimg-1.4-r1.ebuild,
+  +files/tkimg-1.4-nojbig.patch:
+  Added patch for disabled jbig in bundled tiff, 356907; thanks Jesper Saxtorph
+  for the patch; Probably also fixes 343525
 
 *tkimg-1.5_pre324-r1 (13 Jul 2011)
 *tkimg-1.5_pre324 (13 Jul 2011)
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-nojbig.patch b/dev-tcltk/tkimg/files/tkimg-1.4-nojbig.patch
new file mode 100644
index 000000000000..8ac8969cdcd0
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4-nojbig.patch
@@ -0,0 +1,22 @@
+--- tkimg1.4/libtiff/configure.in	2010-07-06 15:48:46.000000000 +0200
++++ tkimg1.4.new/libtiff/configure.in	2011-02-28 23:24:18.471259943 +0100
+@@ -67,7 +67,7 @@
+ else
+     TIFFHOST="$host"
+ fi
+-${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
++${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
+ 	"--with-CC=$TIFFCC" $TIFFHOST
+ mv -f tifftcl_confdefs.h confdefs.h
+ 
+--- tkimg1.4/libtiff/configure	2010-07-07 10:09:46.000000000 +0200
++++ tkimg1.4.new/libtiff/configure	2011-02-28 23:25:53.529824614 +0100
+@@ -5133,7 +5133,7 @@
+ else
+     TIFFHOST="$host"
+ fi
+-${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
++${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
+ 	"--with-CC=$TIFFCC" $TIFFHOST
+ mv -f tifftcl_confdefs.h confdefs.h
+ 
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild
new file mode 100644
index 000000000000..71aefff20170
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild,v 1.1 2011/07/21 18:51:14 jlec Exp $
+
+EAPI=3
+
+VIRTUALX_USE=test
+
+inherit eutils virtualx autotools
+
+MYP="${PN}${PV}"
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/"
+SRC_URI="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/libpng-1.4
+	virtual/jpeg
+	media-libs/tiff"
+DEPEND="${RDEPEND}
+	test? (
+		x11-apps/xhost
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nojbig.patch
+}
+
+src_test() {
+	Xmake test || die "Xmake failed"
+}
+
+src_install() {
+	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
+}