diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-05-28 10:13:20 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-05-28 10:13:20 +0000 |
| commit | 75316facb3c992c49c6bda73f3c17a675d29e1d0 (patch) | |
| tree | 94f2eeb5dbc04c6e1e3bcb4668c56e02f9cd6e40 /games-strategy | |
| parent | Add patch to add support for visibility (with GCC 4.1). (diff) | |
| download | gentoo-2-75316facb3c992c49c6bda73f3c17a675d29e1d0.tar.gz gentoo-2-75316facb3c992c49c6bda73f3c17a675d29e1d0.tar.bz2 gentoo-2-75316facb3c992c49c6bda73f3c17a675d29e1d0.zip | |
Fix for gcc-4.1, bug #131222
(Portage version: 2.1_rc2-r3)
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/glob2/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/glob2/files/glob2-0.8.19-gcc41.patch | 62 | ||||
| -rw-r--r-- | games-strategy/glob2/glob2-0.8.19.ebuild | 3 |
3 files changed, 69 insertions, 2 deletions
diff --git a/games-strategy/glob2/ChangeLog b/games-strategy/glob2/ChangeLog index a14511e15848..8129620c30f4 100644 --- a/games-strategy/glob2/ChangeLog +++ b/games-strategy/glob2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/glob2 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.29 2006/04/27 20:08:34 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.30 2006/05/28 10:13:20 tupone Exp $ + + 28 May 2006; <Tupone@gentoo.org> +files/glob2-0.8.19-gcc41.patch, + glob2-0.8.19.ebuild: + Fix for gcc-4.1, bug #131222 by nyhm 27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-glob2-0.8.15, files/digest-glob2-0.8.16, files/digest-glob2-0.8.17, diff --git a/games-strategy/glob2/files/glob2-0.8.19-gcc41.patch b/games-strategy/glob2/files/glob2-0.8.19-gcc41.patch new file mode 100644 index 000000000000..b1b7e37bdea5 --- /dev/null +++ b/games-strategy/glob2/files/glob2-0.8.19-gcc41.patch @@ -0,0 +1,62 @@ +--- src/EndGameScreen.h.old 2006-05-28 11:35:22.000000000 +0200 ++++ src/EndGameScreen.h 2006-05-28 11:35:45.000000000 +0200 +@@ -64,7 +64,7 @@ + + protected: + //! resort players +- void EndGameScreen::sortAndSet(EndOfGameStat::Type type); ++ void sortAndSet(EndOfGameStat::Type type); + + public: + EndGameScreen(GameGUI *gui); +--- src/GameGUILoadSave.cpp.old 2006-05-28 11:37:45.000000000 +0200 ++++ src/GameGUILoadSave.cpp 2006-05-28 11:38:40.000000000 +0200 +@@ -31,7 +31,7 @@ + { + + public: +- FuncFileList::FuncFileList(int x, int y, int w, int h, Uint32 hAlign, Uint32 vAlign, const char *font, ++ FuncFileList(int x, int y, int w, int h, Uint32 hAlign, Uint32 vAlign, const char *font, + const char *dir, const char *extension, const bool recurse, + std::string (*filenameToNameFunc)(const char *filename), + std::string (*nameToFilenameFunc)(const char *dir, const char *name, const char *extension)) +@@ -41,16 +41,16 @@ + this->generateList(); + } + +- FuncFileList::~FuncFileList() ++ ~FuncFileList() + {} + + private: +- std::string FuncFileList::fileToList(const char* fileName) const ++ std::string fileToList(const char* fileName) const + { + return filenameToNameFunc(fullName(fileName).c_str()); + } + +- std::string FuncFileList::listToFile(const char* listName) const ++ std::string listToFile(const char* listName) const + { + return nameToFilenameFunc(fullDir().c_str(), listName, extension.c_str()); + } +--- src/IRC.h.old 2006-05-28 11:35:30.000000000 +0200 ++++ src/IRC.h 2006-05-28 11:36:07.000000000 +0200 +@@ -69,7 +69,7 @@ + char diffusion[IRC_CHANNEL_SIZE+1]; + char message[IRC_MESSAGE_SIZE+1]; + +- ChatMessage::ChatMessage() { source[0]=0; diffusion[0]=0; message[0]=0; } ++ ChatMessage() { source[0]=0; diffusion[0]=0; message[0]=0; } + }; + + struct InfoMessage +@@ -79,7 +79,7 @@ + char diffusion[IRC_CHANNEL_SIZE+1]; + char message[IRC_MESSAGE_SIZE+1]; + +- InfoMessage::InfoMessage(InfoMessageType t) { type=t; source[0]=0; diffusion[0]=0; message[0]=0; } ++ InfoMessage(InfoMessageType t) { type=t; source[0]=0; diffusion[0]=0; message[0]=0; } + }; + + protected: diff --git a/games-strategy/glob2/glob2-0.8.19.ebuild b/games-strategy/glob2/glob2-0.8.19.ebuild index 1962b26bb249..0955d2a5f823 100644 --- a/games-strategy/glob2/glob2-0.8.19.ebuild +++ b/games-strategy/glob2/glob2-0.8.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.19.ebuild,v 1.1 2006/03/13 08:35:05 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.8.19.ebuild,v 1.2 2006/05/28 10:13:20 tupone Exp $ inherit games @@ -27,6 +27,7 @@ DEPEND="virtual/opengl src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}/${P}"-gcc41.patch sed -i \ -e "/^glob2linkdir/s:\$(datadir):/usr/share:" \ data/Makefile.in \ |