[widelands/f14/master] * Mon Aug 2 2010 Hans de Goede <hdegoede at redhat.com> - 0-0.20.Build14 - Fix compilation with gcc-4.

[Hans de Goede]

commit 761bbafd36ef99d70bba7254e1e73bb635e9af86
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Aug 2 14:00:57 2010 +0200

    * Mon Aug  2 2010 Hans de Goede <hdegoede at redhat.com> - 0-0.20.Build14
    - Fix compilation with gcc-4.5

 widelands-gcc45.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 widelands.spec        |    7 ++++++-
 2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/widelands-gcc45.patch b/widelands-gcc45.patch
new file mode 100644
index 0000000..1542f61
--- /dev/null
+++ b/widelands-gcc45.patch
@@ -0,0 +1,42 @@
+diff -up widelands-0/widelands/src/editor/ui_menus/editor_main_menu_new_map.cc~ widelands-0/widelands/src/editor/ui_menus/editor_main_menu_new_map.cc
+--- widelands-0/widelands/src/editor/ui_menus/editor_main_menu_new_map.cc~	2009-07-11 23:34:13.000000000 +0200
++++ widelands-0/widelands/src/editor/ui_menus/editor_main_menu_new_map.cc	2010-08-02 12:45:49.886789507 +0200
+@@ -113,7 +113,7 @@ Main_Menu_New_Map::Main_Menu_New_Map(Edi
+ 		 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 @@ void Main_Menu_New_Map::button_clicked(i
+ 		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 -up widelands-0/widelands/src/editor/ui_menus/editor_main_menu_random_map.cc~ widelands-0/widelands/src/editor/ui_menus/editor_main_menu_random_map.cc
+--- widelands-0/widelands/src/editor/ui_menus/editor_main_menu_random_map.cc~	2009-07-11 23:34:13.000000000 +0200
++++ widelands-0/widelands/src/editor/ui_menus/editor_main_menu_random_map.cc	2010-08-02 13:54:18.154997895 +0200
+@@ -251,7 +251,7 @@ Main_Menu_New_Random_Map::Main_Menu_New_
+ 		 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 @@ void Main_Menu_New_Random_Map::button_cl
+ 		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;
diff --git a/widelands.spec b/widelands.spec
index 126d5a4..33b62a1 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -1,7 +1,7 @@
 %define build_id Build14
 Name:           widelands
 Version:        0
-Release:        0.19.%{build_id}%{?dist}
+Release:        0.20.%{build_id}%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@ URL:            http://www.widelands.org
 Source0:        http://downloads.sourceforge.net/%{name}/Widelands-%{build_id}-src.7z
 Patch0:         widelands.flagfix.patch
 Patch1:         widelands-boost.patch
+Patch2:         widelands-gcc45.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel
@@ -31,6 +32,7 @@ perhaps will have a thought, what Widelands is all about.
 pushd %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p2
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
 popd
 
@@ -122,6 +124,9 @@ fi
 
 
 %changelog
+* Mon Aug  2 2010 Hans de Goede <hdegoede at redhat.com> - 0-0.20.Build14
+- Fix compilation with gcc-4.5
+
 * Sat Jul 31 2010 Hans de Goede <hdegoede at redhat.com> - 0-0.19.Build14
 - Rebuild for Boost soname bump