rpms/cyphesis/devel cyphesis-0.5.18-gcc44.patch, NONE, 1.1 cyphesis.spec, 1.31, 1.32

[Alexey Torkhov]

Author: atorkhov

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

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


cyphesis-0.5.18-gcc44.patch:

--- NEW FILE cyphesis-0.5.18-gcc44.patch ---
commit 6b9737032d61e939065023bb587bce315c399c52
Author: Al Riddoch <alriddoch at googlemail.com>
Date:   Mon Jan 12 07:09:59 2009 +0000

    2009-01-12  Al Riddoch  <alriddoch at googlemail.com>
    
    	* physics/BBox.h: Use wfmath forward declarations.
    
    	* modules/Location.h, physics/BBox.cpp, rulesets/BBoxProperty.h,
    	  rulesets/Py_BBox.h: Include axisbox.h definition where required.

diff --git a/modules/Location.h b/modules/Location.h
index 8a5befa..80c4a3e 100644
--- a/modules/Location.h
+++ b/modules/Location.h
@@ -29,6 +29,10 @@
 
 #include <sigc++/trackable.h>
 
+#include <wfmath/axisbox.h>
+#include <wfmath/point.h>
+#include <wfmath/quaternion.h>
+
 class LocatedEntity;
 
 class Location : virtual public sigc::trackable {
diff --git a/physics/BBox.cpp b/physics/BBox.cpp
index f62cde8..b5b911a 100644
--- a/physics/BBox.cpp
+++ b/physics/BBox.cpp
@@ -15,12 +15,14 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-// $Id: BBox.cpp,v 1.7 2006-10-26 00:48:06 alriddoch Exp $
+// $Id$
 
 #include "BBox.h"
 
 #include "common/const.h"
 
+#include <wfmath/axisbox.h>
+
 WFMath::CoordType boxSquareSize(const BBox & box)
 {
     if (!box.isValid()) {
diff --git a/physics/BBox.h b/physics/BBox.h
index 253186a..7131c9c 100644
--- a/physics/BBox.h
+++ b/physics/BBox.h
@@ -15,12 +15,14 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-// $Id: BBox.h,v 1.17 2006-10-26 00:48:07 alriddoch Exp $
+// $Id$
 
 #ifndef PHYSICS_BBOX_H
 #define PHYSICS_BBOX_H
 
-#include <wfmath/axisbox.h>
+#include <wfmath/const.h>
+
+#include <cmath>
 
 typedef WFMath::AxisBox<3> BBox;
 
diff --git a/rulesets/BBoxProperty.h b/rulesets/BBoxProperty.h
index 8e77648..51a8d9e 100644
--- a/rulesets/BBoxProperty.h
+++ b/rulesets/BBoxProperty.h
@@ -24,6 +24,8 @@
 
 #include "physics/BBox.h"
 
+#include <wfmath/axisbox.h>
+
 /// \brief Class to handle Entity bbox property
 /// \ingroup PropertyClasses
 class BBoxProperty : public PropertyBase {
diff --git a/rulesets/Py_BBox.h b/rulesets/Py_BBox.h
index 1844197..75f107a 100644
--- a/rulesets/Py_BBox.h
+++ b/rulesets/Py_BBox.h
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-// $Id: Py_BBox.h,v 1.10 2007-07-03 01:22:47 alriddoch Exp $
+// $Id$
 
 #ifndef RULESETS_PY_BBOX_H
 #define RULESETS_PY_BBOX_H
@@ -24,6 +24,8 @@
 
 #include "physics/BBox.h"
 
+#include <wfmath/axisbox.h>
+
 /// \brief Wrapper for BBox for Python
 ///
 /// Uses in-place construction to embed full C++ object into what is
commit 76281c1d9e32c719771fbde05c9f085d02b3eee6
Author: Al Riddoch <alriddoch at googlemail.com>
Date:   Mon Jan 12 16:15:21 2009 +0000

    2009-01-12  Al Riddoch  <alriddoch at googlemail.com>
    
    	* physics/BBox.cpp, rulesets/BBoxProperty.h, rulesets/Py_BBox.h:
    	  Include more wfmath headers as it makes better use of forward
    	  declarations.

diff --git a/physics/BBox.cpp b/physics/BBox.cpp
index b5b911a..93d00ff 100644
--- a/physics/BBox.cpp
+++ b/physics/BBox.cpp
@@ -22,6 +22,7 @@
 #include "common/const.h"
 
 #include <wfmath/axisbox.h>
+#include <wfmath/point.h>
 
 WFMath::CoordType boxSquareSize(const BBox & box)
 {
diff --git a/rulesets/BBoxProperty.h b/rulesets/BBoxProperty.h
index 51a8d9e..47f5d93 100644
--- a/rulesets/BBoxProperty.h
+++ b/rulesets/BBoxProperty.h
@@ -25,6 +25,7 @@
 #include "physics/BBox.h"
 
 #include <wfmath/axisbox.h>
+#include <wfmath/point.h>
 
 /// \brief Class to handle Entity bbox property
 /// \ingroup PropertyClasses
diff --git a/rulesets/Py_BBox.h b/rulesets/Py_BBox.h
index 75f107a..b9aee82 100644
--- a/rulesets/Py_BBox.h
+++ b/rulesets/Py_BBox.h
@@ -25,6 +25,7 @@
 #include "physics/BBox.h"
 
 #include <wfmath/axisbox.h>
+#include <wfmath/point.h>
 
 /// \brief Wrapper for BBox for Python
 ///


Index: cyphesis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyphesis/devel/cyphesis.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cyphesis.spec	24 Feb 2009 10:37:30 -0000	1.31
+++ cyphesis.spec	28 Feb 2009 13:38:56 -0000	1.32
@@ -4,7 +4,7 @@
 
 Name:           cyphesis
 Version:        0.5.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -16,6 +16,7 @@
 Source7:        logwatch.shared.applycyphesisdate
 Patch0:         cyphesis-0.5.18-init.patch
 Patch1:         cyphesis-0.5.11-logdir.patch
+Patch2:         cyphesis-0.5.18-gcc44.patch
 Patch5:         cyphesis-0.5.17-py26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel libgcrypt-devel pkgconfig atlascpp-devel
@@ -24,7 +25,7 @@
 BuildRequires:  autoconf automake
 
 Requires:       postgresql-server
-Requires(pre): shadow-utils
+Requires(pre):  shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -52,6 +53,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 %patch5 -p1 -b .py26
 
 chmod a-x rulesets/basic/mind/dictlist.py
@@ -165,6 +167,9 @@
 
 
 %changelog
+* Sat Feb 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.18-3
+- Fixing build with recent compilers
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild