diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2008-06-02 09:42:46 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2008-06-02 09:42:46 +0000 |
| commit | 819a1a9407db7d360af5e34464ae2c2cdd9d55df (patch) | |
| tree | 9468348ce90e64e1456a45988c3a5a4e4b617672 /games-strategy/scorched3d | |
| parent | keyword ~x86-fbsd (diff) | |
| download | gentoo-2-819a1a9407db7d360af5e34464ae2c2cdd9d55df.tar.gz gentoo-2-819a1a9407db7d360af5e34464ae2c2cdd9d55df.tar.bz2 gentoo-2-819a1a9407db7d360af5e34464ae2c2cdd9d55df.zip | |
Fix for a WIN32 only macro conflict
(Portage version: 2.1.4.4)
Diffstat (limited to 'games-strategy/scorched3d')
| -rw-r--r-- | games-strategy/scorched3d/ChangeLog | 5 | ||||
| -rw-r--r-- | games-strategy/scorched3d/scorched3d-41.3-r1.ebuild | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog index 60da47ccf0ba..0b201cffcc87 100644 --- a/games-strategy/scorched3d/ChangeLog +++ b/games-strategy/scorched3d/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/scorched3d # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.54 2008/05/29 11:47:07 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.55 2008/06/02 09:42:45 tupone Exp $ + + 02 Jun 2008; Tupone Alfredo <tupone@gentoo.org> scorched3d-41.3-r1.ebuild: + Fix for a WIN32 only macro conflict 29 May 2008; Tristan Heaven <nyhm@gentoo.org> scorched3d-41.3-r1.ebuild: Fix compilation with wxGTK USE=odbc by Arttu Valo, bug #213872 diff --git a/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild b/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild index 1bd114dfac31..8375367b54dc 100644 --- a/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild +++ b/games-strategy/scorched3d/scorched3d-41.3-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/scorched3d/scorched3d-41.3-r1.ebuild,v 1.4 2008/05/29 11:47:07 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild,v 1.5 2008/06/02 09:42:46 tupone Exp $ inherit eutils wxwidgets games @@ -45,6 +45,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-gcc43.patch sed -i \ -e '/HWND/d' \ + -e '/DWORD/d' \ src/porting/windows.h \ || die "sed failed" #213872 } |