diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2008-08-24 14:56:35 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2008-08-24 14:56:35 +0000 |
| commit | e2beeac57aaac525bf958f0ee899aa94f4496e7c (patch) | |
| tree | 8e4d6cc76c5c121aba108ca0666c9e68202612c9 /games-strategy | |
| parent | Stable on sparc, security bug #235589 (diff) | |
| download | historical-e2beeac57aaac525bf958f0ee899aa94f4496e7c.tar.gz historical-e2beeac57aaac525bf958f0ee899aa94f4496e7c.tar.bz2 historical-e2beeac57aaac525bf958f0ee899aa94f4496e7c.zip | |
Fix for dprintf redefine. Bug #232694
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/ufo-ai/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/Manifest | 15 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/files/ufo-ai-2.1.1-dprintf.patch | 12 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild | 4 |
4 files changed, 33 insertions, 4 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/Manifest b/games-strategy/ufo-ai/Manifest index 491c81fa786f..1737c4f14a0b 100644 --- a/games-strategy/ufo-ai/Manifest +++ b/games-strategy/ufo-ai/Manifest @@ -1,7 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX ufo-ai-2.1.1-dprintf.patch 416 RMD160 7c345bc0243062bc45cda3daafa1fff2098c7f75 SHA1 545a8335f91a2f0c95ff4476b806bf68a81dd09a SHA256 5c101f7ba1fd8bb8a52d8bf1c063c71194bff6a9451b211a49b129fe934120bc DIST music.tar.bz2 33767479 RMD160 a216e484e3421d0af165bb70365bcdb9a5285508 SHA1 9ab42094077e4fda6db5bef0f4f0fc971ac1f3c2 SHA256 1d4bdabcd5f30657fbec49d0af02c8b4a6ce42e208bdc101172c667de4781751 DIST ufoai-2.1.1-data.tar 267755520 RMD160 ddbf856710c18ed4b73061b14ed340b70b083ea4 SHA1 719e25c498b48f583d81500de81693853dee1ffa SHA256 5e92950f93d0dcef7fbdefc0c0da6f398b06476837bfce79243baa6227176f7c DIST ufoai-2.1.1-i18n.tar.bz2 1065252 RMD160 2eb8a9551eae2268dcfffdef3a6ad44f7becf04f SHA1 77942366e6c8db8741416a67071587ff115741bf SHA256 ed3467118be97bcd27f983567ba09f2cf5492841c10a595b2bc51b4d1c48738e DIST ufoai-2.1.1-source_hotfix.tar.bz2 6896824 RMD160 2769419411e875b9d2313bfa255e3eab806b17cb SHA1 8b11434714231facb8af6420cdc4e7c290883910 SHA256 485c4e78ae73d28c4a06156805925047391a3ae571883275c1875bbeb1651129 -EBUILD ufo-ai-2.1.1-r1.ebuild 3526 RMD160 f743cf88ddcb26ea3e9d52b6a9af36b8f393e8ff SHA1 612c346b114b68779cb7b81b2b173f7048507a3b SHA256 102ff03a735ea2a3dd1df6dc3b133ceffbcb724c7c1f36ac7cd8623775714916 -MISC ChangeLog 2475 RMD160 e59b51cb2ce365de117578cf394cb6466cd9211d SHA1 618808d270b9ca70b620ba5d80ec29bdeb22aa78 SHA256 0407ff4147171736c0fe1e37ebd10838bec434c3ef165ce1645f61674ad95de9 +EBUILD ufo-ai-2.1.1-r1.ebuild 3569 RMD160 e1873f25ca7a7f27e3e4bd8e99b546c003912291 SHA1 90064a48c3bd66e58ad5cd41695a8f0b159591a5 SHA256 b70c16c6222ed5d4b65f37af2d90ecfa71eb2742b043429e1b54afb567c1a21f +MISC ChangeLog 2651 RMD160 8c783f5085a46d266b02b5f009ab0d85f5f3eb61 SHA1 fbda762a4aed87bb2d99fe1f95f974508e313348 SHA256 db53a2dda33399e6454c9ac3e2fac5ea3ecb5e8ec1d57c6ba3d93aa65e1ca33c MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkixds0ACgkQFByi98F1FAjRKwCfSgSNuvzricN7iZptloAUOKgT +KCcAnjS4C3w9tGc5zktI+S1pmtLlwbXj +=mmbQ +-----END PGP SIGNATURE----- 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 } |