summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2008-08-24 14:56:35 +0000
committerAlfredo Tupone <tupone@gentoo.org>2008-08-24 14:56:35 +0000
commit55f32e68fdf49ac683e125af8fe723ab6a7667d6 (patch)
treefef414b6e5c67cb85e9fb98219ee985c0a375281 /games-strategy/ufo-ai
parentStable on sparc, security bug #235589 (diff)
downloadgentoo-2-55f32e68fdf49ac683e125af8fe723ab6a7667d6.tar.gz
gentoo-2-55f32e68fdf49ac683e125af8fe723ab6a7667d6.tar.bz2
gentoo-2-55f32e68fdf49ac683e125af8fe723ab6a7667d6.zip
Fix for dprintf redefine. Bug #232694
(Portage version: 2.1.4.4)
Diffstat (limited to 'games-strategy/ufo-ai')
-rw-r--r--games-strategy/ufo-ai/ChangeLog6
-rw-r--r--games-strategy/ufo-ai/files/ufo-ai-2.1.1-dprintf.patch12
-rw-r--r--games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild4
3 files changed, 20 insertions, 2 deletions
diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index 244bd6ba10aa..a21fff72f248 100644
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/ufo-ai
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.18 2008/02/29 19:49:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.19 2008/08/24 14:56:35 tupone Exp $
+
+ 24 Aug 2008; Tupone Alfredo <tupone@gentoo.org>
+ +files/ufo-ai-2.1.1-dprintf.patch, ufo-ai-2.1.1-r1.ebuild:
+ Fix for dprintf redefined. Bug #232694 by Konstantin Sobolev
29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> ufo-ai-2.1.1-r1.ebuild:
Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.1.1-dprintf.patch b/games-strategy/ufo-ai/files/ufo-ai-2.1.1-dprintf.patch
new file mode 100644
index 000000000000..763d11ee0b13
--- /dev/null
+++ b/games-strategy/ufo-ai/files/ufo-ai-2.1.1-dprintf.patch
@@ -0,0 +1,12 @@
+--- src/game/g_local.h.old 2008-08-24 16:23:45.000000000 +0200
++++ src/game/g_local.h 2008-08-24 16:26:05.000000000 +0200
+@@ -41,6 +41,9 @@
+ /* short, server-visible player_t and edict_t structures, */
+ /* because we define the full size ones in this file */
+ #define GAME_INCLUDE
++#ifdef dprintf
++#undef dprintf
++#endif
+ #include "game.h"
+
+ /* the "gameversion" client command will print this plus compile date */
diff --git a/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild b/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild
index 1c04179911f9..6303728fb4a6 100644
--- a/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild
+++ b/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild,v 1.3 2008/02/29 19:49:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild,v 1.4 2008/08/24 14:56:35 tupone Exp $
inherit eutils autotools games
@@ -73,6 +73,8 @@ src_unpack() {
-e "s:FS_GetCwd():\"${dir}\":" \
src/qcommon/common.c || die "sed common.c failed"
+ epatch "${FILESDIR}"/${P}-dprintf.patch
+
eautoreconf
}