Add patch from Bob Johnson to enable build with x11-libs/wxGTK[odbc] (bug #285384)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 28 insertions, 17 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/Manifest b/games-strategy/scorched3d/Manifest
index 3cc401373ebb..3931c227ada2 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scorched3d-41.3-gcc43.patch 1822 RMD160 1ec0e6808f78e3431fd2c7634774943a55a7b4d0 SHA1 42a92eae55440f7da3c2c60278686515ab217fcd SHA256 7430531c43b80f9cd4331c245297e1428efd0623347a0050bb4d8ef61156f87d
 AUX scorched3d-42.1-fixups.patch 1967 RMD160 d06d0c20c5e65907a680ba39ebbbc57ee14a25cb SHA1 d13d821bca8c342bf04d5de0f5925649890c18c4 SHA256 7487d6708bfe250925cd7b425e200e5f566920c4fbb0376e3a5922bd60828934
 AUX scorched3d-42.1-gcc43.patch 875 RMD160 b52c37c3210c5ea0629f5f00283a4a63fa5c3561 SHA1 6be351b7b56206d8540c0938e06759cc6ee0c0e2 SHA256 f139415a4deca70dc0ad087ce6714359d4076df89228e7ea1e61aa100e0558c8
+AUX scorched3d-42.1-odbc.patch 665 RMD160 00d9966808a9b61a45223cce0ba50116774f243e SHA1 71b0f9308e743dd1630977467c12b3caf89bb446 SHA256 27e8af602e38579f87b83bc67afc7c3fde012e058f73dab7b5e63f22752bb1be
 DIST Scorched3D-41.3-src.tar.gz 60672892 RMD160 517689d2fd8c9d03a975e8fdc396c235de08c144 SHA1 c38fa05ca801b484c859012086dbbc03244ae71c SHA256 a606cc93674cb2acd55389e7c54b5389408c288369077d4270bd785e430b2b03
 DIST Scorched3D-42.1-src.tar.gz 64491145 RMD160 ed8a621875d19eb4d7314293439f4c2a0b5a5276 SHA1 041e3b3dd47a7881738eb5d66885d7f339eb01ce SHA256 884eccfed5fda58c140c4a593806c0c366a695660c47cdd4ea8d96189189106e
 EBUILD scorched3d-41.3-r1.ebuild 1808 RMD160 2c5cda4b5587393e3b71a6f6aa99da9b38c5967f SHA1 1beb80ad2df2f2b389e6bf68f72b248b5a714657 SHA256 a7ea93c29fdfb63688c2725499f429ecfac6b87c4ddd8540dc7813f4c8c683cf
-EBUILD scorched3d-42.1.ebuild 1563 RMD160 fb2f5138af5c03250253cba64e37ca1829d9f0e9 SHA1 c6fee0b3b915d5ec045c3dadeaa08dbc52bbed56 SHA256 866982bb974d2c73f3632760994220127570b85bb0c72e2f707ce27ef1e0dab0
-MISC ChangeLog 8800 RMD160 51856e234c176618084e3af5f72757e843c4b538 SHA1 d44355f3b7dff2d9c81cb350f4a22d1e13af41bd SHA256 b2f8a48d3546d7fe0a0e0b3655dd41f7ced10ac5a222a017f738511747577fad
+EBUILD scorched3d-42.1.ebuild 1522 RMD160 7804e6353770964057734b49c153b3ae2fd0b6f7 SHA1 a154630e2e518280ef7575d15bf46010280e99b5 SHA256 bb04c0dc8a9b282a568bbcfda1f2c672ec06b9e164bbe9515e88cdbb9dc99f16
+MISC ChangeLog 9007 RMD160 461ad8e2fa66587aeed069f20281a11d3c0d99b3 SHA1 9a58038b17369355bbcd88f665513c0547113480 SHA256 c6f2223fbfdf7b9408624b396efe52a0d5e0d97260ad617b383044fea7d2c272
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq0zoAACgkQkKaRLQcq0GJitQCfc+J3CXllnVAqByjxMEZ3fj1i
-5RQAn3pfnAqc06AvA/T4IdwsdUkG8QVj
-=pEIZ
------END PGP SIGNATURE-----
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
 }