upstream fix for build failure against gcc-4.7

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 38 insertions, 12 deletions

diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog
index 317bfead9a05..c0eaf2551c49 100644
--- a/games-strategy/megaglest/ChangeLog
+++ b/games-strategy/megaglest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/megaglest
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.14 2013/05/18 16:29:37 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.15 2013/10/12 03:27:22 slyfox Exp $
+
+  12 Oct 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/megaglest-3.7.1-gcc47.patch, megaglest-3.7.1.ebuild:
+  upstream fix for build failure against gcc-4.7
 
   18 May 2013; Julian Ospald <hasufell@gentoo.org> megaglest-3.6.0.3.ebuild,
   megaglest-3.7.0.ebuild, megaglest-3.7.1.ebuild:
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index 445c2bdf6465..465160b0fe1e 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -9,6 +9,7 @@ AUX megaglest-3.7.0-as-needed.patch 952 SHA256 16c9f661e91c1415934f6e3f52a5a2603
 AUX megaglest-3.7.0-cmake.patch 1338 SHA256 745762db3540ce2c376706d2bd40e9cb6654e4360e53ab1509f8a3a7d56d4fe2 SHA512 38e24af6958b374155ba651d80088f3fffedc4099a136e4e7955a48faa6e4a42dbc2942b1eea5bd1768a3cbbaaa6c3f3faed384fec8178f9f79974510f97fba0 WHIRLPOOL f7d9b5f0a0810b946547c8222fbcf824ff7adac8be55bbf931ddaa9e4ea55b88b4e3ba53e6d49f4f18e7e591860be0be5001767187e0818c2d09a8c0b2a4ac1d
 AUX megaglest-3.7.0-static-build.patch 4148 SHA256 aad7b46e8825f951f0f07d1d60be3a7b9e4728b870b59c1589f86ef6335347d1 SHA512 7c3beff249c48969280e053dbc7eec8f2a22e817b2d05df18abc9bdfa97ad3a7a3132700077a08efda85d039bb501c62cf3ddb50b408f7e9e83bbb03cd1123fa WHIRLPOOL 4ad78f27ebc4dd6726d26ecb2b30e22af07ba17944bb4907a5156092d7388c510b3dc9ffa244fc2d83d6bf39274b32350038cdd20427d551185b28eaf3bc5e77
 AUX megaglest-3.7.1-as-needed.patch 905 SHA256 2add7ce9a6fb69c16a5da4513c57839a66abfe22995136e2617bf85c3697fa9d SHA512 cec1c5fec30b1cd7378b6cd18e09a513c1bcd64d5149af4c2bb3fbc2ff134914e96e142d78b56f6037a9e3975f3bd689894dcdc66aaae83ee59e1cd57ecb5d2b WHIRLPOOL 8e5a15b8d8798327ed8f444b2a6429327be2bd577bf1c58a8f516cad7b6f7babb57d415e8af2ba78e5b83b6918bc67da10b87f505d02e216ab777f2fc1f30bda
+AUX megaglest-3.7.1-gcc47.patch 1033 SHA256 3b68d2cc802ef53a47570faf3d15164efa94e941a40f69b188af56a7d1c09596 SHA512 113671cb7b15c56337b14e561a6a55704c10cfcf8f7897bcf78600e827030bb5108ba8e3d6b39ae5dd21a5a0f156fbdce97c4cb881bdc984e93f0545f7a94370 WHIRLPOOL ce02363705ed2504d6d6e2fd6e9482705f186018e343655dc7505350692d2fd3b69118863b7a656b3e280267102ddaf85284119cdc8c5dbb5d5d60281f921bd8
 AUX megaglest-3.7.1-miniupnpc-1.8.patch 6273 SHA256 d93fcd76a9fdbbb72b6b6c9bc2abde64433727f5833bf9e3adf145091beb05d7 SHA512 54c5c45dfe211ec462ec38c67696bbd40b630ea8976bc06d3bd704773d14aefbab7a2e60ab7e80b092b384da7ce19955cd8d5c6c140f4201ec9adefd6a9f67b3 WHIRLPOOL 9b9841aebb853fec5cf711af79f31fc5413f9626f4998822f76cd23e9624daf44cbd061cf4b467b8a019b75df7966a789cf53771dd8761bb3bdcc6efee4bf454
 AUX megaglest-3.7.1-static-build.patch 4008 SHA256 8067115f3424ce213c87ed476d227aebe5f910de935d65bb96c079b6faf44cff SHA512 0403e04783009c66a0199b2c3c793b74dd11cc89189b29494e56b826297afab8349a4e4ad1c5c5c6dc302e9d1b82b62f010ec379e28d6760c0ee89803ceef571 WHIRLPOOL 0bc7c36b10d9256dd5cc49b2c0fba93f2874b7cbf26aed7dd91f20675dff4d742736866960138d66516c4e27ca63be69f0248f82376e32494967f7125af9d291
 DIST megaglest-source-3.6.0.3.tar.xz 1336432 SHA256 700b1eef534d72fa5efd329445aa085259a87dcea5e739eda629e6c41386b9f7 SHA512 0152457444c8d4ed65ed2ae565a73a2921a3706bb653fa818be03fb15d6fac196d50fc616583ce4c6fe7e76d4fb82cc83eb7c16809a90edf705701bab9c95387 WHIRLPOOL e452cd6dafb9024b663c62c9c3077af725601c6bc7b34b54cef641feb7ecbf2d1c1b6625e016e6e149055782d303a7bff78b59f29eb3c72d010c2a8b8a554b6f
@@ -16,17 +17,13 @@ DIST megaglest-source-3.7.0.tar.xz 1442444 SHA256 5fdf2ed072c8a207a42b280929a7ce
 DIST megaglest-source-3.7.1.tar.xz 1439864 SHA256 0222196c6a274cfd1b5fd074206a6bedcf3da4f343345f3e2682e704f94adc26 SHA512 b285421175d7eeb7c52c45c9397d270ed4352ec1c9f547b5a18ec596d676a8fd00b54d7138c9b6ccba07bc8218054587ccb9822c30216a846d4da64c7a2ae600 WHIRLPOOL a8d50d49b9470aaf29121e427ee9137980f0fcbc11f962217581d679d6e7d10c2daa5a68648b45c5384ff1bfed7cfa73fb2600cf872b12f64f59729ca759872f
 EBUILD megaglest-3.6.0.3.ebuild 4602 SHA256 c50a057a15587f88127fa1dedf42135f79724e1a33d272745b574d33dc3b1564 SHA512 6d35db30ce2a3be436caccf727865644b9a89ac0ba6319fea76ce17d26c5be501fdad7e2bc4931db2d2754fc5325faed167103fbfa6578a798abde31d0b6527a WHIRLPOOL 5953781d35153af0a0d965f16f37c07aeefb21ba8575d6a51b5e664216c304843f313c7a69f3f4d6d95a405d1a814d082ab843211cab7b69518a63c9c48fd659
 EBUILD megaglest-3.7.0.ebuild 4289 SHA256 3f7182b2e27c82b1f7a11b07dd1d66394a60927cd338e0daa239544a1a936b95 SHA512 bf212ca8fd71f91f1c85320041e94c5db66035b98a4e373c20e790615f30cc58692e43afd52dd0ad9a7c5d0ec94571135bcae7a37506547bb9e032c92c9a73c5 WHIRLPOOL 71c11c44fb40f21b03c0180fc49a780a31791947febae24cb3f2bcbe7b7081de7766c7d7cb978bd2d5543c33ed2f9588029710cfef70920217158e79d7fc7045
-EBUILD megaglest-3.7.1.ebuild 4294 SHA256 2e09b87433eaf82b9ab20a3ff7be19bd5008a2222bcc2b101ea54f481114ae9a SHA512 14711f5c0dcfb5c41d14086094f9ce9a4af33befc537973f6ae319fb3a8bc35d5439a8929214c059990b6cc0f5f0ebbf8ae22a909edbbdf316bbe87ba5c26650 WHIRLPOOL 60e60e37acc65c35d0aad6d1aa64c949ac6ad629d55b78154fb4fdef1de08cea7d91b6d6d616c5b4621e34edcf5295adb3d559dad0f9f99ef29c8a5dfd235589
-MISC ChangeLog 2374 SHA256 c569d25091d92dabfd801c05193106eaf2bdc11fc4c734aac1de84280a1d49e7 SHA512 7516a3823ff20f11565a28f9a5f01cbae8b053c16df6dd4f44212fb78870f811e295e8b005db16515cda7f0df63a77719736a46e17b85897d101595cfbf149ed WHIRLPOOL e566ea04603b2e7974d26f847fe16eb640e807a85d1acfaf5bfa4eb6f4e71d3449d92c1c765b2cbb12cb0231ec70f07945a5117514697778809b384af5e0ce38
+EBUILD megaglest-3.7.1.ebuild 4298 SHA256 2e15b02937254c66fa8a0420b92f8b779fc100148c75845274e185f8551cc34c SHA512 adbc8a83747ba78c57e3b7cd3d46f3dba3dde1a2944c43866c121fb20fc4ca0a0b717cb44a6746780ee7ffec97ccf5077919a6099d307857ce46e7ae135849bf WHIRLPOOL f70beefbdbb5ed3967b656c63c8cb0a5bf5e9e62c98d5a0f984cc9c2410337db1072338df3d5874bfb1d7c5c45285ff3f8f3b124f51b61fa423392ba5d0c1cff
+MISC ChangeLog 2538 SHA256 7f63c29fa222d1e604ed7d2e6b6d063d2d09257f125bb6a4296ebef5a730c29d SHA512 d15a2f05cff3e75dc4030d66cefa458541fe55125e919caa03652460e24d0e3fa6d7b40a0f7cf2c2e50dbda9798d65dfbfbfb207d82860259e2b9f99f6fc5a41 WHIRLPOOL 61e2f79e1c466e84ab6e751e0e4c4fbc1fc11f73892f584743820db56820463fa3209a4ce6baffc122c788a664cdd94d1fd635f96e85dc1fdb33e710b21526e4
 MISC metadata.xml 1550 SHA256 ea7604fb5e9f322911cbb140fe67410a5e8e40f4854c9691c984331d60e3bf2a SHA512 e8b697d2c6af8e42a7dd304e8c3f2325ce676bfe50f2eb626933f95ebe50fd656964f0f497451bda3be269e743f642714e9b2660f42ca23352b909af0670d7bb WHIRLPOOL 2109e05f6de9b86a543b08025bdc26987354983fed4bc2e6315d27a4254f07ea8291af1e4587a07162c8ad9d5795f5b2915b523fc617259af4de65d61c13eb61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRl6x1AAoJEFpvPKfnPDWzxSAH/3APfPh9+LmhDq86BH7OlucN
-aYlOLbOD8JqeLZBopeYv0JV74wYq88wE5OV5uaFNHf4Ik+mP/4lKZC20vfrUYxAw
-zfC+MBmI6Er/nYO9t1KukIfNim5xFJ6vNhj3oF3wdqwhZWwixfHujzjzeDvIoJHO
-bx8Pp4xmXGBDzxPzPF1UBQFvzevZ72RfA/lpOwMt6SDx/LS0qA7QKAOEORS7k+oh
-oEvC8IoSfC1wBDNGp4D+Z1n3nVR3gKyLRAtALxE3M2YfssacF1xbjFw08m0b2EKO
-VJgBttJVPuzBsUXH2ZBIaoSyPAs+8ug8tSDH84VrclRmZPvxh/R8B/w9SqNxf+I=
-=DGEO
+iEYEAREIAAYFAlJYwKEACgkQcaHudmEf86qrEwCfejfbf99qZZ4pIJanoHmZsWq4
+00gAn31ZPT9h8shq/9G0YRgocYQ74miI
+=CMfP
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/megaglest/files/megaglest-3.7.1-gcc47.patch b/games-strategy/megaglest/files/megaglest-3.7.1-gcc47.patch
new file mode 100644
index 000000000000..e8389566b2a6
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.7.1-gcc47.patch
@@ -0,0 +1,25 @@
+Fix build failure against jpeg-9 (gcc-4.8)
+
+> [ 26%] Building CXX object sources/graphics/JPGReader.cpp.o
+> sources/graphics/JPGReader.cpp: In function 'boolean Shared::Graphics::fill_input_buffer(j_decompress_ptr)':
+> sources/graphics/JPGReader.cpp:40:9: error: cannot convert 'bool' to 'boolean' in return
+>   return true;
+>          ^
+> source/shared_lib/sources/graphics/JPGReader.cpp:41:1: warning: control reaches end of non-void function [-Wreturn-type]
+>  }
+>  ^
+> make[2]: *** [sources/graphics/JPGReader.cpp.o] Error 1
+
+Upstream-patch: http://megaglest.svn.sourceforge.net/viewvc/megaglest/trunk/source/shared_lib/sources/graphics/JPGReader.cpp?r1=4082&r2=4095&view=patch
+
+--- source/shared_lib/sources/graphics/JPGReader.cpp
++++ source/shared_lib/sources/graphics/JPGReader.cpp
+@@ -37,7 +37,7 @@
+ }
+ static boolean fill_input_buffer (j_decompress_ptr cinfo) {
+ 	//it is already filled
+-	return true;
++	return boolean(true);
+ }
+ static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) {
+ 	if (num_bytes > 0) {
diff --git a/games-strategy/megaglest/megaglest-3.7.1.ebuild b/games-strategy/megaglest/megaglest-3.7.1.ebuild
index b0df21221de9..aa5745fc4639 100644
--- a/games-strategy/megaglest/megaglest-3.7.1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.7.1.ebuild,v 1.5 2013/05/18 16:29:37 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.7.1.ebuild,v 1.6 2013/10/12 03:27:22 slyfox Exp $
 
 EAPI=4
 VIRTUALX_REQUIRED="manual"
@@ -66,7 +66,7 @@ src_prepare() {
 		need-wxwidgets unicode
 	fi
 
-	epatch "${FILESDIR}"/${P}-{static-build,as-needed,miniupnpc-1.8}.patch
+	epatch "${FILESDIR}"/${P}-{static-build,as-needed,miniupnpc-1.8,gcc47}.patch
 }
 
 src_configure() {