summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-07-09 19:36:44 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-07-09 19:36:44 +0000
commit51b30cad908544113b5ac9f8d3af4bf0e608f32c (patch)
tree1b232d07aa5a3af2a9ef7edf99afc8f957a1192c /net-www/gplflash
parentnew kde3 version, should fix 4675 (diff)
downloadhistorical-51b30cad908544113b5ac9f8d3af4bf0e608f32c.tar.gz
historical-51b30cad908544113b5ac9f8d3af4bf0e608f32c.tar.bz2
historical-51b30cad908544113b5ac9f8d3af4bf0e608f32c.zip
fix the patch
Diffstat (limited to 'net-www/gplflash')
-rw-r--r--net-www/gplflash/ChangeLog7
-rw-r--r--net-www/gplflash/files/gplflash-0.4.10-gcc3-gentoo.diff7
-rw-r--r--net-www/gplflash/gplflash-0.4.10-r1.ebuild4
3 files changed, 10 insertions, 8 deletions
diff --git a/net-www/gplflash/ChangeLog b/net-www/gplflash/ChangeLog
index e34af11995f0..20f6cc467204 100644
--- a/net-www/gplflash/ChangeLog
+++ b/net-www/gplflash/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-www/gplflash
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/ChangeLog,v 1.1 2002/06/30 02:41:03 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/ChangeLog,v 1.2 2002/07/09 19:36:44 azarah Exp $
+
+ 09 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc3-gentoo.diff :
+
+ Update the patch not to include the "$Id:", as it invalidated the
+ patch after commit, causing gplflash to still fail with gcc3.
*gplflash-0.4.10-r1 (29 Jun 2002)
diff --git a/net-www/gplflash/files/gplflash-0.4.10-gcc3-gentoo.diff b/net-www/gplflash/files/gplflash-0.4.10-gcc3-gentoo.diff
index a19f6fcf0408..5f0a5385eaf1 100644
--- a/net-www/gplflash/files/gplflash-0.4.10-gcc3-gentoo.diff
+++ b/net-www/gplflash/files/gplflash-0.4.10-gcc3-gentoo.diff
@@ -1,15 +1,12 @@
diff -u -r flash-0.4.10.old/Lib/shape.cc flash-0.4.10/Lib/shape.cc
--- flash-0.4.10.old/Lib/shape.cc Wed Jun 7 19:11:08 2000
+++ flash-0.4.10/Lib/shape.cc Tue Jun 25 12:03:56 2002
-@@ -22,6 +22,8 @@
+@@ -22,4 +22,5 @@
#include "swf.h"
-
+#include <math.h>
-+
+
#ifdef RCSID
- static char *rcsid = "$Id: gplflash-0.4.10-gcc3-gentoo.diff,v 1.1 2002/06/30 02:41:02 mkennedy Exp $";
- #endif
diff -u -r flash-0.4.10.old/Makefile flash-0.4.10/Makefile
--- flash-0.4.10.old/Makefile Mon Jun 12 09:19:14 2000
+++ flash-0.4.10/Makefile Tue Jun 25 12:00:07 2002
diff --git a/net-www/gplflash/gplflash-0.4.10-r1.ebuild b/net-www/gplflash/gplflash-0.4.10-r1.ebuild
index 375e54969509..44093da2db20 100644
--- a/net-www/gplflash/gplflash-0.4.10-r1.ebuild
+++ b/net-www/gplflash/gplflash-0.4.10-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Pieter Van den Abeele <pvdabeel@gentoo.org>
-# $Id: gplflash-0.4.10-r1.ebuild,v 1.1 2002/06/30 02:41:03 mkennedy Exp $
+# $Id: gplflash-0.4.10-r1.ebuild,v 1.2 2002/07/09 19:36:44 azarah Exp $
S=${WORKDIR}/flash-0.4.10
DESCRIPTION="GPL Shockwave Flash Player/Plugin"
@@ -17,7 +17,7 @@ src_unpack() {
cd ${WORKDIR}
unpack flash-0.4.10.tgz
cd ${S}
- patch -p1 <${FILESDIR}/gplflash-0.4.10-gcc3-gentoo.diff
+ patch -p1 <${FILESDIR}/${P}-gcc3-gentoo.diff || die
}
src_compile() {