diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-06-08 17:07:38 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-06-08 17:07:38 +0000 |
| commit | c86b81079854cbdcdb7749be772a23685591af0b (patch) | |
| tree | 9688fe4d329e33c5df7bcfeca1e53a2d1144e14f /games-action/armagetronad | |
| parent | Sparc stable, security bug #250476. (diff) | |
| download | gentoo-2-c86b81079854cbdcdb7749be772a23685591af0b.tar.gz gentoo-2-c86b81079854cbdcdb7749be772a23685591af0b.tar.bz2 gentoo-2-c86b81079854cbdcdb7749be772a23685591af0b.zip | |
make it build with patch from Martin Väth via bug #272961
(Portage version: 2.1.6.11/cvs/Linux i686)
Diffstat (limited to 'games-action/armagetronad')
| -rw-r--r-- | games-action/armagetronad/ChangeLog | 8 | ||||
| -rw-r--r-- | games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild | 5 | ||||
| -rw-r--r-- | games-action/armagetronad/files/armagetronad-0.2.7.1-build.patch | 34 |
3 files changed, 43 insertions, 4 deletions
diff --git a/games-action/armagetronad/ChangeLog b/games-action/armagetronad/ChangeLog index 3b056690aa69..fb2b75e8ca57 100644 --- a/games-action/armagetronad/ChangeLog +++ b/games-action/armagetronad/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/armagetronad -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.13 2008/06/29 10:28:37 tove Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.14 2009/06/08 17:07:30 mr_bones_ Exp $ + + 08 Jun 2009; Michael Sterrett <mr_bones_@gentoo.org> + +files/armagetronad-0.2.7.1-build.patch, armagetronad-0.2.7.1-r1.ebuild: + make it build with patch from Martin Väth via bug #272961 29 Jun 2008; Torsten Veller <tove@gentoo.org> armagetronad-0.2.7.1-r1.ebuild: diff --git a/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild index 37639262aed7..71b629234395 100644 --- a/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild +++ b/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild,v 1.8 2008/06/29 10:28:37 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild,v 1.9 2009/06/08 17:07:30 mr_bones_ Exp $ inherit eutils games @@ -36,6 +36,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-gcc4.patch epatch "${FILESDIR}"/${P}-gcc43.patch #218542 epatch "${FILESDIR}"/${P}-security-1.patch + epatch "${FILESDIR}"/${P}-build.patch cp "${FILESDIR}"/${PN}-ded "${FILESDIR}"/${PN} . || die sed -i \ -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \ diff --git a/games-action/armagetronad/files/armagetronad-0.2.7.1-build.patch b/games-action/armagetronad/files/armagetronad-0.2.7.1-build.patch new file mode 100644 index 000000000000..244a575a5441 --- /dev/null +++ b/games-action/armagetronad/files/armagetronad-0.2.7.1-build.patch @@ -0,0 +1,34 @@ +--- Makefile.in ++++ Makefile.in +@@ -69,7 +69,7 @@ + $(MAKE) all + + src/doc/commands.txt: @progname@ Makefile +- ./@progname@ --doc > src/doc/commands.txt ++ src/tron/@progname@ --doc > src/doc/commands.txt + + # build documentation from M4 sources or just copy it + documentation: src/doc/commands.txt src/doc/* src/doc/net/* +--- src/network/net_udp.cpp ++++ src/network/net_udp.cpp +@@ -178,7 +178,7 @@ + struct hostent *local; + char buff[MAXHOSTNAMELEN]="\0"; + struct sockaddr addr; +- char *colon; ++ const char *colon; + + #ifdef WIN32 + WSADATA winsockdata; +@@ -232,9 +232,9 @@ + + ANET_GetSocketAddr (net_controlsocket, &addr); + my_tcpip_address=ANET_AddrToString (&addr); +- colon = strrchr (my_tcpip_address, ':'); ++ colon = (strrchr (my_tcpip_address, ':')); + if (colon) +- *colon = 0; ++ *const_cast<char*>(colon) = 0; + + // Con_Printf("UDP Initialized\n"); + tcpipAvailable = true; |