summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2008-05-29 11:47:07 +0000
committerTristan Heaven <tristan@gentoo.org>2008-05-29 11:47:07 +0000
commite1aa5cf2f25b0c4be59e3bfef8fe45deac93b08d (patch)
tree2765cd1999e6db9c1ed190b8ea26f007788f5ef2
parentvirtual/motif is not a proper virtual since LessTif has a different API. (diff)
downloadhistorical-e1aa5cf2f25b0c4be59e3bfef8fe45deac93b08d.tar.gz
historical-e1aa5cf2f25b0c4be59e3bfef8fe45deac93b08d.tar.bz2
historical-e1aa5cf2f25b0c4be59e3bfef8fe45deac93b08d.zip
Fix compilation with wxGTK USE=odbc by Arttu Valo, bug #213872
Package-Manager: portage-2.2_pre7/cvs/Linux 2.6.25.4 Intel(R) Core(TM)2 Duo CPU E6750 @ 2.66GHz
-rw-r--r--games-strategy/scorched3d/ChangeLog5
-rw-r--r--games-strategy/scorched3d/Manifest14
-rw-r--r--games-strategy/scorched3d/scorched3d-41.3-r1.ebuild6
3 files changed, 21 insertions, 4 deletions
diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 2867d4fc51e1..60da47ccf0ba 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.53 2008/05/27 17:35:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.54 2008/05/29 11:47:07 nyhm Exp $
+
+ 29 May 2008; Tristan Heaven <nyhm@gentoo.org> scorched3d-41.3-r1.ebuild:
+ Fix compilation with wxGTK USE=odbc by Arttu Valo, bug #213872
27 May 2008; Markus Rothe <corsair@gentoo.org> scorched3d-41.3-r1.ebuild:
Added ~ppc64; bug #223629
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 980a887f6542..78622e76faf1 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX scorched3d-40-freealut.patch 1642 RMD160 f1b34457eb557593c9d41227353cd0d44d7e1737 SHA1 ea6eabe5a8d79f31e67b8cf2827ecbadf67789a6 SHA256 65bb549d836d2cd724cb1ab2ce41b57696f2ac0ae3ba5b9457acab57e04c039f
AUX scorched3d-40-gcc4.patch 8484 RMD160 bdd202713b9ac4d57e08a3b2bf7ff60093c110a3 SHA1 8801919284a8d75f0160d3db90e25db2635295e7 SHA256 f88e7299096cfc7a465923da247ca1f51629ce4eed3a69d5d1d0b1018e4cc1f6
AUX scorched3d-40-unicode.patch 1759 RMD160 89b0ce779ad07ad8dcb4252be3029e8251e94c0e SHA1 3cb5b91921633217be19adb1720419737a27bd56 SHA256 c84ef2cd1f60bba076ab44f8ee4417476dfd0969da0136b2c6a98727c6efbb3a
@@ -8,6 +11,13 @@ DIST Scorched3D-40.1d-src.tar.gz 55701460 RMD160 0585295e1bc32b80329be7da2203b3d
DIST Scorched3D-41.3-src.tar.gz 60672892 RMD160 517689d2fd8c9d03a975e8fdc396c235de08c144 SHA1 c38fa05ca801b484c859012086dbbc03244ae71c SHA256 a606cc93674cb2acd55389e7c54b5389408c288369077d4270bd785e430b2b03
EBUILD scorched3d-40.1d.ebuild 1351 RMD160 b85b2a7ca33abe89810f8871ca4daa98fdb6fa8e SHA1 d7adaa40d12f9620636221b7a34222daf0d6dc68 SHA256 4acede9f7946b3bae16e8b9622222eef450b4811afeedbb82239e486b704aed8
EBUILD scorched3d-40.ebuild 1440 RMD160 e1720251b26a779193a7e28719584de02a30e9f3 SHA1 c57d3cf9290cfdb816399d3b9cef05501f806b10 SHA256 dd36f917ef54d9a1fc8f8ebc1154d31ef7299535da4ededf919103fde6acf423
-EBUILD scorched3d-41.3-r1.ebuild 1637 RMD160 b056e5794fc700713d2f341a16a17b0af712549c SHA1 b10341e6c81de258dd3e4e59d1f707a587fe48ed SHA256 70e612219adf3d9be01ba5d95488c2d1f846429ee04b616b3f83410750a4ff01
-MISC ChangeLog 7262 RMD160 3d5bfbfeb1d13db67e58412ae5b972bfff5c2871 SHA1 8f9e611bd268c7736ee1fcb70cd8858edc9798ff SHA256 d17723d208572fb48451bb1188acb56d9ae502f43f933183ac29014f9ebd1f13
+EBUILD scorched3d-41.3-r1.ebuild 1717 RMD160 0fdd22b1154e0d7566d1ae8302bc0b20d63bb449 SHA1 277889f9045f3fb79384923089f13e10648bffcb SHA256 25b7151c6d33be2068999a26c3a490c13837f607bff36221f76f2cc7d482a62c
+MISC ChangeLog 7400 RMD160 2bd09243704f1c35d9cab1642b0bda9a9d874213 SHA1 f6631ceb9de2270039c5f7cba1f598517af71ad3 SHA256 4fc4fca208a2baee0da8d22c4554dbc90d4f3695dfb756cf2000db8121d981fd
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkg+l8IACgkQdz7hIScOURFlnQCcDfskhPnMJyrsFo2aO9uVx6Y2
+qCcAnjXDKRSFa4tstXX3LDS3a03UCYED
+=EaNM
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild b/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild
index 92a18a52acd8..1bd114dfac31 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.3 2008/05/27 17:35:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-41.3-r1.ebuild,v 1.4 2008/05/29 11:47:07 nyhm Exp $
inherit eutils wxwidgets games
@@ -43,6 +43,10 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-gcc43.patch
+ sed -i \
+ -e '/HWND/d' \
+ src/porting/windows.h \
+ || die "sed failed" #213872
}
src_compile() {