Fix build with gcc-4.5 Bug #320207

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

diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index e7368b32f4abaa3f1d079a3ac14939091a5856b1..1ea54b72b0649149bcddf93ac73b34799ef99973 100644 (file)
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/widelands
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.23 2010/01/23 15:39:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.24 2010/05/19 06:45:51 tupone Exp $
+
+  19 May 2010; Tupone Alfredo <tupone@gentoo.org> widelands-0.0.14.ebuild,
+  +files/widelands-0.0.14-gcc45.patch:
+  Fix build with gcc-4.5 Bug #320207 by flameeyes@gentoo.org
 
   23 Jan 2010; Brent Baude <ranger@gentoo.org> widelands-0.0.14.ebuild:
   stable ppc, bug 299183

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index ee58b5f4ab2fb594255be8b9a89248f65f9acdd6..0b72c6d7f67113f1d2cf0df2f3d19fa37b513b6d 100644 (file)
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,5 +1,6 @@
 AUX widelands-0.0.14-build.patch 545 RMD160 5c59bdf264d1a7e4f0a6e980826530c846546f1f SHA1 29a6da13d455e47c25de3516f16b29294994bd8d SHA256 43ade110de1d6eb5c166d78c207f1d522e506f39c267a9979b262f2b4987549f
+AUX widelands-0.0.14-gcc45.patch 1620 RMD160 df16bf17fd8826ebf212c65b11655af5fe18e373 SHA1 827b3c6b4e212d4ea90a1184e950c94a41925933 SHA256 293382401d7ba7a8584cba4a64923e331daa0a766f0a1d8fa085b8aaac07a3cb
 DIST Widelands-Build14-src.7z 63758110 RMD160 a9cbda7021ab5c2200a84d75d6759e35606159b9 SHA1 405ac86ec47da830d750e4ebdea1e0e0534852b2 SHA256 553632c32edde73c1aac9db6d1f113ddd260b745b65bd5340c01c0e115966939
-EBUILD widelands-0.0.14.ebuild 1689 RMD160 7c0f5243f329dd93f7695d7d0ef387317c00f66b SHA1 b8d97fd5ba4628303f6cd25d00b1bcd977278139 SHA256 944f43c6fda40c11b600451c75e590aa71210b6c4f1fbfe7a9550c14edaded91
-MISC ChangeLog 4044 RMD160 550ecaa22242ef61786b1bfea900de20aa5ee540 SHA1 589924ef1c4a01d5e8947f2b86eeb9c50aa060c0 SHA256 c5d66b532c446b00acb870baf69c3a839d7126c5087e4e002f507f4b38b9967c
+EBUILD widelands-0.0.14.ebuild 1724 RMD160 bdb7100a5a0c9969de6a12e4bed94bd2d0234f7e SHA1 2390fd277c4cbdc94c2aeb57271e34c11e2dbc98 SHA256 e5057460eccc77c3bc3b3e37154ef37fc24e09cb5ee841c89c22fc75c3b22942
+MISC ChangeLog 4220 RMD160 345ef5a9c331146e2cec848819d20696234bae4b SHA1 1b103747a10ad59b74bdfb1d58a1da2ac7713a57 SHA256 cc38997ae30160ad563973b65f0955b078867e7954ee0ca62886f0d905d181bf
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-strategy/widelands/files/widelands-0.0.14-gcc45.patch b/games-strategy/widelands/files/widelands-0.0.14-gcc45.patch
new file mode 100644 (file)
index 0000000..caefcde
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.0.14-gcc45.patch
@@ -0,0 +1,40 @@
+--- src/editor/ui_menus/editor_main_menu_random_map.cc.old     2010-05-18 17:17:15.000000000 +0200
++++ src/editor/ui_menus/editor_main_menu_random_map.cc 2010-05-18 17:18:29.000000000 +0200
+@@ -251,7 +251,7 @@
+                posx, posy, width, height,
+                g_gr->get_picture(PicMod_UI, "pics/but1.png"),
+                &Main_Menu_New_Random_Map::button_clicked, *this, 8,
+-               Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
++               Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+ 
+       posy += height + spacing + spacing + spacing;
+ 
+@@ -322,7 +322,7 @@
+               if (m_currentworld == m_worlds.size())
+                       m_currentworld = 0;
+               m_world->set_title
+-                      (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
++                      (Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+               break;
+       case 9:
+               break;
+--- src/editor/ui_menus/editor_main_menu_new_map.cc.old        2010-05-18 17:38:29.000000000 +0200
++++ src/editor/ui_menus/editor_main_menu_new_map.cc    2010-05-18 17:38:55.000000000 +0200
+@@ -113,7 +113,7 @@
+                posx, posy, width, height,
+                g_gr->get_picture(PicMod_UI, "pics/but1.png"),
+                &Main_Menu_New_Map::button_clicked, *this, 4,
+-               Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
++               Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
+ 
+       posy += height + spacing + spacing + spacing;
+ 
+@@ -142,7 +142,7 @@
+               if (m_currentworld == m_worlds.size())
+                       m_currentworld = 0;
+               m_world->set_title
+-                      (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name
++                      (Widelands::World(m_worlds[m_currentworld].c_str()).get_name
+                               ());
+               break;
+       }

diff --git a/games-strategy/widelands/widelands-0.0.14.ebuild b/games-strategy/widelands/widelands-0.0.14.ebuild
index b1333b9726424822b8fac5c67b4c6f83a69c8d5f..a894953d620884163df69e0c835ed51c8b9eb2b8 100644 (file)
--- a/games-strategy/widelands/widelands-0.0.14.ebuild
+++ b/games-strategy/widelands/widelands-0.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.14.ebuild,v 1.7 2010/01/23 15:39:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.14.ebuild,v 1.8 2010/05/19 06:45:51 tupone Exp $
 
 EAPI=2
 inherit toolchain-funcs eutils versionator games
@@ -32,7 +32,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-build.patch
+       epatch "${FILESDIR}"/${P}-build.patch \
+               "${FILESDIR}"/${P}-gcc45.patch
 
        sed -i \
                -e 's:__ppc__:__PPC__:' src/s2map.cc \