diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-09-22 21:59:07 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-09-22 21:59:07 +0000 |
| commit | 00cda0c9932cf03792f3968780c2ef864ef9c77d (patch) | |
| tree | 9768c28beaa885ec7afd750c89e24a4838761258 /games-strategy/scorched3d | |
| parent | Stable for HPPA (bug #284574). (diff) | |
| download | gentoo-2-00cda0c9932cf03792f3968780c2ef864ef9c77d.tar.gz gentoo-2-00cda0c9932cf03792f3968780c2ef864ef9c77d.tar.bz2 gentoo-2-00cda0c9932cf03792f3968780c2ef864ef9c77d.zip | |
Add patch from Bob Johnson to enable build with x11-libs/wxGTK[odbc] (bug #285384)
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-strategy/scorched3d')
| -rw-r--r-- | games-strategy/scorched3d/ChangeLog | 7 | ||||
| -rw-r--r-- | games-strategy/scorched3d/files/scorched3d-42.1-odbc.patch | 17 | ||||
| -rw-r--r-- | games-strategy/scorched3d/scorched3d-42.1.ebuild | 6 |
3 files changed, 25 insertions, 5 deletions
diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog index e7248b242a67..5d303af55167 100644 --- a/games-strategy/scorched3d/ChangeLog +++ b/games-strategy/scorched3d/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-strategy/scorched3d # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.63 2009/09/19 12:27:58 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.64 2009/09/22 21:59:07 mr_bones_ Exp $ + + 22 Sep 2009; Michael Sterrett <mr_bones_@gentoo.org> + scorched3d-42.1.ebuild, +files/scorched3d-42.1-odbc.patch: + Add patch from Bob Johnson to enable build with x11-libs/wxGTK[odbc] (bug + #285384) 19 Sep 2009; Markus Meier <maekke@gentoo.org> scorched3d-42.1.ebuild: amd64/x86 stable, bug #285384 diff --git a/games-strategy/scorched3d/files/scorched3d-42.1-odbc.patch b/games-strategy/scorched3d/files/scorched3d-42.1-odbc.patch new file mode 100644 index 000000000000..355755e7cdb0 --- /dev/null +++ b/games-strategy/scorched3d/files/scorched3d-42.1-odbc.patch @@ -0,0 +1,17 @@ +When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build. +bug #285384 - patch from Bob Johnson + +diff -urN scorched/src/common/porting/windows.h fix_scorched/src/common/porting/windows.h +--- scorched/src/common/porting/windows.h 2009-09-21 10:21:16.000000000 -0700 ++++ fix_scorched/src/common/porting/windows.h 2009-09-21 10:39:02.000000000 -0700 +@@ -11,8 +11,8 @@ +
+ typedef char * LPSTR;
+ typedef const char * LPCTSTR;
+-typedef unsigned int DWORD;
+-typedef unsigned int * LPDWORD;
++typedef unsigned long DWORD;
++typedef DWORD * LPDWORD;
+ typedef unsigned char * LPBYTE;
+ typedef int INT;
+ typedef long LONG;
diff --git a/games-strategy/scorched3d/scorched3d-42.1.ebuild b/games-strategy/scorched3d/scorched3d-42.1.ebuild index 13909159d299..63cba04b1055 100644 --- a/games-strategy/scorched3d/scorched3d-42.1.ebuild +++ b/games-strategy/scorched3d/scorched3d-42.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.1.ebuild,v 1.3 2009/09/19 12:27:58 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.1.ebuild,v 1.4 2009/09/22 21:59:07 mr_bones_ Exp $ EAPI=2 WX_GTK_VER=2.8 @@ -36,9 +36,7 @@ DEPEND="media-libs/libsdl S=${WORKDIR}/scorched src_prepare() { - epatch \ - "${FILESDIR}"/${P}-fixups.patch \ - "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-*.patch eautoreconf } |