diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2009-12-22 01:05:51 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-12-22 01:05:51 +0000 |
commit | 756fdacbca43cad31fefba720680bdafd2db633a (patch) | |
tree | 7f4edcba99657558e866116e79407e8c46abd847 /games-roguelike/crossfire-client | |
parent | Fixing stop sequence in init script, patch thanks to Lars Wendler (Polynomial... (diff) | |
download | historical-756fdacbca43cad31fefba720680bdafd2db633a.tar.gz historical-756fdacbca43cad31fefba720680bdafd2db633a.tar.bz2 historical-756fdacbca43cad31fefba720680bdafd2db633a.zip |
add patch from Tim Hentenaar to fix compile warning from lua (bug #296697)
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-roguelike/crossfire-client')
4 files changed, 29 insertions, 6 deletions
diff --git a/games-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog index f2804aab2c67..e6adf46be551 100644 --- a/games-roguelike/crossfire-client/ChangeLog +++ b/games-roguelike/crossfire-client/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/crossfire-client # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.20 2009/10/15 06:16:20 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.21 2009/12/22 01:05:51 mr_bones_ Exp $ + + 22 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> + crossfire-client-1.12.0.ebuild, +files/crossfire-client-1.12.0-lua.patch: + add patch from Tim Hentenaar to fix compile warning from lua (bug #296697) *crossfire-client-1.12.0 (15 Oct 2009) diff --git a/games-roguelike/crossfire-client/Manifest b/games-roguelike/crossfire-client/Manifest index 4a51585163cf..e659389b5da1 100644 --- a/games-roguelike/crossfire-client/Manifest +++ b/games-roguelike/crossfire-client/Manifest @@ -1,6 +1,7 @@ +AUX crossfire-client-1.12.0-lua.patch 568 RMD160 86ff822514108c82ed63e0ec1a112f7ded3967e5 SHA1 4b4dc514739d0dd0586c2f691d0a845967008ad9 SHA256 b1d02cb6e6b179696aa7b49b41761d2a309aba18c001739d56e06dac95978904 DIST crossfire-client-1.12.0.tar.bz2 823766 RMD160 21568bab022a4b3cdf4115f33fcfb1c8da0d2363 SHA1 7ec3db117084164cee7b9a42291874b4a7240662 SHA256 cfdbc11d06f00d53bde9620ed0a13b5fd54fc7fec4d11b4beaf2146c3cedf227 DIST crossfire-client-1.9.1.tar.gz 753757 RMD160 0a63410fc85db825c2de1407e308b0e7ca84527e SHA1 3b7216212a3f31fdcddd4d220de8d95e14e5900b SHA256 8c505bcb1031da18866747d8fc4dc5ab8c67aa28387eb761794ab0672b49e6bc -EBUILD crossfire-client-1.12.0.ebuild 1524 RMD160 5a86a74bb44985dd2f5206c52574013656dde527 SHA1 575e96acc05b9fcf6394b0c9a42f3459fb262f23 SHA256 08736121865559c6c74124702b1456196dd600d5f894ecfcf6ac94a2de0b7dd1 +EBUILD crossfire-client-1.12.0.ebuild 1575 RMD160 5e20c51272214011a0f295aa25998e1465512290 SHA1 c4cc3e06e1589676b8840c61e0ed4c3408e0319e SHA256 55448389414cc4171cfc3169580657e29218cbf3920bcfd5b6a51db13884acfd EBUILD crossfire-client-1.9.1.ebuild 1544 RMD160 213a23c29cc956ec4fec29995cb71098e34c6f86 SHA1 9e6555a993bf80d010d10ab3221ae446d6d77c7a SHA256 a00656ac32c1f465478d1012be4ad8715c832fca9ff50227d4eb41f7fc2d32d4 -MISC ChangeLog 3893 RMD160 7f1a0142610371e2860a21a7a20e31dfb352b862 SHA1 e50ac01f4c5c4cc2acbe145d67a615fb92298775 SHA256 8af779ab6d3bcd627b8b5db9b356c915d8bbb6acabbf4db0364bcc8b48b982ec +MISC ChangeLog 4102 RMD160 5734d2a4b53a55d4526c8b75c49dc2c87026e8dc SHA1 d73cf15e247f05088172299d2c4cee5587b6e5c3 SHA256 fde2e4f11c2ebfbba2ed0ba1ef5b84e9796cc8e82dc4ba1780de45a6ed67c6d4 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild index 7c968dcc0732..f246d1175598 100644 --- a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild +++ b/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild,v 1.1 2009/10/15 06:16:20 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild,v 1.2 2009/12/22 01:05:51 mr_bones_ Exp $ EAPI=2 -inherit games +inherit eutils games DESCRIPTION="Client for the nethack-style but more in the line of UO" HOMEPAGE="http://crossfire.real-time.com/" @@ -16,7 +16,7 @@ IUSE="alsa gtk oss sdl" RDEPEND="alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 - sdl? ( media-libs/libsdl + sdl? ( media-libs/libsdl[video] media-libs/sdl-image ) ) virtual/glut media-libs/libpng @@ -29,6 +29,7 @@ src_prepare() { -r '/^.TH/s:$: 6:' \ $(find . -name "*man") \ || die "sed failed" + epatch "${FILESDIR}/${P}-lua.patch" } src_configure() { diff --git a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-lua.patch b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-lua.patch new file mode 100644 index 000000000000..ebd6eb27150c --- /dev/null +++ b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-lua.patch @@ -0,0 +1,17 @@ +diff -ru crossfire-client-1.12.0-old/common/script_lua.c crossfire-client-1.12.0/common/script_lua.c +--- crossfire-client-1.12.0-old/common/script_lua.c 2009-04-04 13:43:43.000000000 -0400 ++++ crossfire-client-1.12.0/common/script_lua.c 2009-12-13 00:45:32.020011661 -0500 +@@ -44,6 +44,13 @@ + #include <lua.h> + #include <lualib.h> + ++/* luaL_newstate() is declared in lauxlib.h in Lua >= 5.1 ++ * and is needed to correct "implicit declaration" warnings. ++ */ ++#if LUA_VERSION_NUM >= 501 ++#include <lauxlib.h> ++#endif ++ + struct script_state + { + lua_State* state; |