commit: 9a70af76fe322c95aa102aa684f9d49281513c29 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 7 22:35:15 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Feb 10 12:45:12 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a70af76
dev-tcltk/tkimg: Fix build with jpeg-9 Closes: https://bugs.gentoo.org/520886 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch | 18 ++++++++++++++++++ dev-tcltk/tkimg/tkimg-1.4-r9.ebuild | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch new file mode 100644 index 00000000000..23000ac7922 --- /dev/null +++ b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch @@ -0,0 +1,18 @@ +Fix build with jpeg-9, bug #520886 + +--- a/jpeg/jpeg.c 2010-06-17 15:40:24.000000000 +0200 ++++ b/jpeg/jpeg.c 2018-02-07 23:26:38.050073397 +0100 +@@ -53,6 +53,13 @@ + */ + + #include "tkimg.h" ++#ifndef FALSE ++#define FALSE 0 ++#endif ++#ifndef TRUE ++#define TRUE 1 ++#endif ++#define HAVE_BOOLEAN + #include "jpegtcl.h" + + static int SetupJPegLibrary(Tcl_Interp *interp); diff --git a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild index 9b621a465ef..155c4483e32 100644 --- a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild +++ b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -40,6 +40,7 @@ S="${WORKDIR}/${MYP}" src_prepare() { epatch \ "${WORKDIR}"/${P}-jpeg.patch \ + "${FILESDIR}"/${P}-jpeg-9.patch \ "${WORKDIR}"/${P}-tiff.patch \ "${WORKDIR}"/${P}-png.patch \ "${FILESDIR}"/${P}-png2.patch \
