From 63691f07314fc619d597a7d00e8c7fd6bdf02d12 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 28 Jan 2014 21:19:00 +0000
Subject: Restore boolean workaround. Bump PKGREVISION. Addresses PR 48556.

---
 graphics/jpeg/Makefile                 |  3 ++-
 graphics/jpeg/distinfo                 |  3 ++-
 graphics/jpeg/patches/patch-jmorecfg.h | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 graphics/jpeg/patches/patch-jmorecfg.h

(limited to 'graphics/jpeg')

diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index ab7c5b0d24b..4a66713aea0 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2014/01/27 20:12:05 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2014/01/28 21:19:00 wiz Exp $
 
 DISTNAME=	jpegsrc.v9a
 PKGNAME=	${DISTNAME:S/src.v/-/}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ijg.org/files/
 
diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo
index eb13f4a4f61..b65c57d769d 100644
--- a/graphics/jpeg/distinfo
+++ b/graphics/jpeg/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.18 2014/01/27 20:12:05 wiz Exp $
+$NetBSD: distinfo,v 1.19 2014/01/28 21:19:00 wiz Exp $
 
 SHA1 (jpegsrc.v9a.tar.gz) = d65ed6f88d318f7380a3a5f75d578744e732daca
 RMD160 (jpegsrc.v9a.tar.gz) = 885898b3db086ad3b65169d0149bf1f270dff1b5
 Size (jpegsrc.v9a.tar.gz) = 1000034 bytes
 SHA1 (patch-af) = aba44e1e3520d2a232f6bd949a82c150e0b3e0f4
 SHA1 (patch-ag) = 4fc698186d149f1152d30bf65a96461bc331c812
+SHA1 (patch-jmorecfg.h) = c00f81ba94e2ad6b55ca9892553eedbe4eca3ad1
 SHA1 (patch-jpeglib.h) = 635453c5a2b1223ef5af729edcbfcfa3ed78a8b5
diff --git a/graphics/jpeg/patches/patch-jmorecfg.h b/graphics/jpeg/patches/patch-jmorecfg.h
new file mode 100644
index 00000000000..b588b2fac13
--- /dev/null
+++ b/graphics/jpeg/patches/patch-jmorecfg.h
@@ -0,0 +1,28 @@
+$NetBSD: patch-jmorecfg.h,v 1.3 2014/01/28 21:19:00 wiz Exp $
+
+Fix problem with booleans by reverting to the old definition.
+
+--- jmorecfg.h.orig	2013-09-17 07:20:20.000000000 +0000
++++ jmorecfg.h
+@@ -303,19 +303,14 @@ typedef void noreturn_t;
+  * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
+  */
+ 
+-#ifndef HAVE_BOOLEAN
+-#if defined FALSE || defined TRUE || defined QGLOBAL_H
+-/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */
+-typedef int boolean;
+ #ifndef FALSE			/* in case these macros already exist */
+ #define FALSE	0		/* values of boolean */
+ #endif
+ #ifndef TRUE
+ #define TRUE	1
+ #endif
+-#else
+-typedef enum { FALSE = 0, TRUE = 1 } boolean;
+-#endif
++#ifndef HAVE_BOOLEAN
++typedef int boolean;
+ #endif
+ 
+ 
-- 
cgit v1.2.3