rpms/widelands/devel widelands.spec,1.6,1.7

[Karol Trzcionka (karlik)]

Author: karlik

Update of /cvs/pkgs/rpms/widelands/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6010

Modified Files:
	widelands.spec 
Log Message:
Rebuild for gcc43


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- widelands.spec	9 Feb 2008 15:57:22 -0000	1.6
+++ widelands.spec	10 Feb 2008 20:49:31 -0000	1.7
@@ -1,7 +1,7 @@
 %define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.8.build11%{?dist}
+Release:        0.9.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
@@ -30,6 +30,19 @@
 %setup -q -n %{name}
 %patch0 -p0
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
+#begin porting to gcc43
+find src -type f -exec sed -i 's/#include <string>/#include <string>\n#include <cstring>/' {} \; ;
+sed -i 's/#include <stdexcept>/#include <stdexcept>\n#include <typeinfo>/' src/main.cc
+sed -i 's/#include <algorithm>/#include <algorithm>\n#include <climits>/' src/network.cc
+sed -i 's/#include <vector>/#include <vector>\n#include <algorithm>/' src/text_parser.cc
+sed -i 's/user_info(std::string name, std::string name, std::string room)/user_info(std::string user, std::string game, std::string room)/' src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.h
+sed -i 's/#include <cstdarg>/#include <cstdarg>\n#include <algorithm>/' src/transport.cc
+sed -i 's/#include <set>/#include <set>\n#include <algorithm>/' src/editor_game_base.cc
+sed -i 's/std::abs/abs/' src/ui/ui_basic/ui_window.cc
+sed -i 's/#include <vector>/#include <vector>\n#include <climits>\n#include <cstdlib>/' src/editor/tools/multi_select.h
+sed -i 's/#include <vector>/#include <vector>\n#include <climits>\n#include <cstdlib>/' src/filesystem/filesystem.cc
+sed -i 's/#include <cstring>/#include <cstring>\n#include <cstdlib>/' src/filesystem/zip_filesystem.cc
+#end
 
 %build
 scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
@@ -110,6 +123,8 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Sun Feb 10 2008 Karol Trzcionka <karlikt at gmail.com> - 0-0.9.build11
+- Fix building with gcc43
 * Sat Feb 09 2008 Karol Trzcionka <karlikt at gmail.com> - 0-0.8.build11
 - Rebuild for gcc43
 - Changes in desktop file