summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-05-04 21:21:39 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-05-04 21:21:39 +0000
commit0e638b59f0a1a748fb2d4c8df3d7b92dfee80235 (patch)
treea0e86faa6a066d956f595f46ac5e5af8871ab623 /games-strategy
parentFix documentation of 3 variables in php-ext-source-r2 eclass (diff)
downloadhistorical-0e638b59f0a1a748fb2d4c8df3d7b92dfee80235.tar.gz
historical-0e638b59f0a1a748fb2d4c8df3d7b92dfee80235.tar.bz2
historical-0e638b59f0a1a748fb2d4c8df3d7b92dfee80235.zip
add patch from zimous to fix building with gcc49 (bug #538580)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/glob2/ChangeLog10
-rw-r--r--games-strategy/glob2/Manifest11
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch4
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch35
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch4
-rw-r--r--games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch5
-rw-r--r--games-strategy/glob2/glob2-0.9.4.4-r1.ebuild6
7 files changed, 58 insertions, 17 deletions
diff --git a/games-strategy/glob2/ChangeLog b/games-strategy/glob2/ChangeLog
index a80e17a9b488..b6c1f7b34690 100644
--- a/games-strategy/glob2/ChangeLog
+++ b/games-strategy/glob2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for games-strategy/glob2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.60 2014/08/25 20:33:05 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.61 2015/05/04 21:21:32 mr_bones_ Exp $
+
+ 04 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/glob2-0.9.4.4-gcc49.patch, files/glob2-0.9.4.4-gcc44.patch,
+ files/glob2-0.9.4.4-scons-blows.patch, files/glob2-0.9.4.4-underlinking.patch,
+ glob2-0.9.4.4-r1.ebuild:
+ add patch from zimous to fix building with gcc49 (bug #538580)
25 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org> -glob2-0.9.4.4.ebuild:
old
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
index 373d51d79743..0a67cd077b28 100644
--- a/games-strategy/glob2/Manifest
+++ b/games-strategy/glob2/Manifest
@@ -1,7 +1,8 @@
-AUX glob2-0.9.4.4-gcc44.patch 256 SHA256 053cf0dc887340c9ded2e012e7e9dd87763fe5a6e4134e61baa791d6e8e6494c SHA512 3030cc72d80aabb0ef199b4ce86df80be9f4be4165d72cfb65bb9ea663314976f3783b911f3cb3150bdf733e54b4badbb35ba520f0e33357fe72d9d73ad9a905 WHIRLPOOL 1548598d85c326f6cf6e37ece8d801590fbeeda275a71c1e0710d332b2b29aedf85f1124afb17f0e71e7ddf0a84d0acb1206eac26cfba6ecaec40b7ec3254a66
-AUX glob2-0.9.4.4-scons-blows.patch 975 SHA256 9e9146dd8e7ee3f23c9ebbd2c3cf3d16cf4b271c75cb6cd16a9161759e6fd45b SHA512 8cc48405b8baaf753f6c290c00bd3c4e790e86386fa9c594477d2c0a28594d3080d51d2220b87a56f8e44861f3141e0c3d1f351841ea0c6e705830ecb0ed7822 WHIRLPOOL 441cdaf9f3c31d04c5098aad5b8fc24dc17914f9570de968512765e5c4f75d5c9e3f0eb56a682e43a96687955efd19ad9330ae2628385a6d7b044d9bc7225ebe
-AUX glob2-0.9.4.4-underlinking.patch 810 SHA256 d048f19acac6d00a8999156b81ce4b22a5e7120fb19aafdb3b859b9cd70947e5 SHA512 fca313ba8fcd741867bcac1224a94f5f9996a0f2f3378010909241d4ae8638f4b555a99dc6236b1f9519a3fd362686efa08a1e8e3613f1f696b98fc4321b074e WHIRLPOOL e174cf08b3e906e44e1b2d8d5c54c9cfa58d864d150b629d0a19b546b8a287a7d3dfe653c95d287d1816e7a1d0bcbbd0eab15f6adcf46340212f7efd07469e51
+AUX glob2-0.9.4.4-gcc44.patch 184 SHA256 21b1c25ecb2f55d71c0b5723b8ad8737a414f7565e08e1e527a2cbbfb794ec41 SHA512 e3d5d84c4c9240806ec97eace315b92288da4cbb28da230f91e3dc9aa224d4b7e010d4e132b53a538ae7d477a72320b27b482e9423182d1496751dbec58f461f WHIRLPOOL 303f1fa9f84251dd611f7f86e7afd08a5f13e52e1aca5a8a363038f737c7c2831f61cf57e9e1dde7becea7790a0b49025b96a3cd3236170dda0c456b153e4049
+AUX glob2-0.9.4.4-gcc49.patch 907 SHA256 23075c7e19f250c676df19cf2d3694230b1859fc1dba40aa780cc852d0036937 SHA512 7a1f19fe40effa577b2eb03ec4f2ddd7df78bff1c3df25c8b15df37d9feb03e4583e1776e4c2240130f318f9fa643d2d662492c9c5be46ed659bd587f88eafac WHIRLPOOL 08ffdef267939e8a08c6cd906123b74699f6771e18f866d59d476f9fb3b28b4b21dfb41df792d7f886b1cf1393512c98350924c090a1e263b6211259978db15b
+AUX glob2-0.9.4.4-scons-blows.patch 903 SHA256 020853f34330d2a49094102c73ef69eb3979b57cd374160a2eaf81c1fb8e3334 SHA512 b339406644261f6d38de6f8d75426d14246d2db90c95793d45ecb3c1026f419509c98379e78af4737fbb86fd10e4edfb8d0fbe7a97fa8a714cdf2ae85873a842 WHIRLPOOL 2bd4de98ed887cca4c08ac8f1d8295646b04387b859efa52d5f5347f2bbd2aeb50437271b90137ce55aad2e3e8e66af78bf1d403f4c0064682b12c15aa951578
+AUX glob2-0.9.4.4-underlinking.patch 672 SHA256 51536fd699ded8f36523ea77d1e7819ffdff744a9055be29de9e1f860d277c24 SHA512 24551c73af34badaa4a464da30c771c95082f0bfe83f351b264abddc578d5486a71f1a79b02d13ff48753e67059f8350752e77eb89397029833647bb74d79d21 WHIRLPOOL 2b6fa95e55aa3bd5e3f046ff31a86fbea41bd366954d0ead63254e1803883b5f7ad2e34456f42e63a93966639ea16562170e9ea49bc55ceecc2b2cfffa271bab
DIST glob2-0.9.4.4.tar.gz 11338986 SHA256 0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8 SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca WHIRLPOOL d151bc9601eb283a366d98ae23bd5eb6b793024c5f9b9cf49ddc55910142885e5b2f89bfdce4f879190368466f2cc01e836a9178fd899d27d4342bee4c1f9a3a
-EBUILD glob2-0.9.4.4-r1.ebuild 1456 SHA256 2d84193e5f7246c8948a1e7d1e45f5509f086e78e356a2775fd6d34f9860eb6a SHA512 7c45db0d6b601497a0f09f775f17f71830fcbd7b5d00d8158dd3dced1b0f7b19b3a36470182abcf5764add9e7e2359728a362c7e9539ac4b996b6308f303bd09 WHIRLPOOL b0f81dc429297129e1dcaaa5737b4888ff09cfaf7928877fe3b2a8e8452f4fd2d315f7bf7efffbc82d6258662153b38c26e1b0e0d6914529b7f612203f5c9e01
-MISC ChangeLog 7368 SHA256 391aa15d4c41b0b026e3214d048046c24c7557638142b6d21f0ac5671e6b439a SHA512 0fa13999a00ee5cedfc18004354d15a672b2d6045e3184020bc442ee89731c8c34d36abbfd5a19bb745c19607a6e0c7f3d5bf3bb55067b0c00e8140e33b793a6 WHIRLPOOL d79b4eb3f6604d868244962c773e2cd48192ee658a450dfd0e662d8f31d9c8b29431e81f5101a54809685fb0a961abefd86b9a98bece91c779f6dbfd557d549f
+EBUILD glob2-0.9.4.4-r1.ebuild 1468 SHA256 11c23d6c7c6c4ec66f4f281a018e265714c373114742f37d99b5739c39de620d SHA512 ab13da4c6216f783adfecf13ca4913f1d39a6e87b39c37a6dd92b34c15ed8a54f0e6b635d795b24662be1f477751523196028464366f8ab5c0e4139edd709881 WHIRLPOOL bf4879a2bbb929213572527eaf6dcf5cad04a62f6216247c798ca09da88c69c34ab1319986302a88c18a13c8f66bb1a04d32f11df77650c030720387e60f1115
+MISC ChangeLog 7666 SHA256 8c7e1941cf22702004e8f37088080e0aa95c26ab23c3b3d75bb8492f09d79242 SHA512 5be8585e3a38d0238a307a3ac9cbc1694f8a24386f290d32b5e9c7e1a900c57c4ca0d3e301c9334186decccbb539143d77b765a02cc97686bb0bb97353c5b58b WHIRLPOOL 0d021d4c5a7b6167e2db58d17d6515aa4a7a2f848dc8bf3b589852d879adc86220d663e9491e8a71add3ffe94440e489ace0fdd9c065e39bc55cd716d8f98007
MISC metadata.xml 546 SHA256 f55b8dd9eba3e7bbaf5765b86e7c434d6f53285c3aa43923c3ec247c569cf8fd SHA512 34b1d913d42b52156cf3b14f0993e11b081a33f3f56f24befcfbee8f4ee59a432cb9f7f84e54f1a385030ac2c18d79ee0367e5121baac8e5087291db7b31840f WHIRLPOOL 306897493790d0b357913d34aa803295db81e929e3eef122c145a2556f7c1901d78a44a806994650323ba3678bc3b36bd2359fe625625e51ac08037fc6afcca0
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
index 67aa1a0789c4..5ce62ea6e46c 100644
--- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
@@ -1,5 +1,5 @@
---- libgag/include/StreamBackend.h.old 2009-07-13 10:52:36.000000000 +0200
-+++ libgag/include/StreamBackend.h 2009-07-13 10:52:57.000000000 +0200
+--- libgag/include/StreamBackend.h.old
++++ libgag/include/StreamBackend.h
@@ -28,6 +28,9 @@
#ifdef putc
#undef putc
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch
new file mode 100644
index 000000000000..fca1efb5891a
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch
@@ -0,0 +1,35 @@
+From https://bugs.gentoo.org/show_bug.cgi?id=538580
+
+Works around this build failure:
+
+In file included from src/AICastor.cpp:26:0:
+src/Game.h: In member function 'void AICastor::computeBuildingNeighbourMap(int, int)':
+src/Game.h:152:9: error: 'struct Game::BuildProject' is private
+ struct BuildProject
+ ^
+src/AICastor.cpp:2296:23: error: within this context
+ for (std::list<Game::BuildProject>::iterator bpi=game->buildProjects.begin(); bpi!=game->buildProjects.end(); bpi++)
+ ^
+scons: *** [src/AICastor.o] Error 1
+scons: building terminated because of errors.
+
+patch submitted by zimous
+
+--- glob2-0.9.4.4.orig/src/Game.h
++++ glob2-0.9.4.4/src/Game.h
+@@ -149,6 +149,7 @@
+ BOTTOM_TO_TOP
+ };
+
++public:
+ struct BuildProject
+ {
+ int posX;
+@@ -159,6 +160,7 @@
+ int unitWorkingFuture;
+ };
+
++private:
+ ///Initiates Game
+ void init(GameGUI *gui, MapEdit* edit);
+
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
index e8aa31d84d94..70619f04839d 100644
--- a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
@@ -1,5 +1,5 @@
---- SConstruct.orig 2010-11-19 17:56:30.206360948 -0500
-+++ SConstruct 2010-11-19 17:58:48.914746243 -0500
+--- SConstruct.orig
++++ SConstruct
@@ -1,6 +1,7 @@
EnsureSConsVersion(0, 96, 92)
import sys
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
index 2b6342276f46..65eba48717db 100644
--- a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
@@ -1,6 +1,5 @@
-diff -burN glob2-0.9.4.4.orig/SConstruct glob2-0.9.4.4/SConstruct
---- glob2-0.9.4.4.orig/SConstruct 2009-08-30 21:23:30.000000000 +0200
-+++ glob2-0.9.4.4/SConstruct 2013-10-24 21:03:46.755492770 +0200
+--- glob2-0.9.4.4.orig/SConstruct
++++ glob2-0.9.4.4/SConstruct
@@ -110,6 +110,16 @@
print "Could not find libz or zlib1.dll"
missing.append("zlib")
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
index a7d768e51c79..33cf73dd1960 100644
--- a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
+++ b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild,v 1.4 2013/12/24 12:57:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild,v 1.5 2015/05/04 21:21:32 mr_bones_ Exp $
EAPI=5
inherit eutils gnome2-utils scons-utils games
@@ -27,7 +27,7 @@ RDEPEND="
virtual/opengl"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-{gcc44,scons-blows,underlinking}.patch )
+PATCHES=( "${FILESDIR}"/${P}-{gcc44,scons-blows,underlinking,gcc49}.patch )
src_configure() {
myesconsargs=(