diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-04-15 22:50:10 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-15 22:50:10 +0000 |
| commit | 65b9486117fed903a8a1dce4900f44c8a4d7387e (patch) | |
| tree | 4b59197aaa7a05ef0f70b1b1b23cf5e13f363d52 /x11-libs | |
| parent | Avoid building rpc related code when USE=-rpc #465810 by darwinskernel. (diff) | |
| download | gentoo-2-65b9486117fed903a8a1dce4900f44c8a4d7387e.tar.gz gentoo-2-65b9486117fed903a8a1dce4900f44c8a4d7387e.tar.bz2 gentoo-2-65b9486117fed903a8a1dce4900f44c8a4d7387e.zip | |
Fix missing include string.h in gdk-pixbuf/io-png.c for strcmp, strlen and strncmp (revealed by the libpng16 upgrade) wrt #466034
(Portage version: 2.2.0_alpha172/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/gdk-pixbuf/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch | 18 | ||||
| -rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog index 00032d6e6f09..52188d3a8a55 100644 --- a/x11-libs/gdk-pixbuf/ChangeLog +++ b/x11-libs/gdk-pixbuf/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/gdk-pixbuf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.82 2013/03/28 15:57:58 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.83 2013/04/15 22:50:10 ssuominen Exp $ + + 15 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> gdk-pixbuf-2.28.0.ebuild, + +files/gdk-pixbuf-2.28.0-string_h.patch: + Fix missing include string.h in gdk-pixbuf/io-png.c for strcmp, strlen and + strncmp (revealed by the libpng16 upgrade) wrt #466034 *gdk-pixbuf-2.28.0 (28 Mar 2013) diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch new file mode 100644 index 000000000000..ecb60c512c4d --- /dev/null +++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch @@ -0,0 +1,18 @@ +http://bugs.gentoo.org/466034 + +851:24: warning: implicit declaration of function 'strncmp' [-Wimplicit-function-declaration] +853:32: warning: implicit declaration of function 'strlen' [-Wimplicit-function-declaration] +873:24: warning: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration] +853:46: warning: incompatible implicit declaration of built-in function 'strlen' [enabled by default] +944:58: warning: incompatible implicit declaration of built-in function 'strlen' [enabled by default] + +--- gdk-pixbuf/io-png.c ++++ gdk-pixbuf/io-png.c +@@ -26,6 +26,7 @@ + #include "config.h" + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> /* strcmp, strlen, strncmp */ + #include <png.h> + #include "gdk-pixbuf-private.h" + diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild index 83b786a72bd7..5fc7c267fa23 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild,v 1.1 2013/03/28 15:57:58 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.0.ebuild,v 1.2 2013/04/15 22:50:10 ssuominen Exp $ EAPI="5" inherit eutils gnome.org multilib libtool @@ -33,6 +33,7 @@ RDEPEND="${COMMON_DEPEND} !<x11-libs/gtk+-2.90.4:3" src_prepare() { + epatch "${FILESDIR}"/${P}-string_h.patch #466034 # This will avoid polluting the pkg-config file with versioned libpng, # which is causing problems with libpng14 -> libpng15 upgrade # See upstream bug #667068 |