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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 59 insertions, 12 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/Manifest b/media-libs/libmng/Manifest
index 71da33b73f3c..2a29c18c8802 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libmng-2.0.2-jpeg-9a.patch 1183 SHA256 743504ea59784305b30597c0350dd5b506ac2ecae6915080fdd3c14255648517 SHA512 f8c3b7296b046b5fdb6ef03b06f83a8d2034fb405c7fa8f61ebe06e71722bc6961ba09107080e08f0d57669eeab4b1fad70b9bb3fbdced039efa862ca53bc1d0 WHIRLPOOL 0da7edc7ea4e1ac90deffc481075e3aaa9054c0659fe7b4eaf721ba2455f83fb852157564e7d12f52554a00dcb9136ecef412ce18a5e9e52bda40a96990ff888
 AUX libmng-2.0.2-stdio.patch 261 SHA256 88889dfd561ca537e11560506cb4bb63c3c47a700c02647e118900babb3aa707 SHA512 44492809618df0ff3e7a41c55561703ad1331853c8872237b828f767a07236be9630bb3955b4c3c444d9fb80440697b2a52fa99fdbbe2054bc35ca6eba065c06 WHIRLPOOL 476a885470ae3023f0de952190a9670e226d52020f5228a5076b9c28c6a1fcfef2635568b784dad0d742e67cdec9d647f7d13d7dc8c0cf726270acb9fba0cdef
 DIST libmng-2.0.2.tar.xz 951844 SHA256 278c04c781e5a679c91df006fee7e71233e6f15557aef513a19fe49cd650bc50 SHA512 76ff107df43297837e075a4b57dac75ece501a57060884720a22518d9514ad0af64d69d22fe12a92d3bce3e50ae8ca3c8081680535743d2bde9ae9fa11e32687 WHIRLPOOL 33d18313d8d317ae299f45c97944f6c6074e0c6fbe16f84950a4b6315235bdb382c4dfd1abec3071ee9b548b357fe63a7ee1697a5461df2a9c38d1fdef085634
-EBUILD libmng-2.0.2-r1.ebuild 1389 SHA256 2e5469de01ae3ddc0fe7c3798b4828b956b5ab648e9e1a669e3899445a3af937 SHA512 86cfb2a92304dd8f4a3152308c0c86580d52478117c454a0678f077c808428d941a6b6944cc911454d9a24be5ae044341d3bc66580efc5266055da2f3c20e8e3 WHIRLPOOL f8081d9c91cc4b2eadc66b55fcdb8623c9b705d9f3b5b19a402bbb0a8b3a6453427526501d5e3553897caac35161a0d53474ae28aee3741b2ca580704177caee
-MISC ChangeLog 12997 SHA256 34070deeb44ea954df372150140c73af72ad5596536b7a90f30c9c13aa6eb959 SHA512 1516a3f55bcc133349089762a19dde8b1dfff58204ee7d24294cba30fffb02eceeab0c020afc2f8b5a85266b8ba13241fa48e0e9fb653ca45e2c3759c187b3cd WHIRLPOOL 33a5f8a199310d07b3ce09cf488f540e14283b4faffb7fce2d208ae2235730e9c2999e22e89047a219572b6a5290900b95129dfb057d5bc73fa5d161409afd73
+EBUILD libmng-2.0.2-r1.ebuild 1430 SHA256 dc3c9945214a1159cc8f2bf643f245f9bb7203f5f3a6bae3172eda71787de6c1 SHA512 ee1642f69cff3bc9c68dc32dc03deb450fde2c6d623ac628c774dd700e14cb5e70fd56352889d7d491653ca45f9c2d428640740bcffabd42a880f90e414ff8ca WHIRLPOOL 10c6aaebb9dae790d7657514291ca2015edc9003ccc4942e36c1fb5ac967fc78d5f701afc57bb56bf6620ad323ffd0206adc3988c00232103d6c9634e6abfd8e
+MISC ChangeLog 13218 SHA256 f56f8df1894cad80ea34e547ad41e9c2cd2c9a0715ecb93be6315ceb76a138b8 SHA512 7f30bf6d3883e1fe0906d26b4fb06609e1ee293aa82ea00acb84a87cf096854808fcc81d2d672fd57335efff48f99dc3511b472641957d6d5f519685c4e91f0c WHIRLPOOL 2bb8fd007e3944c07e9e9c30d49b7514ee1a757ec39f2a3dcba841746a12c11aedbb7b3791492174095e761b47070947bb0edb97fac993c9c0798082377215fc
 MISC metadata.xml 161 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 SHA512 425caf0160f1410ce7bf1d4639020be7f6335152c339edbce80676bff4166f1cab3ae9e13161c47b98dc00741dab3bfa45e9572a3314844476e480f5c2b58d7d WHIRLPOOL ad7cdd3352dbc12cb4181fb5d63b5aee5ce3a151b975c12a96c4a5c91f751736d27282ad22633c7e768230266bce5d17947735d33ef5c5c2341c3f9435b9ebb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT/026AAoJEEdUh39IaPFNkF8H/RPSoxvRwVutUPEri/nkI5E7
-d33guHEYsN6JnjHzHmDmlbg1I96t8G807Oq1KDUs9vN71NIyVBkFAX8kZ0/svxTA
-vfqxu23fWWYLiX4ujJkHZAF9eCK1fMAfpwaurZyRz8Id1f20J4gqNB26ItTzW8rf
-J4mwLbtEYaQPeXNYXmjory3kx3wKIKX+Maz1zkEDXWWwqwGY4/s64FechQPCVFpZ
-jAezcHflomq33hMw5T+jdyD9Eo/eGS5FjVRkArCSa7eUFyobahLkt3MQPY0lavZm
-XvrrSzCPFiBz0/krlwP/+k2f2Qu0B3MvaJi2ARwV2U0djybXa2MeKfPYJ0brkqg=
-=QsIi
+iQEcBAEBCAAGBQJT///yAAoJEEdUh39IaPFNm+oH/AuFkEWtfAnaRn6hwx1mPhKt
+znf5c7P8l0p/x19Pv21OxMTzGFHbA69BfdDaz/5xjudr4ftJgRNAoJLWQNxSLcYQ
+/1kzU7WO4SSCgs07q6Lnzl5G6f5XvXGFWVw6ydqoPnPw8Wgc/n6An3H7QPpq+jwB
+IZxhw0AuxRGJtAdwXjum0NONPk0KkaUIFpNg9oZ8BzIJp7NGn1UfFUGMDL4Kxg5R
+pt8G3dvr2rLW2RQwFL3e5VI56qk6mYbLq8WTY3biJQ/dHvWuVD3u53sjDf2couHz
+Yu1/MeME2yovhVLAA4M7QoigZwg9cgflANQIrOJfWRgD5Mwl6N3A1tDrpp+n9zA=
+=pc9Q
 -----END PGP SIGNATURE-----
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
 }