diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-04-27 21:50:15 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-04-27 21:50:15 +0000 |
| commit | a83c6aa32fd1f2e4c95716c4bc3505cad116aa3d (patch) | |
| tree | 8371261277bcebd1ff16348c438b6e69301dcab4 /games-arcade | |
| parent | Fix configuration instruction as pointed out in bug 131160. (diff) | |
| download | gentoo-2-a83c6aa32fd1f2e4c95716c4bc3505cad116aa3d.tar.gz gentoo-2-a83c6aa32fd1f2e4c95716c4bc3505cad116aa3d.tar.bz2 gentoo-2-a83c6aa32fd1f2e4c95716c4bc3505cad116aa3d.zip | |
Fixing gcc-4.1 compilation
(Portage version: 2.1_pre9-r4)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/xevil/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/xevil/files/digest-xevil-2.02_p2 | 6 | ||||
| -rw-r--r-- | games-arcade/xevil/files/xevil-2.02_p2-gcc41.patch | 42 | ||||
| -rw-r--r-- | games-arcade/xevil/xevil-2.02_p2.ebuild | 5 |
4 files changed, 55 insertions, 4 deletions
diff --git a/games-arcade/xevil/ChangeLog b/games-arcade/xevil/ChangeLog index cdd340cb5c21..37ef2bb4bcd6 100644 --- a/games-arcade/xevil/ChangeLog +++ b/games-arcade/xevil/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/xevil # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.8 2006/01/29 00:00:28 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.9 2006/04/27 21:50:15 tupone Exp $ + + 27 Apr 2006; <Tupone@gentoo.org> +files/xevil-2.02_p2-gcc41.patch, + xevil-2.02_p2.ebuild: + Fixing compilation on gcc-4.1 28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> xevil-2.02_p2.ebuild: diff --git a/games-arcade/xevil/files/digest-xevil-2.02_p2 b/games-arcade/xevil/files/digest-xevil-2.02_p2 index bbfd05f714f8..fa2b83ca4c7a 100644 --- a/games-arcade/xevil/files/digest-xevil-2.02_p2 +++ b/games-arcade/xevil/files/digest-xevil-2.02_p2 @@ -1,2 +1,6 @@ -MD5 09a9ef720b7204b0be68c4f462def370 xevilsrc2.02r2.zip 1857315 MD5 de2ec493ad377cf9d2022f1f27806aec xevil_2.02r2-2.diff.gz 26096 +RMD160 ff60fafb518a67656bcc83905beb421dbdafa4a5 xevil_2.02r2-2.diff.gz 26096 +SHA256 22e743cca5277daa8c93d54be0ca4ba0c37f992739fd5a38fac5578c83b5c865 xevil_2.02r2-2.diff.gz 26096 +MD5 09a9ef720b7204b0be68c4f462def370 xevilsrc2.02r2.zip 1857315 +RMD160 dca82298ac2dfe66e4e92a02731bb6851563b67e xevilsrc2.02r2.zip 1857315 +SHA256 45a72def6f7532bd4b7193932df09c1ba4eada2433382c494b37d4733e743188 xevilsrc2.02r2.zip 1857315 diff --git a/games-arcade/xevil/files/xevil-2.02_p2-gcc41.patch b/games-arcade/xevil/files/xevil-2.02_p2-gcc41.patch new file mode 100644 index 000000000000..06c3021e164a --- /dev/null +++ b/games-arcade/xevil/files/xevil-2.02_p2-gcc41.patch @@ -0,0 +1,42 @@ +--- cmn/utils.cpp.old 2006-04-27 22:40:27.000000000 +0200 ++++ cmn/utils.cpp 2006-04-27 22:40:40.000000000 +0200 +@@ -753,7 +753,7 @@ + + + private: +- Bucket* HashTable::_get(int &index,void* key); ++ Bucket* _get(int &index,void* key); + /* MODIFIES: index */ + /* EFFECTS: Internal helper function. Return the Bucket containing key + or NULL if not found. Set index to the bucket list for key whether +--- cmn/locator.h.old 2006-04-27 22:46:53.000000000 +0200 ++++ cmn/locator.h 2006-04-27 22:47:40.000000000 +0200 +@@ -96,6 +96,10 @@ + #define OL_RECENT_SOUNDS_MAX 30 + + ++class OLgridEntry; ++#if X11 ++class OLshadowEntry; ++#endif + + // An entry for one object in the list of all objects currently in the game. + class OLentry { +--- cmn/game.cpp.old 2006-04-27 23:43:10.000000000 +0200 ++++ cmn/game.cpp 2006-04-27 23:43:55.000000000 +0200 +@@ -2252,7 +2252,6 @@ + if (keysym != NoSymbol) + right[n][which] = keysym; + } +- delete option; + } + + { // Left Keys. +@@ -2272,7 +2271,6 @@ + if (keysym != NoSymbol) + left[n][which] = keysym; + } +- delete option; + } + } + diff --git a/games-arcade/xevil/xevil-2.02_p2.ebuild b/games-arcade/xevil/xevil-2.02_p2.ebuild index 98951ca30154..7ab1fee3fc73 100644 --- a/games-arcade/xevil/xevil-2.02_p2.ebuild +++ b/games-arcade/xevil/xevil-2.02_p2.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-arcade/xevil/xevil-2.02_p2.ebuild,v 1.11 2006/01/29 00:00:28 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/xevil-2.02_p2.ebuild,v 1.12 2006/04/27 21:50:15 tupone Exp $ inherit eutils games @@ -25,7 +25,8 @@ S=${WORKDIR} src_unpack() { unpack ${A} edos2unix readme.txt x11/*.{cpp,h} cmn/*.{cpp,h} makefile config.mk - epatch ${WORKDIR}/xevil_${MY_PV}-${DEB_PATCH}.diff + epatch ${WORKDIR}/xevil_${MY_PV}-${DEB_PATCH}.diff \ + "${FILESDIR}/${P}"-gcc41.patch sed -i \ -e 's:-static::' \ -e "s:CFLAGS=\":CFLAGS=\"${CFLAGS} :g" \ |