rpms/ember/devel ember-0.5.5-gcc44.patch, NONE, 1.1 ember.spec, 1.12, 1.13

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/ember/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23911

Modified Files:
	ember.spec 
Added Files:
	ember-0.5.5-gcc44.patch 
Log Message:
* Sat Feb 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.5-3
- Fixing build with recent compilers


ember-0.5.5-gcc44.patch:

--- NEW FILE ember-0.5.5-gcc44.patch ---
commit 33afd8c6518da44f0df1a10b4e6eeb6f7209b948
Author: Alexey Torkhov <atorkhov at gmail.com>
Date:   Sat Feb 28 10:45:27 2009 +0300

    Including headers in logging service required by recent compilers.

diff --git a/src/services/logging/FileObserver.h b/src/services/logging/FileObserver.h
index 88178c1..a4dc7c8 100644
--- a/src/services/logging/FileObserver.h
+++ b/src/services/logging/FileObserver.h
@@ -25,8 +25,9 @@
 
 #include "Observer.h"
 #include <ctime>
-#include <stdarg.h>
+#include <cstdarg>
 #include <memory>
+#include <cstdio>
 
 namespace Ember {
 
diff --git a/src/services/logging/LoggingService.cpp b/src/services/logging/LoggingService.cpp
index c55ff9f..8f5807d 100644
--- a/src/services/logging/LoggingService.cpp
+++ b/src/services/logging/LoggingService.cpp
@@ -29,9 +29,8 @@
 // Include system headers here
 #include <string>
 #include <list>
-#include <stdio.h>
+#include <cstdio>
 #include <sstream>
-//#include <varargs.h> //TODO: Needed by unix?
 
 #include <sigc++/object_slot.h>
 
diff --git a/src/services/logging/LoggingService.h b/src/services/logging/LoggingService.h
index 0d30ed0..dec713b 100644
--- a/src/services/logging/LoggingService.h
+++ b/src/services/logging/LoggingService.h
@@ -25,13 +25,13 @@
 #include "framework/Singleton.h"
 
 // Include library headers here
+#include <cstdarg>
 #include <memory>
 #include <sigc++/object.h>
 
 #ifdef WIN32
     // These are needed by mingw
     #include <ctime>
-    #include <stdarg.h>
 #endif
 
 namespace Ember


Index: ember.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ember/devel/ember.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ember.spec	24 Feb 2009 14:50:43 -0000	1.12
+++ ember.spec	28 Feb 2009 08:47:04 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           ember
 Version:        0.5.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        3D client for WorldForge
 
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://www.worldforge.org/dev/eng/clients/ember
 Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
+Patch0:         ember-0.5.5-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel tinyxml-devel DevIL-devel cegui-devel ogre-devel
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Encoding fix
 iconv -f iso-8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
@@ -88,6 +90,9 @@
 
 
 %changelog
+* Sat Feb 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.5-3
+- Fixing build with recent compilers
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild