summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-12-17 22:31:26 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-12-17 22:31:26 +0000
commit460cd6e774b476605f9fddab38cc7777d6d5d332 (patch)
tree7d4028f1311eedcf06955b635c8086ba1214174c /x11-misc
parentamd64 stable, bug #250221 (diff)
downloadgentoo-2-460cd6e774b476605f9fddab38cc7777d6d5d332.tar.gz
gentoo-2-460cd6e774b476605f9fddab38cc7777d6d5d332.tar.bz2
gentoo-2-460cd6e774b476605f9fddab38cc7777d6d5d332.zip
Fix bug 228219. Thanks to Jabari R. Roberts for the patch.
(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/fireflies/ChangeLog6
-rw-r--r--x11-misc/fireflies/files/fireflies-2.07-gcc43.patch11
-rw-r--r--x11-misc/fireflies/fireflies-2.07.ebuild5
3 files changed, 20 insertions, 2 deletions
diff --git a/x11-misc/fireflies/ChangeLog b/x11-misc/fireflies/ChangeLog
index 2224ffced5b0..bd9268156638 100644
--- a/x11-misc/fireflies/ChangeLog
+++ b/x11-misc/fireflies/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/fireflies
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.19 2008/11/17 23:06:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.20 2008/12/17 22:31:26 loki_val Exp $
+
+ 17 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+ +files/fireflies-2.07-gcc43.patch, fireflies-2.07.ebuild:
+ Fix bug 228219. Thanks to Jabari R. Roberts for the patch.
17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
files/fireflies-2.06-Make.include.in.patch,
diff --git a/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch b/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch
new file mode 100644
index 000000000000..d6bad4d9dda4
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch
@@ -0,0 +1,11 @@
+--- fireflies-2.07/libgfx/src/raster.cxx.old 2008-07-29 17:53:35.000000000 -0500
++++ fireflies-2.07/libgfx/src/raster.cxx 2008-07-29 17:53:51.000000000 -0500
+@@ -9,7 +9,7 @@
+ #include <gfx/gfx.h>
+ #include <gfx/raster.h>
+
+-#include <string>
++#include <cstring>
+ #include <cctype>
+
+ ByteRaster::ByteRaster(const ByteRaster &img)
diff --git a/x11-misc/fireflies/fireflies-2.07.ebuild b/x11-misc/fireflies/fireflies-2.07.ebuild
index e419484c7dcc..2e14f685e293 100644
--- a/x11-misc/fireflies/fireflies-2.07.ebuild
+++ b/x11-misc/fireflies/fireflies-2.07.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07.ebuild,v 1.5 2008/03/27 10:25:55 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07.ebuild,v 1.6 2008/12/17 22:31:26 loki_val Exp $
inherit eutils multilib
@@ -24,6 +24,9 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-2.06-configure.patch
epatch "${FILESDIR}"/${PN}-2.06-Make.include.in.patch
sed -i -e 's:strip:true:' src/Makefile
+ sed -i -e '/gunzip/d' Makefile
+ tar xzf libgfx-1.0.1.tar.gz
+ epatch "${FILESDIR}"/${PN}-2.07-gcc43.patch
}
src_compile() {