summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-08-29 20:31:03 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-08-29 20:31:03 +0000
commit34b020bd88da4bab8deadbcba6293decd3f28a37 (patch)
treefe206253ce458d58f547aa85e55006658968c727 /media-libs
parentReplace einstall by emake. Remove unnecessary die statement. (diff)
downloadgentoo-2-34b020bd88da4bab8deadbcba6293decd3f28a37.tar.gz
gentoo-2-34b020bd88da4bab8deadbcba6293decd3f28a37.tar.bz2
gentoo-2-34b020bd88da4bab8deadbcba6293decd3f28a37.zip
fixed error against giflib-4.2.3, bug 521402
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/ming/ChangeLog6
-rw-r--r--media-libs/ming/files/ming-0.4.5-gif-error.patch20
-rw-r--r--media-libs/ming/ming-0.4.5.ebuild3
3 files changed, 27 insertions, 2 deletions
diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index adc7ceb0efd3..8a4ce2ff3548 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/ming
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.105 2014/08/27 19:59:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.106 2014/08/29 20:31:03 axs Exp $
+
+ 29 Aug 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+ +files/ming-0.4.5-gif-error.patch, ming-0.4.5.ebuild:
+ fixed error against giflib-4.2.3, bug 521402
*ming-0.4.5 (27 Aug 2014)
diff --git a/media-libs/ming/files/ming-0.4.5-gif-error.patch b/media-libs/ming/files/ming-0.4.5-gif-error.patch
new file mode 100644
index 000000000000..1d76b23f4301
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.5-gif-error.patch
@@ -0,0 +1,20 @@
+--- a/ming-0.4.5/src/libming.h 2013-06-08 10:08:51.000000000 -0400
++++ b/ming-0.4.5/src/libming.h 2014-08-29 16:26:57.874643312 -0400
+@@ -76,11 +76,16 @@
+ #include <unistd.h>
+ #endif
+
+-#if GIFLIB_GIFERRORSTRING
++#ifdef HAVE_GIF_LIB_H
++#include <gif_lib.h>
+ static void
+ PrintGifError(void)
+ {
++#if GIFLIB_GIFERRORSTRING
+ fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString());
++#else
++ fprintf(stderr, "\nGIF-LIB error but no GifErrorString support.\n");
++#endif
+ }
+ #endif
+
diff --git a/media-libs/ming/ming-0.4.5.ebuild b/media-libs/ming/ming-0.4.5.ebuild
index f21cc64d7fdb..5ab3eddc2a5a 100644
--- a/media-libs/ming/ming-0.4.5.ebuild
+++ b/media-libs/ming/ming-0.4.5.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/ming/ming-0.4.5.ebuild,v 1.1 2014/08/27 19:59:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.5.ebuild,v 1.2 2014/08/29 20:31:03 axs Exp $
EAPI=5
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
virtual/yacc"
S=${WORKDIR}/${P/_/.}
+PATCHES=( "${FILESDIR}"/${P}-gif-error.patch )
# Tests only work when the package is tested on a system
# which does not presently have any version of ming installed.