Remove old kludge for jpeg-9 which is now unnecessary for jpeg-9a wrt #520906 by Diego Elio Pettenò

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 49 insertions, 3 deletions

diff --git a/media-libs/libmng/ChangeLog b/media-libs/libmng/ChangeLog
index fb6a12a51216..5e3769ef375b 100644
--- a/media-libs/libmng/ChangeLog
+++ b/media-libs/libmng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmng
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.98 2014/08/28 15:44:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.99 2014/08/29 04:24:38 ssuominen Exp $
+
+  29 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/libmng-2.0.2-jpeg-9a.patch, libmng-2.0.2-r1.ebuild:
+  Remove old kludge for jpeg-9 which is now unnecessary for jpeg-9a wrt #520906
+  by Diego Elio Pettenò
 
   28 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> -libmng-1.0.10-r1.ebuild,
   -libmng-1.0.10-r2.ebuild, -libmng-2.0.2.ebuild:
diff --git a/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch b/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch
new file mode 100644
index 000000000000..adb12c2d4a7f
--- /dev/null
+++ b/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/520906
+
+This kludge is unnecessary with jpeg-9a and is in fact breaking the build...
+
+libmng_jpeg.c:108:10: error: 'FALSE' undeclared (first use in this function)
+libmng_jpeg.c:536:48: error: 'TRUE' undeclared (first use in this function)
+libmng_jpeg_c:890:49: error: 'TRUE' undeclared (first use in this function)
+
+...because jmorecfg.h of jpeg-9a has this:
+
+#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
+#endif
+
+--- libmng_types.h
++++ libmng_types.h
+@@ -199,11 +199,6 @@
+ #undef FAR                             /* possibly defined by zlib or lcms */
+ #endif
+ #define JPEG_INTERNAL_OPTIONS          /* for RGB_PIXELSIZE */
+-/* There has been a change in jpeg-9 : */
+-#ifndef _WIN32
+-#define HAVE_BOOLEAN
+-typedef int boolean;
+-#endif
+ #include <stdio.h>
+ #include <jpeglib.h>
+ #endif /* MNG_INCLUDE_IJG6B */
diff --git a/media-libs/libmng/libmng-2.0.2-r1.ebuild b/media-libs/libmng/libmng-2.0.2-r1.ebuild
index 63fe6b43df25..38d230ada319 100644
--- a/media-libs/libmng/libmng-2.0.2-r1.ebuild
+++ b/media-libs/libmng/libmng-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-2.0.2-r1.ebuild,v 1.12 2014/08/28 15:43:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-2.0.2-r1.ebuild,v 1.13 2014/08/29 04:24:38 ssuominen Exp $
 
 EAPI=5
 inherit eutils autotools-multilib
@@ -22,7 +22,9 @@ RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-stdio.patch
+	epatch \
+		"${FILESDIR}"/${P}-stdio.patch \
+		"${FILESDIR}"/${P}-jpeg-9a.patch
 	emake distclean
 	autotools-multilib_src_prepare
 }