From: David Seifert <soap@gentoo.org>
Date: Thu, 11 Apr 2019 14:57:24 +0000 (+0200)
Subject: media-libs/libmng: Fix building with media-libs/jpeg
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92a96376e1c419e60b6d42ff290dd20a74e6c3d6;p=gentoo.git

media-libs/libmng: Fix building with media-libs/jpeg

Closes: https://bugs.gentoo.org/665634
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert <soap@gentoo.org>
---

diff --git a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
index 9441f00137d9..459b42e7db72 100644
--- a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
+++ b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
@@ -28,13 +28,17 @@ https://bugs.gentoo.org/578744
 
 --- a/libmng_types.h	2015-04-20 21:17:32.000000000 +0200
 +++ b/libmng_types.h	2018-09-06 22:56:57.153190623 +0200
-@@ -201,9 +201,6 @@
+@@ -200,13 +200,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 : */
+-/* There has been a change in jpeg-9 : */
 -#if !defined(HAVE_BOOLEAN) && !defined(_WIN32)
 -#define HAVE_BOOLEAN
 -#endif
- #ifndef _WIN32
- typedef int boolean;
- #endif
+-#ifndef _WIN32
+-typedef int boolean;
+-#endif
+ /* For jpegsrc.v09a: */
+ #include <stdio.h>
+ #include <jpeglib.h>