diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2004-10-19 02:35:57 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-10-19 02:35:57 +0000 |
| commit | fd852620ee57aed5c61234ee65b6b873acf4f265 (patch) | |
| tree | 7a49ed7c17b7c7e23d261e6ac7bfda7c847b22aa /games-arcade | |
| parent | fix removeal of -r1 without any notice (Manifest recommit) (diff) | |
| download | gentoo-2-fd852620ee57aed5c61234ee65b6b873acf4f265.tar.gz gentoo-2-fd852620ee57aed5c61234ee65b6b873acf4f265.tar.bz2 gentoo-2-fd852620ee57aed5c61234ee65b6b873acf4f265.zip | |
gcc34 patch from Chris White via bug #68089
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/tomatoes/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/tomatoes/files/1.5-gcc34.patch | 20 | ||||
| -rw-r--r-- | games-arcade/tomatoes/tomatoes-1.5.ebuild | 6 |
3 files changed, 29 insertions, 3 deletions
diff --git a/games-arcade/tomatoes/ChangeLog b/games-arcade/tomatoes/ChangeLog index bfeccc727279..f1f7b81e5a4d 100644 --- a/games-arcade/tomatoes/ChangeLog +++ b/games-arcade/tomatoes/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/tomatoes # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.1 2004/10/19 02:00:48 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/ChangeLog,v 1.2 2004/10/19 02:35:57 mr_bones_ Exp $ + + 18 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> +files/1.5-gcc34.patch, + tomatoes-1.5.ebuild: + gcc34 patch from Chris White via bug #68089 *tomatoes-1.5 (18 Oct 2004) diff --git a/games-arcade/tomatoes/files/1.5-gcc34.patch b/games-arcade/tomatoes/files/1.5-gcc34.patch new file mode 100644 index 000000000000..5666195f2e28 --- /dev/null +++ b/games-arcade/tomatoes/files/1.5-gcc34.patch @@ -0,0 +1,20 @@ +--- src/texture.cpp_old 2004-10-19 01:30:14.744127000 +0900 ++++ src/texture.cpp 2004-10-19 01:30:34.948055536 +0900 +@@ -108,7 +108,7 @@ + SDL_LockSurface(img);
+
+ // Flip the surface pixels upside down
+- Uint8 *line = new (Uint8)[img->w*img->format->BytesPerPixel];
++ Uint8 *line = new Uint8[img->w*img->format->BytesPerPixel];
+ if(!line)
+ error_msg("Unable to flip surface %s:\nOut of memory!\n");
+
+@@ -207,7 +207,7 @@ + SDL_LockSurface(img);
+
+ // Flip the surface pixels upside down
+- Uint8 *line = new (Uint8)[img->w*img->format->BytesPerPixel];
++ Uint8 *line = new Uint8[img->w*img->format->BytesPerPixel];
+ if(!line)
+ error_msg("Unable to flip surface %s:\nOut of memory!\n");
+
diff --git a/games-arcade/tomatoes/tomatoes-1.5.ebuild b/games-arcade/tomatoes/tomatoes-1.5.ebuild index 1d39ad9e22fb..5a32236b71d0 100644 --- a/games-arcade/tomatoes/tomatoes-1.5.ebuild +++ b/games-arcade/tomatoes/tomatoes-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.5.ebuild,v 1.1 2004/10/19 02:00:48 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.5.ebuild,v 1.2 2004/10/19 02:35:57 mr_bones_ Exp $ inherit eutils games @@ -21,6 +21,7 @@ DEPEND="virtual/opengl src_unpack() { unpack ${A} + cd "${S}" sed -i \ -e '/^CC/d' \ @@ -31,8 +32,9 @@ src_unpack() { -e "/^HISCOREDIR = /s:./:${GAMES_STATEDIR}/${PN}/:" \ -e "/^CONFIGDIR = /s:./:${GAMES_SYSCONFDIR}/${PN}/:" \ -e "/^OVERRIDEDIR = /s:./data/:${GAMES_DATADIR}/${PN}/data/:" \ - "${S}/makefile" \ + makefile \ || die "sed failed" + epatch "${FILESDIR}/${PV}-gcc34.patch" } src_install() { |