Fix build with gcc-4.7 Bug #428574

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

4 files changed, 52 insertions, 24 deletions

diff --git a/games-board/freedoko/ChangeLog b/games-board/freedoko/ChangeLog
index 8126d9055079..0b67cf162067 100644
--- a/games-board/freedoko/ChangeLog
+++ b/games-board/freedoko/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/freedoko
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.18 2012/05/04 04:30:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.19 2012/09/24 08:45:18 tupone Exp $
+
+  24 Sep 2012; Tupone Alfredo <tupone@gentoo.org> freedoko-0.7.10.ebuild,
+  +files/freedoko-0.7.10-gcc47.patch:
+  Fix build with gcc-4.7 Bug #428574 by Diego
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> freedoko-0.7.8.ebuild,
   freedoko-0.7.10.ebuild:
diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
index c3fa4085f323..710bf99ae220 100644
--- a/games-board/freedoko/Manifest
+++ b/games-board/freedoko/Manifest
@@ -1,21 +1,32 @@
-AUX Fix_Cardset_Make.patch 426 RMD160 d4f5f6d013ea96d4278ab1661de56fa9d909cbce SHA1 c38d16369a9e570aab1933c9d7b21f1b5147a70e SHA256 d4a3316f5162ccce6f519e3b4c2f5afea8cf0a1a82771d8826707086bec6ff60
-AUX freedoko-0.7.10-gentoo.patch 2242 RMD160 deea0814c2a87e3dc119abcd37536c9352441dd5 SHA1 1d3c37563eda89d598b3e79e0e4764ade5e36f77 SHA256 db01c8db7c67d6626905c2243e013cc039f28cc58930ede265913dcb3e4d0dac
-AUX freedoko-0.7.8-gcc45.patch 3436 RMD160 389b1e8724a5e9f70b6c851807005cd4f500c0a8 SHA1 31e0c5c0331491fa8f435305499f9cfa50fff7cd SHA256 036304a5e6620499c29c2fbd5dfbc855c82b9bafa36c864a490dbec80a462804
-AUX freedoko-0.7.8-gentoo.patch 2202 RMD160 409a0fec80927ed4c574ea1a9ccd3ece71865e20 SHA1 ef49b1bc2aaa6863a784558a63b4590fdc852913 SHA256 01a8cbe71ea116fce42861d875d5238822cac694738fadf54191e09d09ff7c18
-AUX nodoc.patch 296 RMD160 ae6a2c57fab41d8ff0f5f36e5fdd65b0ba740259 SHA1 8cb844dcf0ab593004b77f1b5d2fb39e882fa815 SHA256 59a18e80d7ab92f52d2d4e720fa5f66b8f96b885ed5bb1d988b771527bf8d46d
-AUX nonet.patch 349 RMD160 abcf89f014e9d847189b9178f0a0016b2e3bb013 SHA1 c7627904278040bfbbd66e8ba30e451c9ec23b79 SHA256 ef6b6297c6d4a0a4ebaedd0942d2d8972a94d7dfee885476dee51fc800188215
-AUX portage-cxx.patch 409 RMD160 2ed34bc52902acfb1219639a07e5857d7ff75e3b SHA1 a062fc74085c87a4012546cf3123bfb812d43cc7 SHA256 1f408d28b674b8bf6cffabd307ed26a33700f710e4af76ae1f16eb6962702999
-DIST FreeDoko_0.7.10.manual.zip 7256278 RMD160 3cb2c72b6f1adea78a5bdb884a803b7862a79ae0 SHA1 54f90914ca6d9767ad1e334945a97012d4884586 SHA256 b68942e3eb8ba9609e648607dd938a29fe0ecde097b616c3e227563ec61dfec7
-DIST FreeDoko_0.7.10.src.zip 16261224 RMD160 c01f4c3b821ba93a9db8b3c77e686ada990477dd SHA1 f573ac0f5702a7db3291235eef3037a0dadf8e43 SHA256 0678c4a05eac29d5fa5072bea699b8f3937b6723c9830100601e63e8a3cdbbeb
-DIST FreeDoko_0.7.8.manual.zip 7153951 RMD160 0b1164ddb885ccb8907d75f3c30080105aeaeefe SHA1 c6b04d7d7d8093cf8e932ea5eb41937f4db976ff SHA256 ec418608a663b31f99f758dce4034f65a2a7da0594ec50657c71c518733203d3
-DIST FreeDoko_0.7.8.src.zip 9259311 RMD160 fc82919da922fda201b37af26dce674475992e32 SHA1 ffa9a7698576c2caa70aa2ec3ff1ac36a3823da5 SHA256 0434a2ce065808a80f0bb1137d1eed580025389e984d693b0fe19fcd816b424a
-DIST freedoko-backgrounds.zip 1067740 RMD160 dc47449484d41d8c7519c479c0cf697b691bca91 SHA1 7adcc96b14e6d61e2c0161a46b5905163e8268e8 SHA256 70129744d330976da17675b59ad3f2bc088e77a7b6b8279e866da8e74ed385ee
-DIST gnome-games.zip 3338038 RMD160 5104a63fc1ce64b3017d6f64e1829393fbe9326c SHA1 ca1a5758cc1a84ec951bb80da1d2f0eb159db833 SHA256 bf4ba39f8a95f8881c58327803ff144181f6100f9bd1ad9c383b8d500dc32cf8
-DIST kdecarddecks.zip 3370611 RMD160 c99a94e52e697c49068a31a0fc10acca7f528c86 SHA1 d01d92bdeb6fa1c9d73987269484940319353970 SHA256 07b17aaef44c5643b12089da7ffd8f8b18f8f5541e7d01fc04e53c964780cdac
-DIST openclipart.zip 1251509 RMD160 6f1738994a20c42078d1c475978bfb56118143a6 SHA1 ca188615c68a54d190e4494d82deadd28f78c140 SHA256 68b1c83e7c8325d5d2dfd4cc846571640d21af820fb675e253f8834436e15d3a
-DIST pysol.zip 26314316 RMD160 0ceb36c33e3de983e7a60df13367857fe14ddba7 SHA1 2ebe408cdfa9e40277727033fe7306438976c120 SHA256 94d0e2d6aa13e5b007efaf08af0f506f48708e3243186db77f23e2e4660c0aa6
-DIST xskat.zip 666085 RMD160 c4e10c6ca9753a544fa1197d45a6759363742f7e SHA1 af209c9b1b8b33bae657e049d146d58541296fad SHA256 77cd3d7b3305ef1c201963e512557637929b394f4c1b19d838395dda3c9f8a1d
-EBUILD freedoko-0.7.10.ebuild 2728 RMD160 a6c9e55f676f0ef007561fe1a9394a35ca44a6c7 SHA1 0da8fcf94a104c42a67ffd7a1f94b729cbf2427a SHA256 2f94452a239ad6971fe6627a95e6d9482c051ffec0bdc1e997ef8593f677a993
-EBUILD freedoko-0.7.8.ebuild 2758 RMD160 4f28f31dfff12d7569b10c967baff9cbe465566b SHA1 30e9b284b7d3932062302bbd85bcf26769e6658a SHA256 d7f0c845724779c46c0e620022dc6fb47e0f1b0cfe099aeecba94879660f9d58
-MISC ChangeLog 2946 RMD160 433e17600abf36f84de3add98d5ea4cb5e1be31c SHA1 9cf970baabb75004bf13997c799b77e3cae45bd6 SHA256 94b569a3e5af6dfb8428059cf3fd52a2ee379c61d708996ae19037509b4329b9
-MISC metadata.xml 746 RMD160 99588a5ba21684c71ad8b28463fbabba937f5727 SHA1 24667e1d234ab81743da19aa707a5c4cf5520313 SHA256 02b7fdcce405b42ea886f2a267a6a249428a9bf2c47e6a0b00793932ad56141b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX Fix_Cardset_Make.patch 426 SHA256 d4a3316f5162ccce6f519e3b4c2f5afea8cf0a1a82771d8826707086bec6ff60 SHA512 e8ad333fe3fb51d1a0addef24093db0a189f9f1718e98e2b799116a14a894b59ac164cbe4dbf633a8055e31d32fe4f9c6403c65ae20c17df23ab570529e554d5 WHIRLPOOL 3718c55ffd8ff1bc5ece5c5a21b847b899b630b6f6e1c77256c42469f12f0e7d5911c2c620c87c674272d5e8d9ed124718608a82e2bd609fdef0d255017f2c62
+AUX freedoko-0.7.10-gcc47.patch 251 SHA256 b8ab1a83c0f990a656148d181c1c4a590dfb38af2c9cc8f007dfc6ae26f2ccf6 SHA512 7f81ca3a84ee4782685b96cef90d729aaea4dbe49980ea5e5a00b869688111612c3fa8b5bafe50ca33e6cdfac8a0081fdb623b855df6e4df5e6c19a5e9a65af0 WHIRLPOOL 6d508a1e6a9cd6e569421d7da22dd3cb7124e395a35028650a2167fff690c86a01eae7ed9361f8957ed636941ffdbcd0bf7a22032590960a7145ebb05802aca9
+AUX freedoko-0.7.10-gentoo.patch 2242 SHA256 db01c8db7c67d6626905c2243e013cc039f28cc58930ede265913dcb3e4d0dac SHA512 543905ae5bca89d4fc228cc79893300bff2e27491054eee9ad8a775ee8a489c00cf95a9106dac8e015a8fd4db6147eb2d90e047a5c95c0b8120d6a7b6382b263 WHIRLPOOL c0971ce00c37a0fe6e06b16e47aa890da20aa910dc13db3b35963bfbd40d998d192ec0e696b8ec6f2ff9498b668f990fa2725fb5a5bd427c9a1277438f672430
+AUX freedoko-0.7.8-gcc45.patch 3436 SHA256 036304a5e6620499c29c2fbd5dfbc855c82b9bafa36c864a490dbec80a462804 SHA512 43a61492fe7228122df1fad32808fbdba421bdfb83a7d4d841f85316aa1df0b6971a46ad9ae8bd19ff9c267567dcdfcfb0321a807f5b755710b65a4df03c3661 WHIRLPOOL 8f2f04f42ef26d2ab6a607664143e54561b20e7e9af89e04b7277b8a6c6bd93a885bf2dcc61034ac140dbdf364a3d31542e3c1581462973832625e6bc2e95def
+AUX freedoko-0.7.8-gentoo.patch 2202 SHA256 01a8cbe71ea116fce42861d875d5238822cac694738fadf54191e09d09ff7c18 SHA512 eedcce3adda39ae62bb383f24ec1cd4828124d87cdb6076151a34c656086daf8a4e0fbb280bb8540c73bcb4a77c502e5156ded1a4ed9aff65db4ae1040e403a2 WHIRLPOOL b0f125ed46597b1e03016b9feebf62caa3d28839f60d422215d1931c6846def91aa6f2b2c15dd5d6508e655bf40816a6d3c8be9b45ac3c00a25d5e8c7333d8f1
+AUX nodoc.patch 296 SHA256 59a18e80d7ab92f52d2d4e720fa5f66b8f96b885ed5bb1d988b771527bf8d46d SHA512 05d3c5f97b3e546517ab7a6ce2b992d780da3eb75c147f4cf20dad6f9ba788942b47caa4eeb3a5db6f0658c3f247d5e1eea19f07b51fa1f0b7c1dc358f22cc45 WHIRLPOOL ea9c54af931d915bc535cb8c2c479e2301023f0fd10388292634a38b1e1e7025c199209ed903349efdc303f73562781c84e1e7c946134e3a7d9f5135f49c25ae
+AUX nonet.patch 349 SHA256 ef6b6297c6d4a0a4ebaedd0942d2d8972a94d7dfee885476dee51fc800188215 SHA512 9e4d5032771d679946f6a7459968d242615dbe7c871c2a8c46fb218e907233a1f9a1d02b3989a7a3ed848ab2161b57099104b44c20cb19cfcd4405a18e5a0b63 WHIRLPOOL b0630c23732919e159c147f12e21df4dd7322db510e538eecf84ab41885c7e3ba3fac9f4a97d2ea648268828bff7cab3a76b6b4bd2aac51d748db4f12a804a7b
+AUX portage-cxx.patch 409 SHA256 1f408d28b674b8bf6cffabd307ed26a33700f710e4af76ae1f16eb6962702999 SHA512 c689e3e75e2344afc0b223f546426ffeb1646491482bab9935bda39239badecfe6f629294f6fb7708c79d464991da5923722daa2d1dd36fa901068988f2fcacd WHIRLPOOL 68efe9f57c62dd8c9e0f69051fcf48791d004bfdab2a49f44995600d05bcc2cf14cd0705bdc323a069f00f30e9693463084d76ed34b3789ca4649388e4f63912
+DIST FreeDoko_0.7.10.manual.zip 7256278 SHA256 b68942e3eb8ba9609e648607dd938a29fe0ecde097b616c3e227563ec61dfec7
+DIST FreeDoko_0.7.10.src.zip 16261224 SHA256 0678c4a05eac29d5fa5072bea699b8f3937b6723c9830100601e63e8a3cdbbeb SHA512 c606666a8702a41d685eb6097243817cd2e1dc19cb8c9c0b8900c7fb5639491a20d3c5689fb40b61a020f346ccbe12c0a6887bb0d4564562a8345f280da39bcb WHIRLPOOL 2c58c7d0893b2657916f6ddea2f21147b4d14d13205831cf43606ff9024e3a0e3b76e670644cf265c61cb39e8d3676aa36a5c64a722e05d11f2e187421abede6
+DIST FreeDoko_0.7.8.manual.zip 7153951 SHA256 ec418608a663b31f99f758dce4034f65a2a7da0594ec50657c71c518733203d3
+DIST FreeDoko_0.7.8.src.zip 9259311 SHA256 0434a2ce065808a80f0bb1137d1eed580025389e984d693b0fe19fcd816b424a
+DIST freedoko-backgrounds.zip 1067740 SHA256 70129744d330976da17675b59ad3f2bc088e77a7b6b8279e866da8e74ed385ee SHA512 66f118a5440b854c7ad4b1bdfd63e7f3bc16e66c921a6f632637269ca8855a6a45eb05a71bfb9105abda20285e35994ff3c9c50649f70ab6de4a082e092c3a14 WHIRLPOOL 060378fa787c12b5a422acceb71526882d1ac9ebfedca7b10cb703a3c6bed183788a27cefef39d618ba130579005ae32eee8e1cb04065097f524dc3e517cf92c
+DIST gnome-games.zip 3338038 SHA256 bf4ba39f8a95f8881c58327803ff144181f6100f9bd1ad9c383b8d500dc32cf8 SHA512 42dd63c4eb696d7964b0ad30ff0032c80c93e8bd0a2517b0938005eaf8b12a584d7ce7901c6b3bb0bb55372e484162240c7719d2bf102035870b9c57f1930ec1 WHIRLPOOL c61c4f1f9c66af8c459e7210b9cee0b077d1ef6b5fc0e0df3863db2839111927a131bdd91c78676366e46fadd65fc4262465ae8e4df6046372c9e4e15c5423e0
+DIST kdecarddecks.zip 3370611 SHA256 07b17aaef44c5643b12089da7ffd8f8b18f8f5541e7d01fc04e53c964780cdac SHA512 4f3fdac3c672fd1de3db2f6603919a242db73e2445a8dac07d45dcf284cfbb56948925d6e512f15a0b4c762b71758c0755312624a0030a4d8f11dbfe65666c44 WHIRLPOOL 84998d7ff4de194cce090ac66e3cbf4dbbc27519ece008cc8c2744f900bea06d6a716279e8d6d496b463d0895077bf5d5533a7d0dcee410e717823d0228e8578
+DIST openclipart.zip 1251509 SHA256 68b1c83e7c8325d5d2dfd4cc846571640d21af820fb675e253f8834436e15d3a SHA512 8c5e84d8f8f011cfc84f7d012c97e606f80c2254336518c9b9563315bd63971e7211b762effbb841e74603e0f02bb12ae9e91d1be6a4e23c243691b025874ec2 WHIRLPOOL 38e4b30191a499d6defb8509bd7a208f2b8199e075763f2f67b4c34e2b6c152a604e4efb77e74f217bdd9071cea9edddfc77bfef5f2843621accf233189ae760
+DIST pysol.zip 26314316 SHA256 94d0e2d6aa13e5b007efaf08af0f506f48708e3243186db77f23e2e4660c0aa6 SHA512 951891631c6890144361d779bc52aed2b94a87e810de65f7ef240193c49a243e2f1a93f3e170eacb19080dd28beb99b279d7e0bc16d7cb54553e27d29e65b1f7 WHIRLPOOL b2d7a1fc3bedc16d2f179ddef809038f63dcba0382241032cca85b7e876cb33245425b907bd72156c1289a78a3b748ae0ea946fd6017bde5a9bc9bc600397322
+DIST xskat.zip 666085 SHA256 77cd3d7b3305ef1c201963e512557637929b394f4c1b19d838395dda3c9f8a1d SHA512 725bb12e983e8c1494748faf78b2e1c76c424806eeb7a88aafecf580aa63703c166907aea2bbd7890d2f972ffacc5dde78d01a82b72ab87cccf1a8e50d1034f9 WHIRLPOOL a6788d22b46873f17822e7146426ead03b5e417db6e0c264691c6885432bb2979b4deff77d314c575ed197f8c62966966b7a322dd445c9cd2cefcd7ac31b2fea
+EBUILD freedoko-0.7.10.ebuild 2761 SHA256 ae67c0694d633473bf9ef7e168f5db17bd14aa95b73fea4543b5465c50413110 SHA512 4058a63b46ba6ad3dff28108acef7d566efa579742ea9eed37ef91e295e47ff45685192594c6a2c589b324231fa85f8174abd493e925b99bb1944504b6c6224b WHIRLPOOL 1f3c7249fb2dbfe07895bcc68be123404add16033c17b082cf2fa993293eb8e7d5ccd98df2c123ff8226880c04af0a4eb4d1df0b19d137620850584b4e19c3e2
+EBUILD freedoko-0.7.8.ebuild 2758 SHA256 d7f0c845724779c46c0e620022dc6fb47e0f1b0cfe099aeecba94879660f9d58 SHA512 aa6ed558c537724f345760c0f8dc36f8f35ef93f24bd579b36cb2ff29681bd69162b5f4c7be9a341606cfd0ed3df29c0d103a9e9b1c81e368e25db9d1d076be1 WHIRLPOOL 49f662884b47c72aaa711c6f64650594396e19c09b9577c560e65bfcdf16bac562fa71443d7b392c9278e841c0896ffa070cf584759e39b1aae7a330e55347f5
+MISC ChangeLog 3105 SHA256 38812cc14a667007d13ef57d6d7c58e188c38026911ffb1aa13e39270ca81b14 SHA512 d83513f0e87ccf8eca6780a7180a40a66a103d41cded3edb830f8e2c7cbdb54ee6d5689734ae45b72145ff5248100700a04731d61b8c51793fcd531a43abc61f WHIRLPOOL 7de689f2900a137686406c3a00ab3ff840d90bedaaf90dc2f9eeff27271ed5ba154eec18e5ff74d41d3b15464a10f2dc6fc24a542b1e2e5bc2dff578533b2a0b
+MISC metadata.xml 746 SHA256 02b7fdcce405b42ea886f2a267a6a249428a9bf2c47e6a0b00793932ad56141b SHA512 92e5ea03f0735c2416421e0969a5de9a4aabb1623367b050b476ec1d3a5c5c06d957fd1e6e73c3aa7b5480b8b95fb4fe7607705b6009b2beecc5705592791b6d WHIRLPOOL 3acc8a968dad74ac4e060083c66a2d887c52207659c2926e17096a7de9fec746d0aaed0238dc4fe5e88261333abebfd8da5dac1f504da9b2e7d591c81fc6ad75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBgHakACgkQIY77eQFFFC0FDgCeKrS6UgbymftbndZjbQVzGDWV
+AdIAoJqK1y3KuzoUxy6mlUi9WrYy+oM8
+=C1aw
+-----END PGP SIGNATURE-----
diff --git a/games-board/freedoko/files/freedoko-0.7.10-gcc47.patch b/games-board/freedoko/files/freedoko-0.7.10-gcc47.patch
new file mode 100644
index 000000000000..5fc4292f81cb
--- /dev/null
+++ b/games-board/freedoko/files/freedoko-0.7.10-gcc47.patch
@@ -0,0 +1,10 @@
+--- src/freedoko.cpp.old	2012-09-24 09:49:20.770335560 +0200
++++ src/freedoko.cpp	2012-09-24 09:49:59.696057735 +0200
+@@ -37,6 +37,7 @@
+ 
+ #include "constants.h"
+ #include <time.h>
++#include <unistd.h>
+ #ifdef WINDOWS
+ // for 'mkdir'
+ #include <io.h>
diff --git a/games-board/freedoko/freedoko-0.7.10.ebuild b/games-board/freedoko/freedoko-0.7.10.ebuild
index 801e5d22d571..88de5544018d 100644
--- a/games-board/freedoko/freedoko-0.7.10.ebuild
+++ b/games-board/freedoko/freedoko-0.7.10.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-board/freedoko/freedoko-0.7.10.ebuild,v 1.5 2012/05/04 04:30:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.10.ebuild,v 1.6 2012/09/24 08:45:18 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -60,7 +60,10 @@ src_unpack() {
 	fi
 }
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+)
 
 src_compile() {
 	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"${GAMES_DATADIR}/${PN}\"'"