- fix build with gcc-4.5

Changed files:
    widelands-gcc-4.5.patch -> 1.1
    widelands.spec -> 1.26

diff --git a/widelands-gcc-4.5.patch b/widelands-gcc-4.5.patch
new file mode 100644 (file)
index 0000000..0f9a54c
--- /dev/null
+++ b/widelands-gcc-4.5.patch
@@ -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;
+       }

diff --git a/widelands.spec b/widelands.spec
index 4002be89efa41b14301b58a5d092d594c9a976c8..38c611103e0bcffd52bcaebb36224278f2a5a511 100644 (file)
--- a/widelands.spec
+++ b/widelands.spec
@@ -14,6 +14,7 @@ Source0:      http://launchpad.net/widelands/build%{buildver}/build%{buildver}/+downl
 # Source0-md5: 5b2e2d0913272f66055e424f91360b1d
 Source1:       %{name}.desktop
 Patch0:                %{name}-locale.patch
+Patch1:                %{name}-gcc-4.5.patch
 URL:           http://widelands.sourceforge.net/
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: OpenGL-devel
@@ -57,6 +58,7 @@ nastawione i rozpocząć z Tobą handel. Jednak, jeśli chcesz rządzić
 %prep
 %setup -q -n %{name}-build%{buildver}-src
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build