summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2004-10-08 10:11:24 +0000
committerAlastair Tse <liquidx@gentoo.org>2004-10-08 10:11:24 +0000
commit6abc7fb19689d601bd297446a56cb83776371ce1 (patch)
treef6e421bc330e4b2a3e76d3d757cb201df0c33dda /gnome-extra
parentVersion bump, bug 66729 (Manifest recommit) (diff)
downloadgentoo-2-6abc7fb19689d601bd297446a56cb83776371ce1.tar.gz
gentoo-2-6abc7fb19689d601bd297446a56cb83776371ce1.tar.bz2
gentoo-2-6abc7fb19689d601bd297446a56cb83776371ce1.zip
gcc compat patch added (#63072) thanks to Ken Bateman
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/shermans-aquarium/ChangeLog6
-rw-r--r--gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-gcc-v.patch19
-rw-r--r--gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild10
3 files changed, 33 insertions, 2 deletions
diff --git a/gnome-extra/shermans-aquarium/ChangeLog b/gnome-extra/shermans-aquarium/ChangeLog
index 259877f43367..33e28d41d220 100644
--- a/gnome-extra/shermans-aquarium/ChangeLog
+++ b/gnome-extra/shermans-aquarium/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-extra/shermans-aquarium
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/ChangeLog,v 1.6 2004/06/24 22:10:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/ChangeLog,v 1.7 2004/10/08 10:11:24 liquidx Exp $
+
+ 08 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+ +files/shermans-aquarium-2.2.0-gcc-v.patch, shermans-aquarium-2.2.0.ebuild:
+ gcc compat patch added (#63072) thanks to Ken Bateman
03 Jun 2004; Aron Griffis <agriffis@gentoo.org>
shermans-aquarium-2.2.0.ebuild:
diff --git a/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-gcc-v.patch b/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-gcc-v.patch
new file mode 100644
index 000000000000..2ecdb981c833
--- /dev/null
+++ b/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-gcc-v.patch
@@ -0,0 +1,19 @@
+*** configure.in.old Mon Sep 6 19:45:37 2004
+--- configure.in Mon Sep 6 19:45:53 2004
+***************
+*** 674,680 ****
+ else
+ echo "\"\\n\";">>src/stamp.h
+ fi
+! echo "char *gccinfo=\"$CC `$CC --version`\\n\";">>src/stamp.h
+
+ AC_OUTPUT(src/Makefile Makefile)
+ if test x$gnome1 = xyes ; then
+--- 674,680 ----
+ else
+ echo "\"\\n\";">>src/stamp.h
+ fi
+! echo "char *gccinfo=\"$CC `$CC --version | head -n 1`\\n\";">>src/stamp.h
+
+ AC_OUTPUT(src/Makefile Makefile)
+ if test x$gnome1 = xyes ; then
diff --git a/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild b/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild
index e192365665ae..c9bcbbba640a 100644
--- a/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild
+++ b/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild,v 1.8 2004/06/24 22:10:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild,v 1.9 2004/10/08 10:11:24 liquidx Exp $
+
+inherit eutils
MY_P=${PN/-/_}-${PV}
DESCRIPTION="A gnome/wm applet displaying comical fish"
@@ -31,6 +33,12 @@ DEPEND="virtual/x11
# the _ switched for - because of the source naming
S=${WORKDIR}/${MY_P}
+src_unpack() {
+ unpack ${A}
+ cd ${S}; epatch ${FILESDIR}/${P}-gcc-v.patch
+ autoconf
+}
+
src_compile( ) {
cd ${S}