rpms/hedgewars/devel hedgewars-0.9.0-gcc43.patch, NONE, 1.1 hedgewars.spec, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	hedgewars.spec 
Added Files:
	hedgewars-0.9.0-gcc43.patch 
Log Message:
* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-5
- Fix compilation with gcc 4.3


hedgewars-0.9.0-gcc43.patch:

--- NEW FILE hedgewars-0.9.0-gcc43.patch ---
diff -up hedgewars-0.9.0/QTfrontend/teamselect.cpp~ hedgewars-0.9.0/QTfrontend/teamselect.cpp
--- hedgewars-0.9.0/QTfrontend/teamselect.cpp~	2008-01-12 14:07:00.000000000 +0100
+++ hedgewars-0.9.0/QTfrontend/teamselect.cpp	2008-01-12 14:07:00.000000000 +0100
@@ -20,6 +20,7 @@
 #include <QPixmap>
 #include <QPushButton>
 #include <QFrame>
+#include <algorithm>
 
 #include <vertScrollArea.h>
 #include "teamselect.h"
diff -up hedgewars-0.9.0/QTfrontend/teamselhelper.cpp~ hedgewars-0.9.0/QTfrontend/teamselhelper.cpp
--- hedgewars-0.9.0/QTfrontend/teamselhelper.cpp~	2008-01-12 14:15:45.000000000 +0100
+++ hedgewars-0.9.0/QTfrontend/teamselhelper.cpp	2008-01-12 14:15:45.000000000 +0100
@@ -22,6 +22,7 @@
 #include <QPixmap>
 #include <QPainter>
 #include <QStyleFactory>
+#include <algorithm>
 
 #include "frameTeam.h"
 


Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hedgewars.spec	22 Oct 2007 09:17:34 -0000	1.3
+++ hedgewars.spec	12 Jan 2008 13:19:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hedgewars
 Version:        0.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -9,6 +9,7 @@
 Source1:        %{name}.desktop
 Source2:        %{name}.png
 Patch0:         hedgewars-0.9.0-debuginfo.patch
+Patch1:         hedgewars-0.9.0-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
 BuildRequires:  SDL_ttf-devel cmake desktop-file-utils
@@ -29,6 +30,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-5
+- Fix compilation with gcc 4.3
+
 * Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.0-4
 - Remove ExcludeArch ppc64, freepascal is available on ppc64 now (bz 284401)