Fix build failure against gcc-4.7 (missing prototypes)

Package-Manager: portage-2.2.0_alpha108_p3/cvs/Linux x86_64

4 files changed, 42 insertions, 5 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index c17bef140518..2189f7a99e4c 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/scorched3d
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.84 2012/05/13 19:32:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.85 2012/05/30 08:32:58 slyfox Exp $
+
+  30 May 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/scorched3d-43.3d-gcc47.patch, scorched3d-43.3d.ebuild:
+  Fix build failure against gcc-4.7 (missing prototypes)
 
   13 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
   +files/scorched3d-43.3d-gcc43.patch, +files/scorched3d-43.3d-odbc.patch,
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 47018624801f..f158827f5ad2 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scorched3d-43.2a-fixups.patch 1701 RMD160 a10ac7a58d2f2f8a39dd6904371bb203a2361a80 SHA1 dc816abd97238f1b97c06005c0bbf041b6d31287 SHA256 464552f2cd31f0f2447d7848ee1d412ce74f8b8d6f4bde67937561e8ce39b899
 AUX scorched3d-43.2a-gcc43.patch 561 RMD160 129ab9be137e0add7b14d1826a1e68680d572a55 SHA1 f08711e2bbf050e8e43e25aa396f13b964aa2e66 SHA256 7ee76b89705292ecd2ef55e416dd58a64d3bc5310bc369a26b5eb0ce469ba59e
 AUX scorched3d-43.2a-odbc.patch 503 RMD160 35e1191c6476cd9c4654592f7cb370cdb671b410 SHA1 954a0ef432c00ab4b64f92bfe0ab5ce281d9c8b3 SHA256 56d5fa2e0b59e19b74248c3a0a081e7139476305dfbfc5c905abaa1de3681d15
@@ -5,12 +8,20 @@ AUX scorched3d-43.2a-png15.patch 2438 RMD160 0e9856f5e3e6b007a7d608b23e611e95a3b
 AUX scorched3d-43.2a-win32.patch 464 RMD160 a5f71400def2260c0bd296a6e02bc74ec26c0414 SHA1 5466cf241a6900d85ff8ceebeba79e14c6866880 SHA256 325ec09315a102ebb2290007c28fe263771991a5c82908a0ef084f1f6f209b1f
 AUX scorched3d-43.3d-fixups.patch 698 RMD160 c08b5a954f000cea8dcc208f4b6c5a15d3c9bc50 SHA1 7d9cd652ee624b9ffe69832b00703ea443a0d445 SHA256 bbcfb87334913ff96db76aded98665203ddb44903c2846e03fbe2fed0b2b2429
 AUX scorched3d-43.3d-gcc43.patch 561 RMD160 129ab9be137e0add7b14d1826a1e68680d572a55 SHA1 f08711e2bbf050e8e43e25aa396f13b964aa2e66 SHA256 7ee76b89705292ecd2ef55e416dd58a64d3bc5310bc369a26b5eb0ce469ba59e
+AUX scorched3d-43.3d-gcc47.patch 858 RMD160 e8315bf52c749cc3196af5630600c59a56f9951a SHA1 ef85c22e4badf70f3cda257dd450c1ee5458013f SHA256 64ec0880ccb1d611ad41103b3ea5e28559f930dc379c80de4ed6158ffe378d97
 AUX scorched3d-43.3d-odbc.patch 503 RMD160 35e1191c6476cd9c4654592f7cb370cdb671b410 SHA1 954a0ef432c00ab4b64f92bfe0ab5ce281d9c8b3 SHA256 56d5fa2e0b59e19b74248c3a0a081e7139476305dfbfc5c905abaa1de3681d15
 AUX scorched3d-43.3d-png15.patch 2438 RMD160 0e9856f5e3e6b007a7d608b23e611e95a3be3b75 SHA1 86f74beed58895a7336b55a9e497e5fef5508ed2 SHA256 104fec74e6617581444b73f4076e288773d7d7bf469221d0cf51dae09a61f53f
 AUX scorched3d-43.3d-win32.patch 464 RMD160 a5f71400def2260c0bd296a6e02bc74ec26c0414 SHA1 5466cf241a6900d85ff8ceebeba79e14c6866880 SHA256 325ec09315a102ebb2290007c28fe263771991a5c82908a0ef084f1f6f209b1f
 DIST Scorched3D-43.2a-src.tar.gz 66822169 RMD160 f1d91afdb80220b85b82ecb87988033629c3d697 SHA1 d72e928512d4cc1c525161abd061318425a1ae40 SHA256 b13fa8b6862271efde2fb1f7d6c470ce180940cf8896f42a86a1f8b39cad61c3
 DIST Scorched3D-43.3d-src.tar.gz 93245939 RMD160 f09442b73e80e3bcd0e462527b6530ffdec6473f SHA1 a47e5095b779290f5798ad2e6eb158f930af1230 SHA256 a5e7bdc3810517ab142cfcb43951ca55d03c81252d00bc323f0f204deb62ef1c
 EBUILD scorched3d-43.2a.ebuild 1537 RMD160 1762d2dbd3714a9cbad5d54a17928ae9420de22e SHA1 15926e15d0a770c36d7b680fbcc3071bfba3c5b5 SHA256 f129ba7434379755a0251d20e5796d8c177c3319c266cfb191db828e9a3bd226
-EBUILD scorched3d-43.3d.ebuild 1694 RMD160 3d1e3d984441e918542d6f49adebfdf6a5778a46 SHA1 62024999ea184d3602649fd9c11fadef9c752cf0 SHA256 6667b70252e11a101e06d55839899213520ea930ab1930966289b089c75de46e
-MISC ChangeLog 13542 RMD160 eea18e40845dce8a2f7bfe9feecd844f5d9b2c2f SHA1 8b05d876cbbbcdafdb497c3d4d2f12b3bfc2802b SHA256 ce12ea05161f48a0d71ca21b54a9d9789fa8997ebb73bdc22de7c7478e4786bd
+EBUILD scorched3d-43.3d.ebuild 1726 RMD160 3242241b2af8faf2221c57edfb0230c9395fd1f8 SHA1 555fbee0f144249cbdda74cdd653bbcc47d36cd1 SHA256 a5e9a75ef1fa2ec0a8c73488dec14546cc51d920c15366fa0702bdc4d7c581e7
+MISC ChangeLog 13715 RMD160 9d09abf3ab5644d2e8c2643d99a7ffdca3fd838b SHA1 14fea6d6f86fed7075d95d8834619d322a567a39 SHA256 e1c347fa811d29bcfcba00562781834425d018f87dbc706ff09f854f82b5d67f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk/F20IACgkQcaHudmEf86oIvACfbcCiSwJQZzaSh0XCRbpC9fuT
+5nwAmwX0FlXG50iiQzEbG/0Az6MvCTp/
+=NGVr
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch
new file mode 100644
index 000000000000..fffd5c72685c
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch
@@ -0,0 +1,21 @@
+Fix build failure against gcc-4.7 (missing <unistd.h> for close())
+
+../client/SecureID.cpp: In member function 'std::string SecureID::GetPrivateKey()':
+../client/SecureID.cpp:92:13: error: 'close' was not declared in this scope
+../client/SecureID.cpp:102:14: error: 'close' was not declared in this scope
+../client/SecureID.cpp:115:13: error: 'close' was not declared in this scope
+../client/SecureID.cpp:124:12: error: 'close' was not declared in this scope
+
+make[3]: *** [SecureID.o] Error 1
+diff --git a/src/client/client/SecureID.cpp b/src/client/client/SecureID.cpp
+index bc276c4..5eb2f13 100644
+--- a/src/client/client/SecureID.cpp
++++ b/src/client/client/SecureID.cpp
+@@ -75,6 +75,7 @@ std::string SecureID::GetPrivateKey(void)
+ 

+ #include <sys/ioctl.h>

+ #include <net/if.h>

++#include <unistd.h>

+ 

+ std::string SecureID::GetPrivateKey(void)

+ {

diff --git a/games-strategy/scorched3d/scorched3d-43.3d.ebuild b/games-strategy/scorched3d/scorched3d-43.3d.ebuild
index 66a393ebca90..4d8e4a7ce842 100644
--- a/games-strategy/scorched3d/scorched3d-43.3d.ebuild
+++ b/games-strategy/scorched3d/scorched3d-43.3d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.2 2012/05/13 19:32:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.3 2012/05/30 08:32:58 slyfox Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -41,7 +41,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-odbc.patch \
 		"${FILESDIR}"/${P}-png15.patch \
-		"${FILESDIR}"/${P}-win32.patch
+		"${FILESDIR}"/${P}-win32.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 	eautoreconf
 }