diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-10-19 18:10:14 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-10-19 18:10:14 +0000 |
| commit | 34ff0d2797d9fefae79a966ad47b8761944c7afe (patch) | |
| tree | 2a92997bc5c453413afe7284f053148d458c7f04 /media-libs | |
| parent | Fix typo reported by buscher on irc. (diff) | |
| download | gentoo-2-34ff0d2797d9fefae79a966ad47b8761944c7afe.tar.gz gentoo-2-34ff0d2797d9fefae79a966ad47b8761944c7afe.tar.bz2 gentoo-2-34ff0d2797d9fefae79a966ad47b8761944c7afe.zip | |
Fix compilation failure with media-libs/giflib-4.2.3, bug 486804.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libafterimage/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libafterimage/files/libafterimage-giflib42.patch | 19 | ||||
| -rw-r--r-- | media-libs/libafterimage/libafterimage-1.20.ebuild | 5 |
3 files changed, 28 insertions, 3 deletions
diff --git a/media-libs/libafterimage/ChangeLog b/media-libs/libafterimage/ChangeLog index 1d53e0eac1a7..6c065716de7a 100644 --- a/media-libs/libafterimage/ChangeLog +++ b/media-libs/libafterimage/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libafterimage # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.44 2013/10/19 14:48:38 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.45 2013/10/19 18:10:14 ulm Exp $ + + 19 Oct 2013; Ulrich Müller <ulm@gentoo.org> libafterimage-1.20.ebuild, + +files/libafterimage-giflib42.patch: + Fix compilation failure with media-libs/giflib-4.2.3, bug 486804. Thanks to + Andrew Savchenko <bircoph@gmail.com> for providing a patch. 19 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml: Move to maintainer-needed diff --git a/media-libs/libafterimage/files/libafterimage-giflib42.patch b/media-libs/libafterimage/files/libafterimage-giflib42.patch new file mode 100644 index 000000000000..b1b1f7263da1 --- /dev/null +++ b/media-libs/libafterimage/files/libafterimage-giflib42.patch @@ -0,0 +1,19 @@ +Fix build failure with giflib 4.2. +Patch by Andrew Savchenko <bircoph@gmail.com>. +https://bugs.gentoo.org/486804 + +--- libAfterImage-1.20/ungif.h.orig ++++ libAfterImage-1.20/ungif.h +@@ -7,6 +7,12 @@ + extern "C" { + #endif + ++#if (GIFLIB_MAJOR>4) || ((GIFLIB_MAJOR==4) && (GIFLIB_MINOR>=2)) ++static inline void PrintGifError(void) { ++ fprintf(stderr, "%s\n", GifErrorString()); ++} ++#endif ++ + #ifdef __GNUC__ + #define ASIM_PrintGifError() do{ fprintf( stderr, "%s():%d:<%s> ",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(); }while(0) + #else diff --git a/media-libs/libafterimage/libafterimage-1.20.ebuild b/media-libs/libafterimage/libafterimage-1.20.ebuild index 45ecb9107ebd..48cade4f5003 100644 --- a/media-libs/libafterimage/libafterimage-1.20.ebuild +++ b/media-libs/libafterimage/libafterimage-1.20.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.13 2012/05/05 08:02:44 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.14 2013/10/19 18:10:14 ulm Exp $ EAPI=3 inherit eutils autotools @@ -41,6 +41,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-gif.patch # fix for libpng15 compability epatch "${FILESDIR}"/${PN}-libpng15.patch + epatch "${FILESDIR}"/${PN}-giflib42.patch #486804 # remove forced flags sed -i \ -e 's/CFLAGS="-O3"//' \ |