diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-10-29 20:14:52 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-10-29 20:14:52 +0000 |
| commit | ac8750cfcc5b90dcfba25deba557231a90151fcc (patch) | |
| tree | c39da29172ccd2eda2337f71f7adcc641ad0c31a /games-strategy | |
| parent | Add package.use.force for ppc64 as it requires binary only SeaBIOS (x86 BIOS)... (diff) | |
| download | historical-ac8750cfcc5b90dcfba25deba557231a90151fcc.tar.gz historical-ac8750cfcc5b90dcfba25deba557231a90151fcc.tar.bz2 historical-ac8750cfcc5b90dcfba25deba557231a90151fcc.zip | |
fix compilation for gcc-4.7 wrt #440134
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/megaglest/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/megaglest/Manifest | 19 | ||||
| -rw-r--r-- | games-strategy/megaglest/files/megaglest-3.6.0.3-gcc-4.7.patch | 34 | ||||
| -rw-r--r-- | games-strategy/megaglest/megaglest-3.6.0.3.ebuild | 4 |
4 files changed, 51 insertions, 12 deletions
diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog index a4bddc2b62b2..48fac9fba201 100644 --- a/games-strategy/megaglest/ChangeLog +++ b/games-strategy/megaglest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/megaglest # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.6 2012/09/17 22:30:05 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.7 2012/10/29 20:14:48 hasufell Exp $ + + 29 Oct 2012; Julian Ospald <hasufell@gentoo.org> megaglest-3.6.0.3.ebuild, + +files/megaglest-3.6.0.3-gcc-4.7.patch: + fix compilation for gcc-4.7 wrt #440134 17 Sep 2012; Julian Ospald <hasufell@gentoo.org> megaglest-3.6.0.3.ebuild, metadata.xml: diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest index b523de92ffcc..aefeaf2379b4 100644 --- a/games-strategy/megaglest/Manifest +++ b/games-strategy/megaglest/Manifest @@ -3,19 +3,20 @@ Hash: SHA256 AUX megaglest-3.6.0.3-as-needed.patch 909 SHA256 e3b2117f9e524e44e815d9fe7d56c7f807d0e6fd78d582f7dfa7ac0bd82d97c7 SHA512 4c2d371ebc132c5c608a2f5110af00001fb8214a0f99bd8bf1b6af61e0e5679df5593011bd2cf63489974b817ac133c157b46acf2398f11c9294e11215aae5e3 WHIRLPOOL c1397df2335f2076cf1bae3e68f02c9b717def51c706b3d7716436ee0df003fb8a5ad9927594612d0800ec13f71bdf4f90369234b70f9e5a37a7a0155f87a5e8 AUX megaglest-3.6.0.3-build.patch 1050 SHA256 fe00f58335e551b29e23efd66cb6ff16780d81c992522601981bd2a211932bc1 SHA512 f1ab9698f2a91a765a888030bb317d4ae6093f6070d7f068d142993100975be826c6db84278a6bb662b6a2e25df94b5968aa10cf9db08083d76e9c4beb4b2f62 WHIRLPOOL 04d1b7e3cd40a265a6ba181a63b28fbf5edef2b88174afda71fc5940ce2f3a65fbf77db1531c6e368619904bc5ab940279442c4d9a1b301d7f03ee9ac4020cfb +AUX megaglest-3.6.0.3-gcc-4.7.patch 910 SHA256 76527db1795587d64d4d7eb0ec9be540f5abf9619d469095f6c24e9c12d261cc SHA512 d406910fc7ab04c142e565b61b91347b20a842ca10e5575e11e788d6d147f994f5ed441d6f3b8f6155da2bcb4288a81d0387ed1bdb4f21302713b657891916e2 WHIRLPOOL 6f8b31233b607d26e64d78f8255e15d3917b239f4a084ac2e8b6c5587f8c88c40f11519403555319db0a11cddffe73a7ef3b4dfbfc1d8af8d9e54f9025788a67 AUX megaglest-3.6.0.3-static-build.patch 3821 SHA256 cca9eb7180bd4f47030d96d95ea0ff63b6ba567d1ace43df908bcb847d9b1c26 SHA512 2706643eaa597bc2629179541f180508c4d7f89f205e9a5a072671acaf0bb519ff216a5dc06feb11b74ff5614c9ef8e58f5031f3aaa66c1b27ab2f7b32927d60 WHIRLPOOL 2125cf9ab83e01d5a2987b5bf9f07f0a4e33d742585b0ff58bb6c0ae115cd2055bf4442ab26483bececa9fcba324a872af36d7a8cbb6f920797cfafbf595c28f DIST megaglest-source-3.6.0.3.tar.xz 1336432 SHA256 700b1eef534d72fa5efd329445aa085259a87dcea5e739eda629e6c41386b9f7 SHA512 0152457444c8d4ed65ed2ae565a73a2921a3706bb653fa818be03fb15d6fac196d50fc616583ce4c6fe7e76d4fb82cc83eb7c16809a90edf705701bab9c95387 WHIRLPOOL e452cd6dafb9024b663c62c9c3077af725601c6bc7b34b54cef641feb7ecbf2d1c1b6625e016e6e149055782d303a7bff78b59f29eb3c72d010c2a8b8a554b6f -EBUILD megaglest-3.6.0.3.ebuild 4612 SHA256 37872d867538104048e4c0aca6e814883d8c6da43e24bc71726340b3b0408ec4 SHA512 5243134a24b4686624648ad3e60a46ae50ab1683a6da7956218390d01257989b26f60062bacda5091c226a153f7304622bdac2b6ba054b7eeffb25288afa13d1 WHIRLPOOL 0faa953b7b7919b886aad6899c090e9454fadd7797cefacd78a06ecf4054382e6ee27176f5cb2a86ffed6f3cd4554cc56764124019c2585d27c81b36d3fa89f2 -MISC ChangeLog 1092 SHA256 057c567d33c072b2725b00c6d20658125a7d0ec1850254c45911f7f0fb328456 SHA512 3733f9e367f3b5f41efd4dbbd0155b9c1fe6f4e5affc98ddb63c76cb6a74ec8aafb5de7a74ee5cd8d66fb7393b40c92292e57c4d0ba38ba52132d247313b4dfb WHIRLPOOL 6c59e662252547798b634667ef55db23fa3a5edf39ca88f5683dd29b6c132bfb637b3e308c2d38f6ebd149d56fa0e231622b5ba8cfd2e05a98abae4ffa878bb6 +EBUILD megaglest-3.6.0.3.ebuild 4620 SHA256 1f2d532638d5bf84796af77137986b4947891af548969456117233b58b5febcb SHA512 322327af33a68da939c1a6ab7924b211f3a1ef4e3c5733d9de1ceda999563be7515d528ab95aab9a4e3c115631b06566008d307070b4a2345505748ae98f0ad1 WHIRLPOOL f354eac3ef16ac48cdf58fe8c9f6340582c24e65f04e83bbe05bb94d3fa0e37d38fbabd3fefb892c3c0d8b90265c777031a520bebb2f33211651982fdd277482 +MISC ChangeLog 1254 SHA256 65f1a095e2c19c33f2ca60ca7296d4e7f73b98d5add165e005c604d5f384c084 SHA512 cac38337b5f03ab6663f61997fb1ff1a3be7635aed6c5fa8770e27a324effda206f6272e9ef6b8f7ce9ebeb6fbf9d55e166f6292464a29446813ad4566ab2fda WHIRLPOOL edc3d8d7c083d0ac59782ebfe8f9ee3e1d6b37ca1bdca33066235faaad6c5fb6fc0e154b05f3f6d40c0408cca42dca2b6f7763a8a2723843f8dc1dd9b3dcc4c7 MISC metadata.xml 1550 SHA256 ea7604fb5e9f322911cbb140fe67410a5e8e40f4854c9691c984331d60e3bf2a SHA512 e8b697d2c6af8e42a7dd304e8c3f2325ce676bfe50f2eb626933f95ebe50fd656964f0f497451bda3be269e743f642714e9b2660f42ca23352b909af0670d7bb WHIRLPOOL 2109e05f6de9b86a543b08025bdc26987354983fed4bc2e6315d27a4254f07ea8291af1e4587a07162c8ad9d5795f5b2915b523fc617259af4de65d61c13eb61 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQV6R5AAoJEFpvPKfnPDWz1UMH/1nFUxj8sVuPW3UN+/hvVjdC -pEjDzLTErD6dxGecrVlKSYjbBnXPLL5Xzae+LXPhddJ2KRC24ufxl9M0LKSmUrz9 -Vc02CgagvptjjJgTgxoNv9tOF4K6fOqn8nlymYK5wS8Uj7ZFd8jR24/aMoqpGKFf -TAiuS4IC6orKRxAJhI8LfduCchE5KlHT2hFkr7RqoTfuLifGzPTJqa4ptgttPu+2 -kZAGMpGAvx3gRdHAmbmtp7v+3uobSVPP19agn3HKtm7U8ObXpoXANO1edMfFgcHH -mgUF9Jlv6PilfpheSwjinrix6JJa+CyTuuw7yJiYC6LyUZ4kUu3lWYReheACPUo= -=b8Qw +iQEcBAEBCAAGBQJQjuO6AAoJEFpvPKfnPDWzJ9QIAJ9ND+Nar9/GYZfyExBHYHf/ +zERu48sICU6n/H+sGIGu/12knLUQh35Mp1QyAdNGoOKmw3d64eLJbQvz7f6SGbRr +Anjsp3Y1YTIl+Zzi5jBDHDmtQnFVuhz2K+8JwFp6EudQWNFpk8x1jvJ6cMwxMxsA +nVQt6NXjDx5AP8dRsUAC79OCX4DvTmByvepAaC+SO+LMTPBreEvYZqL7A3ZZ+H1Z +vzmDo2u7MFaD9fisMLA0Tu4Qz/L8xWuPocHy0J1QlMSAkcVOSVQF2odU+wv9hEr2 +Kt/BD747Kf4szg0ZqWaVbEGJvOWOChvCIzB44d0sS5i5t2ytD8+eN51sKnX/1+k= +=o0Su -----END PGP SIGNATURE----- diff --git a/games-strategy/megaglest/files/megaglest-3.6.0.3-gcc-4.7.patch b/games-strategy/megaglest/files/megaglest-3.6.0.3-gcc-4.7.patch new file mode 100644 index 000000000000..53142f32a6d5 --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.6.0.3-gcc-4.7.patch @@ -0,0 +1,34 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Mon Oct 29 19:15:35 UTC 2012 +Subject: fix compilation for gcc-4.7 + + https://bugs.gentoo.org/show_bug.cgi?id=440134 + +--- source/shared_lib/sources/util/util.cpp ++++ source/shared_lib/sources/util/util.cpp +@@ -9,6 +9,8 @@ + // License, or (at your option) any later version + // ============================================================== + ++#include <unistd.h> ++ + #include "util.h" + + #include <ctime> +--- source/shared_lib/include/graphics/math_util.h ++++ source/shared_lib/include/graphics/math_util.h +@@ -184,10 +184,10 @@ + + Rect2<T> computeBoundingRect() const{ + return Rect2i( +- min(p[0].x, p[1].x), +- min(p[0].y, p[2].y), +- max(p[2].x, p[3].x), +- max(p[1].y, p[3].y)); ++ std::min(p[0].x, p[1].x), ++ std::min(p[0].y, p[2].y), ++ std::max(p[2].x, p[3].x), ++ std::max(p[1].y, p[3].y)); + } + + bool isInside(const Vec2<T> &pt) const{ diff --git a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild b/games-strategy/megaglest/megaglest-3.6.0.3.ebuild index 7c0eff0583ca..419f4092bf0a 100644 --- a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild +++ b/games-strategy/megaglest/megaglest-3.6.0.3.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/megaglest/megaglest-3.6.0.3.ebuild,v 1.6 2012/09/17 22:30:05 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.6.0.3.ebuild,v 1.7 2012/10/29 20:14:48 hasufell Exp $ EAPI=4 VIRTUALX_REQUIRED="manual" @@ -66,7 +66,7 @@ src_prepare() { need-wxwidgets unicode fi - epatch "${FILESDIR}"/${P}-{static-build,build,as-needed}.patch + epatch "${FILESDIR}"/${P}-{static-build,build,as-needed,gcc-4.7}.patch # Workaround for glew >=1.9.0 # https://sourceforge.net/tracker/?func=detail&aid=3565658&group_id=300350&atid=1266776 |