diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-11-25 10:24:35 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-11-25 10:24:35 +0000 |
| commit | 7cb6b17eb4a008ac449ae901e0a332b5cc43c5e5 (patch) | |
| tree | b1754bf7d9ea87ebce19cfb6ec0335f5ef17c937 /x11-misc | |
| parent | Fix up Changelog retroactively as 1.2 did not get removed. (diff) | |
| download | gentoo-2-7cb6b17eb4a008ac449ae901e0a332b5cc43c5e5.tar.gz gentoo-2-7cb6b17eb4a008ac449ae901e0a332b5cc43c5e5.tar.bz2 gentoo-2-7cb6b17eb4a008ac449ae901e0a332b5cc43c5e5.zip | |
Explicitely include string.h for memcpy() since libpng16 no longer does it for us.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/fireflies/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch | 15 | ||||
| -rw-r--r-- | x11-misc/fireflies/fireflies-2.07-r1.ebuild | 13 |
3 files changed, 28 insertions, 10 deletions
diff --git a/x11-misc/fireflies/ChangeLog b/x11-misc/fireflies/ChangeLog index 21743e78abd8..583233c1d3a6 100644 --- a/x11-misc/fireflies/ChangeLog +++ b/x11-misc/fireflies/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/fireflies -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.28 2013/01/12 11:46:27 ulm Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.29 2013/11/25 10:24:34 ssuominen Exp $ + + 25 Nov 2013; Samuli Suominen <ssuominen@gentoo.org> + +files/fireflies-2.07-libgfx-libpng16.patch, fireflies-2.07-r1.ebuild: + Explicitely include string.h for memcpy() since libpng16 no longer does it for + us. 23 Dec 2012; Ulrich Müller <ulm@gentoo.org> fireflies-2.07.ebuild, fireflies-2.07-r1.ebuild: @@ -102,4 +107,3 @@ files/fireflies-2.06-Make.include.in.patch, files/fireflies-2.06-configure.patch: Initial commit; #33738 - diff --git a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch new file mode 100644 index 000000000000..b599cac4f80f --- /dev/null +++ b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch @@ -0,0 +1,15 @@ +raster-png.cxx: In function ‘ByteRaster* read_png_image(const char*)’: +raster-png.cxx:104:47: error: ‘memcpy’ was not declared in this scope + memcpy(pixel, row_pointers[row], nbytes); + ^ + +--- libgfx/src/raster-png.cxx ++++ libgfx/src/raster-png.cxx +@@ -16,6 +16,7 @@ + #ifdef HAVE_LIBPNG + + #include <png.h> ++#include <string.h> /* memcpy() */ + + ByteRaster *read_png_image(const char *file_name) + { diff --git a/x11-misc/fireflies/fireflies-2.07-r1.ebuild b/x11-misc/fireflies/fireflies-2.07-r1.ebuild index 8177015c2729..98b31c108c23 100644 --- a/x11-misc/fireflies/fireflies-2.07-r1.ebuild +++ b/x11-misc/fireflies/fireflies-2.07-r1.ebuild @@ -1,8 +1,8 @@ -# 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/x11-misc/fireflies/fireflies-2.07-r1.ebuild,v 1.6 2013/01/12 11:46:27 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07-r1.ebuild,v 1.7 2013/11/25 10:24:34 ssuominen Exp $ -EAPI=4 +EAPI=5 inherit autotools eutils multilib DESCRIPTION="Fireflies screensaver: Wicked cool eye candy" @@ -30,9 +30,8 @@ src_unpack() { src_prepare() { epatch \ "${FILESDIR}"/${P}-build_system.patch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-libgfx-libpng15.patch + "${FILESDIR}"/${P}-gcc4{3,4}.patch \ + "${FILESDIR}"/${P}-libgfx-libpng1{5,6}.patch eautoreconf } @@ -40,5 +39,5 @@ src_prepare() { src_configure() { econf \ --with-confdir=/usr/share/xscreensaver/config \ - --with-bindir=/usr/$(get_libdir)/misc/xscreensaver + --with-bindir="/usr/$(get_libdir)/misc/xscreensaver" } |