diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-12-01 08:23:21 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-12-01 08:23:21 +0000 |
| commit | 5b57c6de8d1b590293055e1cc9ae0d5455f5108d (patch) | |
| tree | 471bde5c5f6f26552fa91475f3cd86e463b1e49e /dev-tcltk | |
| parent | New pretest version. (diff) | |
| download | gentoo-2-5b57c6de8d1b590293055e1cc9ae0d5455f5108d.tar.gz gentoo-2-5b57c6de8d1b590293055e1cc9ae0d5455f5108d.tar.bz2 gentoo-2-5b57c6de8d1b590293055e1cc9ae0d5455f5108d.zip | |
Remove automagic detection of jbig present on the system, #392675
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'dev-tcltk')
| -rw-r--r-- | dev-tcltk/tkimg/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch | 22 | ||||
| -rw-r--r-- | dev-tcltk/tkimg/tkimg-1.4-r4.ebuild | 6 |
3 files changed, 31 insertions, 3 deletions
diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog index 7dc2922c3454..4307bd9228c4 100644 --- a/dev-tcltk/tkimg/ChangeLog +++ b/dev-tcltk/tkimg/ChangeLog @@ -1,6 +1,10 @@ # 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.40 2011/11/20 11:08:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.41 2011/12/01 08:23:21 jlec Exp $ + + 01 Dec 2011; Justin Lecher <jlec@gentoo.org> tkimg-1.4-r4.ebuild, + +files/tkimg-1.4-jbig.patch: + Remove automagic detection of jbig present on the system, #392675 *tkimg-1.4-r4 (20 Nov 2011) diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch b/dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch new file mode 100644 index 000000000000..4f7ebc42e0f6 --- /dev/null +++ b/dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch @@ -0,0 +1,22 @@ +--- tkimg1.4/libtiff/configure.in 2010-07-06 15:48:46.000000000 +0200 ++++ tkimg1.4/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/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-r4.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild index 3b3deda1bd08..3ef4ad0f8366 100644 --- a/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild +++ b/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild @@ -1,6 +1,6 @@ # 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-r4.ebuild,v 1.1 2011/11/20 11:08:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild,v 1.2 2011/12/01 08:23:21 jlec Exp $ EAPI=3 @@ -40,7 +40,9 @@ RESTRICT="test" S="${WORKDIR}/${MYP}" src_prepare() { - epatch "${WORKDIR}"/${P}-gentoo+bundled-tiff.patch + epatch \ + "${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \ + "${FILESDIR}"/${P}-jbig.patch find compat/{libjpeg,libpng,zlib} -delete sed \ -e 's:-O2 -fomit-frame-pointer::g' \ |