rpms/glest/devel glest-3.0.0-gcc43.patch, NONE, 1.1 glest.spec, 1.15, 1.16

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	glest.spec 
Added Files:
	glest-3.0.0-gcc43.patch 
Log Message:
* Sun Feb 03 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-2
- add patch for GCC 4.3 compatibility


glest-3.0.0-gcc43.patch:

--- NEW FILE glest-3.0.0-gcc43.patch ---
diff -up ./shared_lib/sources/util/conversion.cpp.gcc43 ./shared_lib/sources/util/conversion.cpp
--- ./shared_lib/sources/util/conversion.cpp.gcc43	2008-02-03 10:59:17.000000000 +0100
+++ ./shared_lib/sources/util/conversion.cpp	2008-02-03 10:59:31.000000000 +0100
@@ -13,6 +13,7 @@
 
 #include <stdexcept>
 #include <cstdio>
+#include <stdlib.h>
 
 #include "leak_dumper.h"
 
diff -up ./shared_lib/sources/util/util.cpp.gcc43 ./shared_lib/sources/util/util.cpp
--- ./shared_lib/sources/util/util.cpp.gcc43	2008-02-03 11:00:03.000000000 +0100
+++ ./shared_lib/sources/util/util.cpp	2008-02-03 11:00:13.000000000 +0100
@@ -14,6 +14,7 @@
 #include <ctime>
 #include <cassert>
 #include <stdexcept>
+#include <string.h>
 
 #include "leak_dumper.h"
 
diff -up ./shared_lib/sources/util/properties.cpp.gcc43 ./shared_lib/sources/util/properties.cpp
--- ./shared_lib/sources/util/properties.cpp.gcc43	2008-02-03 11:00:48.000000000 +0100
+++ ./shared_lib/sources/util/properties.cpp	2008-02-03 11:00:59.000000000 +0100
@@ -13,6 +13,7 @@
 
 #include <fstream>
 #include <stdexcept>
+#include <string.h>
 
 #include "conversion.h"
 #include "leak_dumper.h"
diff -up ./shared_lib/sources/platform/posix/socket.cpp.gcc43 ./shared_lib/sources/platform/posix/socket.cpp
--- ./shared_lib/sources/platform/posix/socket.cpp.gcc43	2008-02-03 10:52:25.000000000 +0100
+++ ./shared_lib/sources/platform/posix/socket.cpp	2008-02-03 10:54:05.000000000 +0100
@@ -10,6 +10,8 @@
 
 #include <stdexcept>
 #include <sstream>
+#include <stdlib.h>
+#include <string.h>
 #if defined(HAVE_SYS_IOCTL_H)
 #define BSD_COMP /* needed for FIONREAD on Solaris2 */
 #include <sys/ioctl.h>


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- glest.spec	2 Feb 2008 18:18:50 -0000	1.15
+++ glest.spec	3 Feb 2008 17:06:01 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           glest
 Version:        3.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Source1:        glest.sh
 # http://bugs.gentoo.org/attachment.cgi?id=142379
 Patch0:         glest-3.0.0-unicode.patch
+Patch1:         glest-3.0.0-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
@@ -36,6 +37,7 @@
 %prep
 %setup -q -n glest-source-%{version}
 %patch0 -p0 -b .unicode
+%patch1 -p0 -b .gcc43
 
 find . -type f | xargs sed -i -e "s/\r//g" 
 recode ISO-8859-1..UTF-8 README
@@ -119,6 +121,9 @@
 
 
 %changelog
+* Sun Feb 03 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-2
+- add patch for GCC 4.3 compatibility
+
 * Sat Feb 02 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-1
 - version 3.0.0
 - use gentoo patch for unicode