summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-02-07 23:35:15 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-02-10 13:45:12 +0100
commit9a70af76fe322c95aa102aa684f9d49281513c29 (patch)
treebb1092ad77278d3f04fa0f1952adc323e105dd63 /dev-tcltk
parentdev-libs/leatherman: Revert "dev-libs/leatherman: Drop to ~hppa" (diff)
downloadgentoo-9a70af76fe322c95aa102aa684f9d49281513c29.tar.gz
gentoo-9a70af76fe322c95aa102aa684f9d49281513c29.tar.bz2
gentoo-9a70af76fe322c95aa102aa684f9d49281513c29.zip
dev-tcltk/tkimg: Fix build with jpeg-9
Closes: https://bugs.gentoo.org/520886 Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-tcltk')
-rw-r--r--dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch18
-rw-r--r--dev-tcltk/tkimg/tkimg-1.4-r9.ebuild3
2 files changed, 20 insertions, 1 deletions
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 000000000000..23000ac7922c
--- /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 9b621a465ef7..155c4483e327 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 \