Gentoo Archives: gentoo-commits

From: "Alfredo Tupone (tupone)" <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-strategy/widelands/files: widelands-0.15-gcc45.patch
Date: Wed, 24 Nov 2010 13:00:07
Message-Id: 20101124130001.B008620054@flycatcher.gentoo.org
1 tupone 10/11/24 13:00:01
2
3 Added: widelands-0.15-gcc45.patch
4 Log:
5 Fix buld with gcc-4.5 Bug #346543
6
7 (Portage version: 2.1.9.24/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 games-strategy/widelands/files/widelands-0.15-gcc45.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/widelands/files/widelands-0.15-gcc45.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/widelands/files/widelands-0.15-gcc45.patch?rev=1.1&content-type=text/plain
14
15 Index: widelands-0.15-gcc45.patch
16 ===================================================================
17 --- src/editor/ui_menus/editor_main_menu_random_map.cc.old 2010-05-18 17:17:15.000000000 +0200
18 +++ src/editor/ui_menus/editor_main_menu_random_map.cc 2010-05-18 17:18:29.000000000 +0200
19 @@ -251,7 +251,7 @@
20 posx, posy, width, height,
21 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
22 &Main_Menu_New_Random_Map::button_clicked, *this, 8,
23 - Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
24 + Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
25
26 posy += height + spacing + spacing + spacing;
27
28 @@ -322,7 +322,7 @@
29 if (m_currentworld == m_worlds.size())
30 m_currentworld = 0;
31 m_world->set_title
32 - (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
33 + (Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
34 break;
35 case 9:
36 break;
37 @@ -476,7 +476,7 @@
38 (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
39 ++m_currentworld;
40 m_world->set_title
41 - (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
42 + (Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
43
44 button_clicked(-1); // Update other values in UI as well
45
46 --- src/editor/ui_menus/editor_main_menu_new_map.cc.old 2010-05-18 17:38:29.000000000 +0200
47 +++ src/editor/ui_menus/editor_main_menu_new_map.cc 2010-05-18 17:38:55.000000000 +0200
48 @@ -113,7 +113,7 @@
49 posx, posy, width, height,
50 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
51 &Main_Menu_New_Map::button_clicked, *this, 4,
52 - Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
53 + Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
54
55 posy += height + spacing + spacing + spacing;
56
57 @@ -142,7 +142,7 @@
58 if (m_currentworld == m_worlds.size())
59 m_currentworld = 0;
60 m_world->set_title
61 - (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name
62 + (Widelands::World(m_worlds[m_currentworld].c_str()).get_name
63 ());
64 break;
65 }