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 | 4d599f52e7c17553f6fc9c532f3087167c696428 (patch) | |
| tree | 2c902f819f0ba00176230936e96d0e52b7b478df /dev-tcltk | |
| parent | Drop unused entries (diff) | |
| download | historical-4d599f52e7c17553f6fc9c532f3087167c696428.tar.gz historical-4d599f52e7c17553f6fc9c532f3087167c696428.tar.bz2 historical-4d599f52e7c17553f6fc9c532f3087167c696428.zip | |
Fix double declaration of BOOLEAN, #359241; thanks Dennis Yxun
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'dev-tcltk')
| -rw-r--r-- | dev-tcltk/tkimg/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-tcltk/tkimg/Manifest | 15 | ||||
| -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 |
4 files changed, 35 insertions, 5 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/Manifest b/dev-tcltk/tkimg/Manifest index f1f0f75d7dbd..6c0a220d798a 100644 --- a/dev-tcltk/tkimg/Manifest +++ b/dev-tcltk/tkimg/Manifest @@ -1,7 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX tkimg-1.4.20100510-boolean.patch 373 RMD160 ff69fb2a48110947f38e30a0fe01c8827628bef8 SHA1 e9b12c418d87e7933fa64f6b183ec8802a1c9b37 SHA256 b68d29f6396bda665c5b11996a9f4c3b8295059a876ed7499509c6460e06fb97 AUX tkimg-1.4.20100510-gentoo.patch 7306 RMD160 3f985a98b8cdbf8c485e573aff42b9ee6a94c271 SHA1 4d590b309fa19ebf73a0e377ab4a7ebfda34309e SHA256 d85a72bc293c8b2abe15381edba28ad29649a72bf2fa647f11ff8a1db583df40 DIST tkimg-1.4.20100510.tar.bz2 4625881 RMD160 3d5a6e4186afd4487333e6b069a756810560147d SHA1 42befa7cf86c5c6271fe86bdbad2f0e0953acee1 SHA256 74b60431d6ae3767132d7f334af1a208b978d99e7b2710db84dc3da95b5ff0ae DIST tkimg1.4.tar.bz2 4912894 RMD160 a05adf3e911ce7ab9304bddd89cf53c55c27b8fc SHA1 aa519474e3eb9640977a0ea7c61da6ba5129220b SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3ab87379fb69b473e73e3b1 -EBUILD tkimg-1.4.20100510.ebuild 1467 RMD160 d79339ee18bd50e2f76c84f46d38936a667349ac SHA1 dbab98c3dd3e648945b460d56f2c7d014d5b1de5 SHA256 cb644447d4993d96a8e33d5092c7b02eca5b576119f0e7a27b1c969418478c7a +EBUILD tkimg-1.4.20100510.ebuild 1506 RMD160 0184d6498a21e7104b363cb60703563c53151bb5 SHA1 371913f903a640baa54f31477b19ddd4b2835f0c SHA256 bcb6c37a97257dd40da7f54d359739a44e6a452f3066dcc097cd65afd4c45234 EBUILD tkimg-1.4.ebuild 1298 RMD160 eefebb2c67c9d2b74ae82d82513c6d21d55ed09c SHA1 a2a586fdb929c59c88d11083df4f475cfbb9eee3 SHA256 46aa3e640fc99c8ccaec4509e6228aa0482baf078a6b5c49521f398621b83e5e -MISC ChangeLog 4023 RMD160 5be3095e6caa28273ffd3daca06bf143a2f9383e SHA1 f8253eeaf59ebc79299ef4b6b6a183d805d6fd88 SHA256 56a650fe0ba8c09a78e7e24203918b8c31b8874f4115be23b0bf9562b7ee35aa +MISC ChangeLog 4203 RMD160 1a3fa3bab19f58602444ffeddd7da9e1e68785b5 SHA1 0c7d9d567ba0f194a40d47218b2e87bc4201c0b1 SHA256 90046b9a0831457ef88d201a4225aeea0c6ed59fa59632cfacec8b68e78f8668 MISC metadata.xml 264 RMD160 88eefa6a63d6a9ace7296b7763a3092a3ff38c89 SHA1 8a84ccda465fb091c6f9479519989ca166b01c9c SHA256 a4b1985ffd3154ede13b4ed78675505c5b20e11a9452c1a2676b100b31158a7c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2PceAACgkQgAnW8HDreRb+GQCgrJCD/aodTMRCS+2t+NxauPgW +dWoAn1+fvzS2vqPQS6zbM5gLGcSEx4jb +=0bYc +-----END PGP SIGNATURE----- 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 \ |