[gentoo-commits] repo/gentoo:master commit in: media-libs/libmng/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmng/files/

[David Seifert]

commit:     92a96376e1c419e60b6d42ff290dd20a74e6c3d6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 14:57:24 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 16:45:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a96376

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 <AT> gentoo.org>

 media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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 9441f00137d..459b42e7db7 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>