packages: widelands/widelands-gcc-4.5.patch (NEW) - fix build with gcc-4.5

[lisu]

Author: lisu                         Date: Mon Apr 26 13:39:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with gcc-4.5

---- Files affected:
packages/widelands:
   widelands-gcc-4.5.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/widelands/widelands-gcc-4.5.patch
diff -u /dev/null packages/widelands/widelands-gcc-4.5.patch:1.1
--- /dev/null	Mon Apr 26 15:39:49 2010
+++ packages/widelands/widelands-gcc-4.5.patch	Mon Apr 26 15:39:44 2010
@@ -0,0 +1,49 @@
+--- widelands-build15-src/src/editor/ui_menus/editor_main_menu_random_map.cc~	2010-04-16 17:41:22.000000000 +0200
++++ widelands-build15-src/src/editor/ui_menus/editor_main_menu_random_map.cc	2010-04-26 14:49:08.138178091 +0200
+@@ -272,7 +272,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;
+ 
+@@ -343,7 +343,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;
+@@ -476,7 +476,7 @@
+ 			(strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
+ 			++m_currentworld;
+ 		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());
+ 
+ 		button_clicked(-1);  // Update other values in UI as well
+ 
+--- widelands-build15-src/src/editor/ui_menus/editor_main_menu_new_map.cc~	2010-04-16 17:41:22.000000000 +0200
++++ widelands-build15-src/src/editor/ui_menus/editor_main_menu_new_map.cc	2010-04-26 15:17:52.691333135 +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;
+ 	}
================================================================