diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-03-27 17:20:26 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-03-27 17:20:26 +0000 |
| commit | 325884c55d288b19711cfaf39700a660d8077647 (patch) | |
| tree | 8775cd1f759afdb72ecd60ca13be28e3552bfd14 /dev-tcltk/tkimg | |
| parent | Drop unused entries (diff) | |
| download | gentoo-2-325884c55d288b19711cfaf39700a660d8077647.tar.gz gentoo-2-325884c55d288b19711cfaf39700a660d8077647.tar.bz2 gentoo-2-325884c55d288b19711cfaf39700a660d8077647.zip | |
Fix double declaration of BOOLEAN, #359241; thanks Dennis Yxun
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'dev-tcltk/tkimg')
| -rw-r--r-- | dev-tcltk/tkimg/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch | 12 | ||||
| -rw-r--r-- | dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild | 7 |
3 files changed, 22 insertions, 3 deletions
diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog index 2eb80048ff50..abb34bade05f 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.22 2011/02/25 20:50:20 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.23 2011/03/27 17:20:26 jlec Exp $ + + 27 Mar 2011; Justin Lecher <jlec@gentoo.org> tkimg-1.4.20100510.ebuild, + +files/tkimg-1.4.20100510-boolean.patch: + Fix double declaration of BOOLEAN, #359241; thanks Dennis Yxun 25 Feb 2011; Kevin McCarthy <signals@gentoo.org> tkimg-1.4.ebuild, tkimg-1.4.20100510.ebuild: diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch new file mode 100644 index 000000000000..0ac51973a3a6 --- /dev/null +++ b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch @@ -0,0 +1,12 @@ +diff --git a/compat/libjpeg/jmorecfg.h b/compat/libjpeg/jmorecfg.h +index 4196885..d1eb675 100644 +--- a/compat/libjpeg/jmorecfg.h ++++ b/compat/libjpeg/jmorecfg.h +@@ -253,6 +253,7 @@ typedef unsigned int JDIMENSION; + #endif + + #ifndef HAVE_BOOLEAN ++#define HAVE_BOOLEAN + #if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) + typedef unsigned char boolean; + #else diff --git a/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild b/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild index d481386b51c4..d01b1d2489a1 100644 --- a/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild +++ b/dev-tcltk/tkimg/tkimg-1.4.20100510.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.20100510.ebuild,v 1.4 2011/02/25 20:50:20 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild,v 1.5 2011/03/27 17:20:26 jlec Exp $ EAPI="3" @@ -27,7 +27,10 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + epatch \ + "${FILESDIR}"/${P}-gentoo.patch \ + "${FILESDIR}"/${P}-boolean.patch + eprefixify \ libjpeg/jpegtclDecls.h \ libpng/pngtclDecls.h \ |