rpms/supertux/devel supertux-0.3.1-gcc43.patch, NONE, 1.1 supertux.spec, 1.18, 1.19

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/supertux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11043

Modified Files:
	supertux.spec 
Added Files:
	supertux-0.3.1-gcc43.patch 
Log Message:
* Thu Jul 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
- Fix building with gcc-4.3 (bz 434445)


supertux-0.3.1-gcc43.patch:

--- NEW FILE supertux-0.3.1-gcc43.patch ---
diff -up supertux-0.3.1/src/addon_manager.cpp~ supertux-0.3.1/src/addon_manager.cpp
--- supertux-0.3.1/src/addon_manager.cpp~	2008-07-10 10:58:11.000000000 +0200
+++ supertux-0.3.1/src/addon_manager.cpp	2008-07-10 10:58:11.000000000 +0200
@@ -25,6 +25,7 @@
 #include <physfs.h>
 #include <sys/stat.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "addon_manager.hpp"
 #include "config.h"
 #include "log.hpp"
diff -up supertux-0.3.1/src/console.hpp~ supertux-0.3.1/src/console.hpp
--- supertux-0.3.1/src/console.hpp~	2008-07-10 10:48:45.000000000 +0200
+++ supertux-0.3.1/src/console.hpp	2008-07-10 10:57:01.000000000 +0200
@@ -26,6 +26,7 @@
 #include <string>
 #include <sstream>
 #include <iostream>
+#include <memory>
 #include <squirrel.h>
 
 class Console;
diff -up supertux-0.3.1/src/lisp/lexer.cpp~ supertux-0.3.1/src/lisp/lexer.cpp
--- supertux-0.3.1/src/lisp/lexer.cpp~	2008-07-10 11:00:49.000000000 +0200
+++ supertux-0.3.1/src/lisp/lexer.cpp	2008-07-10 11:00:49.000000000 +0200
@@ -21,6 +21,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <iostream>
+#include <string.h>
 
 #include "lexer.hpp"
 
diff -up supertux-0.3.1/src/resources.cpp~ supertux-0.3.1/src/resources.cpp
diff -up supertux-0.3.1/src/sprite/sprite_manager.hpp~ supertux-0.3.1/src/sprite/sprite_manager.hpp
--- supertux-0.3.1/src/sprite/sprite_manager.hpp~	2008-07-10 10:58:59.000000000 +0200
+++ supertux-0.3.1/src/sprite/sprite_manager.hpp	2008-07-10 10:58:59.000000000 +0200
@@ -21,6 +21,7 @@
 #define SUPERTUX_SPRITE_MANAGER_H
 
 #include <map>
+#include <string>
 
 class SpriteData;
 class Sprite;
diff -up supertux-0.3.1/src/textscroller.hpp~ supertux-0.3.1/src/textscroller.hpp
--- supertux-0.3.1/src/textscroller.hpp~	2008-07-10 10:50:27.000000000 +0200
+++ supertux-0.3.1/src/textscroller.hpp	2008-07-10 10:57:18.000000000 +0200
@@ -24,6 +24,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <memory>
 
 #include "screen.hpp"
 #include "math/vector.hpp"
diff -up supertux-0.3.1/src/title.cpp~ supertux-0.3.1/src/title.cpp
--- supertux-0.3.1/src/title.cpp~	2008-07-10 10:57:50.000000000 +0200
+++ supertux-0.3.1/src/title.cpp	2008-07-10 10:57:50.000000000 +0200
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <sstream>
 #include <stdexcept>
+#include <algorithm>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -up supertux-0.3.1/src/video/sdl_texture.hpp~ supertux-0.3.1/src/video/sdl_texture.hpp
--- supertux-0.3.1/src/video/sdl_texture.hpp~	2008-07-10 11:01:13.000000000 +0200
+++ supertux-0.3.1/src/video/sdl_texture.hpp	2008-07-10 11:01:13.000000000 +0200
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include <algorithm>
 #include <SDL.h>
 
 #include "texture.hpp"


Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- supertux.spec	20 Feb 2008 03:10:14 -0000	1.18
+++ supertux.spec	10 Jul 2008 09:26:37 -0000	1.19
@@ -6,13 +6,14 @@
 
 Name:           supertux
 Version:        0.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Jump'n run like game similar to Mario Bros
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://supertux.lethargik.org/
 #Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
 Source0:        http://download.berlios.de/supertux/supertux-%{version}d.tar.bz2
+Patch0:         supertux-0.3.1-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4
 BuildRequires:  SDL_image-devel
@@ -42,6 +43,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 # We want to just call this release "supertux", not "supertux2".
 find . -depth -name 'supertux2*' \
@@ -86,6 +88,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Jul 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
+- Fix building with gcc-4.3 (bz 434445)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.3.1-2
 - Autorebuild for GCC 4.3