rpms/ember/devel ember-0.5.5-gcc44.patch,1.1,1.2

[Alexey Torkhov]

Author: atorkhov

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

Modified 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:

Index: ember-0.5.5-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ember/devel/ember-0.5.5-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ember-0.5.5-gcc44.patch	28 Feb 2009 08:47:04 -0000	1.1
+++ ember-0.5.5-gcc44.patch	28 Feb 2009 13:02:09 -0000	1.2
@@ -1,4 +1,4 @@
-commit 33afd8c6518da44f0df1a10b4e6eeb6f7209b948
+commit e94509c5b2edcfdb3f6f74e5fdd61df575f31e5a
 Author: Alexey Torkhov <atorkhov at gmail.com>
 Date:   Sat Feb 28 10:45:27 2009 +0300
 
@@ -20,7 +20,7 @@
  namespace Ember {
  
 diff --git a/src/services/logging/LoggingService.cpp b/src/services/logging/LoggingService.cpp
-index c55ff9f..8f5807d 100644
+index f843074..505b396 100644
 --- a/src/services/logging/LoggingService.cpp
 +++ b/src/services/logging/LoggingService.cpp
 @@ -29,9 +29,8 @@
@@ -35,7 +35,7 @@
  #include <sigc++/object_slot.h>
  
 diff --git a/src/services/logging/LoggingService.h b/src/services/logging/LoggingService.h
-index 0d30ed0..dec713b 100644
+index eaae1b8..a514315 100644
 --- a/src/services/logging/LoggingService.h
 +++ b/src/services/logging/LoggingService.h
 @@ -25,13 +25,13 @@
@@ -53,3 +53,78 @@
  #endif
  
  namespace Ember
+
+commit c6cd634c4951588d12c0b7ffed51d7b6c1ec2413
+Author: Erik Hjortsberg <erik.hjortsberg at iteam.se>
+Date:   Mon Feb 23 23:59:15 2009 +0100
+
+    Fixed some missing includes.
+
+diff --git a/src/components/ogre/manipulation/EntityMoveAdjuster.h b/src/components/ogre/manipulation/EntityMoveAdjuster.h
+index ed95bab..2b52673 100644
+--- a/src/components/ogre/manipulation/EntityMoveAdjuster.h
++++ b/src/components/ogre/manipulation/EntityMoveAdjuster.h
+@@ -24,6 +24,7 @@
+ #define EMBEROGREENTITYMOVEADJUSTER_H
+ 
+ #include <Eris/Timeout.h>
++#include <vector>
+ 
+ namespace EmberOgre {
+ 
+diff --git a/src/components/ogre/widgets/InspectWidget.h b/src/components/ogre/widgets/InspectWidget.h
+index 20a6081..6b433be 100644
+--- a/src/components/ogre/widgets/InspectWidget.h
++++ b/src/components/ogre/widgets/InspectWidget.h
+@@ -23,8 +23,9 @@
+ #ifndef EMBEROGREINSPECTWIDGET_H
+ #define EMBEROGREINSPECTWIDGET_H
+ 
+-#include <Eris/Entity.h>
+ #include "Widget.h"
++#include <Eris/Entity.h>
++#include <Atlas/Message/Element.h>
+ 
+ namespace EmberOgre {
+ class EmberEntity;
+diff --git a/src/framework/bindings/lua/eris/required.h b/src/framework/bindings/lua/eris/required.h
+index 53fc498..02a77fb 100644
+--- a/src/framework/bindings/lua/eris/required.h
++++ b/src/framework/bindings/lua/eris/required.h
+@@ -1,3 +1,4 @@
+ #include <sigc++/sigc++.h>
+ #include <Eris/View.h>
+ #include <Eris/Task.h>
++#include <Atlas/Message/Element.h>
+diff --git a/src/services/server/ConnectedAdapter.cpp b/src/services/server/ConnectedAdapter.cpp
+index 00510af..9ad2d10 100644
+--- a/src/services/server/ConnectedAdapter.cpp
++++ b/src/services/server/ConnectedAdapter.cpp
+@@ -34,6 +34,8 @@
+ #include <Eris/Exceptions.h>
+ #include <Eris/Entity.h>
+ 
++#include <Atlas/Objects/Operation.h>
++
+ #include "services/logging/LoggingService.h"
+ #include "framework/ConsoleBackend.h"
+ 
+
+commit 664dca5ed2d49e463d361f0c28a53662c0f0ab4e
+Author: Erik Hjortsberg <erik.hjortsberg at iteam.se>
+Date:   Mon Jan 12 21:15:19 2009 +0100
+
+    Fix for changes to wfmath.
+
+diff --git a/src/components/ogre/terrain/TerrainInfo.h b/src/components/ogre/terrain/TerrainInfo.h
+index 53968bb..0bfcf4d 100644
+--- a/src/components/ogre/terrain/TerrainInfo.h
++++ b/src/components/ogre/terrain/TerrainInfo.h
+@@ -25,6 +25,7 @@
+ 
+ #include "../EmberOgrePrerequisites.h"
+ // #include <wfmath/wfmath.h>
++#include <wfmath/point.h>
+ #include <wfmath/axisbox.h>
+ 
+ namespace Mercator