summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2007-06-13 22:44:18 +0000
committerTristan Heaven <nyhm@gentoo.org>2007-06-13 22:44:18 +0000
commitbf14b33a7d2812373d001d4c9042ada424e1fcf1 (patch)
treea14d6f0387a1713427618f98b71ac8d6dfbbf8d8 /games-roguelike
parentAdd ~alpha wrt #154793 (diff)
downloadgentoo-2-bf14b33a7d2812373d001d4c9042ada424e1fcf1.tar.gz
gentoo-2-bf14b33a7d2812373d001d4c9042ada424e1fcf1.tar.bz2
gentoo-2-bf14b33a7d2812373d001d4c9042ada424e1fcf1.zip
Patch for gcc-4.2
(Portage version: 2.1.2.9)
Diffstat (limited to 'games-roguelike')
-rw-r--r--games-roguelike/scourge/ChangeLog6
-rw-r--r--games-roguelike/scourge/files/scourge-0.18-gcc42.patch22
-rw-r--r--games-roguelike/scourge/scourge-0.18.ebuild3
3 files changed, 29 insertions, 2 deletions
diff --git a/games-roguelike/scourge/ChangeLog b/games-roguelike/scourge/ChangeLog
index 82e171f4d0ce..bd9d363a9e41 100644
--- a/games-roguelike/scourge/ChangeLog
+++ b/games-roguelike/scourge/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-roguelike/scourge
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.25 2007/06/01 01:23:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.26 2007/06/13 22:44:18 nyhm Exp $
+
+ 13 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+ +files/scourge-0.18-gcc42.patch, scourge-0.18.ebuild:
+ Patch for gcc-4.2
*scourge-0.18 (01 Jun 2007)
diff --git a/games-roguelike/scourge/files/scourge-0.18-gcc42.patch b/games-roguelike/scourge/files/scourge-0.18-gcc42.patch
new file mode 100644
index 000000000000..e3ef9e8c86ce
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.18-gcc42.patch
@@ -0,0 +1,22 @@
+--- src/sdlhandler.cpp
++++ src/sdlhandler.cpp
+@@ -163,7 +163,7 @@
+ }
+
+ /* general OpenGL initialization function */
+-int SDLHandler::initGL( GLvoid ) {
++int SDLHandler::initGL( void ) {
+ /* Enable Texture Mapping */
+ glEnable( GL_TEXTURE_2D );
+
+--- src/sdlhandler.h
++++ src/sdlhandler.h
+@@ -231,7 +231,7 @@
+ protected:
+ bool popHandlers();
+ int resizeWindow( int width, int height );
+- int initGL( GLvoid );
++ int initGL( void );
+ void drawCursor();
+
+ void drawScreenInternal();
diff --git a/games-roguelike/scourge/scourge-0.18.ebuild b/games-roguelike/scourge/scourge-0.18.ebuild
index db053ad05a1d..0a5245a7fc13 100644
--- a/games-roguelike/scourge/scourge-0.18.ebuild
+++ b/games-roguelike/scourge/scourge-0.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.18.ebuild,v 1.1 2007/06/01 01:23:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.18.ebuild,v 1.2 2007/06/13 22:44:18 nyhm Exp $
inherit autotools eutils wxwidgets games
@@ -41,6 +41,7 @@ src_unpack() {
-e "/WXWIDGET_LIBS/s:wx-config:${WX_CONFIG}:" \
configure.in || die "sed failed"
fi
+ epatch "${FILESDIR}"/${P}-gcc42.patch
eautoreconf
}