rpms/sear/devel sear-0.6.3-gcc44.patch, NONE, 1.1 sear.spec, 1.11, 1.12
Alexey Torkhov
atorkhov at fedoraproject.org
Sat Feb 28 17:13:22 UTC 2009
Author: atorkhov
Update of /cvs/pkgs/rpms/sear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26540
Modified Files:
sear.spec
Added Files:
sear-0.6.3-gcc44.patch
Log Message:
* Sat Feb 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.3-13
- Fix build with recent compilers
sear-0.6.3-gcc44.patch:
--- NEW FILE sear-0.6.3-gcc44.patch ---
diff -ur sear-0.6.3/common/Log.cpp sear-0.6.3.new/common/Log.cpp
--- sear-0.6.3/common/Log.cpp 2006-04-26 19:26:22.000000000 +0400
+++ sear-0.6.3.new/common/Log.cpp 2009-02-28 17:06:05.000000000 +0300
@@ -6,6 +6,8 @@
#include "Log.h"
+#include <cstdio>
+
/* LOG AIMS
* Will provide ability to log each type to a different file
* FREQUENT LOG ACTIONS SHOULD BE IN A #if #endif BLOCK and
diff -ur sear-0.6.3/common/Matrix.h sear-0.6.3.new/common/Matrix.h
--- sear-0.6.3/common/Matrix.h 2006-10-25 21:28:39.000000000 +0400
+++ sear-0.6.3.new/common/Matrix.h 2009-02-28 16:52:59.000000000 +0300
@@ -7,6 +7,8 @@
#ifndef SEAR_MATRIX_H
#define SEAR_MATRIX_H 1
+#include <cmath>
+
namespace Sear {
class Matrix {
diff -ur sear-0.6.3/common/Utility.cpp sear-0.6.3.new/common/Utility.cpp
--- sear-0.6.3/common/Utility.cpp 2007-01-24 12:41:10.000000000 +0300
+++ sear-0.6.3.new/common/Utility.cpp 2009-02-28 16:52:59.000000000 +0300
@@ -7,6 +7,7 @@
#include "Utility.h"
#include <wfmath/quaternion.h>
+#include <wfmath/point.h>
#include <stdio.h>
#include <string>
#include <map>
diff -ur sear-0.6.3/configure sear-0.6.3.new/configure
--- sear-0.6.3/configure 2009-02-28 16:50:43.000000000 +0300
+++ sear-0.6.3.new/configure 2009-02-28 16:51:31.000000000 +0300
@@ -21536,7 +21536,7 @@
MERCATOR_VERSION=0.2.4
VARCONF_VERSION=0.6.3
-ERIS_VERSION=1.3.13
+ERIS_VERSION=1.3.14
SAGE_VERSION=0.2.0
diff -ur sear-0.6.3/configure.ac sear-0.6.3.new/configure.ac
--- sear-0.6.3/configure.ac 2009-02-28 16:50:43.000000000 +0300
+++ sear-0.6.3.new/configure.ac 2009-02-28 16:51:25.000000000 +0300
@@ -175,7 +175,7 @@
MERCATOR_VERSION=0.2.4
VARCONF_VERSION=0.6.3
-ERIS_VERSION=1.3.13
+ERIS_VERSION=1.3.14
SAGE_VERSION=0.2.0
PKG_CHECK_MODULES(PKGCHECKS, mercator-0.2 >= $MERCATOR_VERSION varconf-1.0 >= $VARCONF_VERSION eris-1.3 = $ERIS_VERSION sage >= $SAGE_VERSION,
diff -ur sear-0.6.3/environment/Weather.cpp sear-0.6.3.new/environment/Weather.cpp
--- sear-0.6.3/environment/Weather.cpp 2007-02-06 00:03:55.000000000 +0300
+++ sear-0.6.3.new/environment/Weather.cpp 2009-02-28 17:14:27.000000000 +0300
@@ -17,6 +17,8 @@
#include <sage/GL.h>
#include <sage/GLU.h>
+#include <Atlas/Message/Element.h>
+
#include "common/Utility.h"
#include "src/WorldEntity.h"
diff -ur sear-0.6.3/guichan/StatusWindow.cpp sear-0.6.3.new/guichan/StatusWindow.cpp
--- sear-0.6.3/guichan/StatusWindow.cpp 2006-10-07 00:37:43.000000000 +0400
+++ sear-0.6.3.new/guichan/StatusWindow.cpp 2009-02-28 17:14:27.000000000 +0300
@@ -12,6 +12,8 @@
#include <Eris/Entity.h>
+#include <Atlas/Message/Element.h>
+
#include <guichan.hpp>
#include <sigc++/bind.h>
diff -ur sear-0.6.3/loaders/AreaModel.cpp sear-0.6.3.new/loaders/AreaModel.cpp
--- sear-0.6.3/loaders/AreaModel.cpp 2007-01-26 19:26:03.000000000 +0300
+++ sear-0.6.3.new/loaders/AreaModel.cpp 2009-02-28 17:14:51.000000000 +0300
@@ -6,6 +6,8 @@
#include <Mercator/Area.h>
+#include <Atlas/Message/Element.h>
+
#include "environment/Environment.h"
#include "src/WorldEntity.h"
diff -ur sear-0.6.3/loaders/BoundBox.cpp sear-0.6.3.new/loaders/BoundBox.cpp
--- sear-0.6.3/loaders/BoundBox.cpp 2006-12-03 14:32:11.000000000 +0300
+++ sear-0.6.3.new/loaders/BoundBox.cpp 2009-02-28 16:52:59.000000000 +0300
@@ -9,6 +9,7 @@
#include "BoundBox.h"
#include "StaticObject.h"
+#include <wfmath/point.h>
#ifdef DEBUG
static const bool debug = true;
diff -ur sear-0.6.3/loaders/ParticleSystem.h sear-0.6.3.new/loaders/ParticleSystem.h
--- sear-0.6.3/loaders/ParticleSystem.h 2006-02-16 13:44:21.000000000 +0300
+++ sear-0.6.3.new/loaders/ParticleSystem.h 2009-02-28 16:52:59.000000000 +0300
@@ -10,6 +10,8 @@
#include "loaders/Model.h"
+#include <wfmath/point.h>
+
namespace Sear {
class DynamicObject;
Только в sear-0.6.3.new/loaders: ParticleSystem.h.orig
diff -ur sear-0.6.3/renderers/Frustum.cpp sear-0.6.3.new/renderers/Frustum.cpp
--- sear-0.6.3/renderers/Frustum.cpp 2006-07-10 20:53:48.000000000 +0400
+++ sear-0.6.3.new/renderers/Frustum.cpp 2009-02-28 16:52:59.000000000 +0300
@@ -9,6 +9,8 @@
#include "src/System.h"
#include "Frustum.h"
+#include <wfmath/ball.h>
+
#ifdef DEBUG
static const bool debug = true;
#else
diff -ur sear-0.6.3/renderers/ImageUtils.cpp sear-0.6.3.new/renderers/ImageUtils.cpp
--- sear-0.6.3/renderers/ImageUtils.cpp 2006-05-21 14:28:43.000000000 +0400
+++ sear-0.6.3.new/renderers/ImageUtils.cpp 2009-02-28 16:52:59.000000000 +0300
@@ -18,6 +18,8 @@
#include "common/Log.h"
#include "common/Utility.h"
+#include <cassert>
+
namespace Sear
{
diff -ur sear-0.6.3/renderers/LightManager.cpp sear-0.6.3.new/renderers/LightManager.cpp
--- sear-0.6.3/renderers/LightManager.cpp 2006-10-07 01:08:05.000000000 +0400
+++ sear-0.6.3.new/renderers/LightManager.cpp 2009-02-28 16:52:59.000000000 +0300
@@ -11,6 +11,8 @@
#include "src/System.h"
+#include <cassert>
+
namespace Sear {
LightManager::LightManager() :
diff -ur sear-0.6.3/renderers/TextureManager.cpp sear-0.6.3.new/renderers/TextureManager.cpp
--- sear-0.6.3/renderers/TextureManager.cpp 2009-02-28 16:51:04.000000000 +0300
+++ sear-0.6.3.new/renderers/TextureManager.cpp 2009-02-28 16:52:59.000000000 +0300
@@ -22,6 +22,8 @@
#include "TextureManager.h"
+#include <cmath>
+
#ifdef WINDOWS
int ilogb(double x)
Только в sear-0.6.3.new/renderers: TextureManager.cpp.orig
diff -ur sear-0.6.3/src/CacheObject.cpp sear-0.6.3.new/src/CacheObject.cpp
--- sear-0.6.3/src/CacheObject.cpp 2009-02-28 16:50:55.000000000 +0300
+++ sear-0.6.3.new/src/CacheObject.cpp 2009-02-28 17:17:39.000000000 +0300
@@ -6,6 +6,7 @@
#include "CacheObject.h"
#include <cstring>
+#include <cstdio>
namespace Sear {
diff -ur sear-0.6.3/src/client.h sear-0.6.3.new/src/client.h
--- sear-0.6.3/src/client.h 2006-12-13 01:31:15.000000000 +0300
+++ sear-0.6.3.new/src/client.h 2009-02-28 17:14:27.000000000 +0300
@@ -21,6 +21,10 @@
class Config;
}
+namespace Eris {
+class Entity;
+}
+
//Client Messages
#define CLIENT_CONNECTING "Connecting"
#define CLIENT_CONNECTED "Connected"
diff -ur sear-0.6.3/src/Editor.cpp sear-0.6.3.new/src/Editor.cpp
--- sear-0.6.3/src/Editor.cpp 2006-05-01 01:46:03.000000000 +0400
+++ sear-0.6.3.new/src/Editor.cpp 2009-02-28 17:14:27.000000000 +0300
@@ -15,6 +15,7 @@
#include <Eris/Connection.h>
#include <Eris/Avatar.h>
+#include <Atlas/Message/Element.h>
#include <wfmath/atlasconv.h>
#include <Atlas/Objects/Operation.h>
diff -ur sear-0.6.3/src/ScriptEngine.cpp sear-0.6.3.new/src/ScriptEngine.cpp
--- sear-0.6.3/src/ScriptEngine.cpp 2006-10-01 16:52:44.000000000 +0400
+++ sear-0.6.3.new/src/ScriptEngine.cpp 2009-02-28 16:52:59.000000000 +0300
@@ -16,6 +16,8 @@
#include <fstream>
+#include <cassert>
+
#ifdef DEBUG
static const bool debug = true;
#else
diff -ur sear-0.6.3/src/TerrainEntity.cpp sear-0.6.3.new/src/TerrainEntity.cpp
--- sear-0.6.3/src/TerrainEntity.cpp 2007-01-12 13:26:33.000000000 +0300
+++ sear-0.6.3.new/src/TerrainEntity.cpp 2009-02-28 17:15:27.000000000 +0300
@@ -9,6 +9,8 @@
#include <Eris/View.h>
+#include <Atlas/Message/Element.h>
+
#include "renderers/Graphics.h"
#include "environment/Environment.h"
Index: sear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sear/devel/sear.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sear.spec 26 Feb 2009 00:18:23 -0000 1.11
+++ sear.spec 28 Feb 2009 17:12:51 -0000 1.12
@@ -1,6 +1,6 @@
Name: sear
Version: 0.6.3
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: 3D WorldForge client
Group: Amusements/Games
@@ -12,6 +12,7 @@
Patch2: cal3d-paths.patch
Patch3: sear-0.6.3-gcc43.patch
Patch4: sear-0.6.3-sigc2.patch
+Patch5: sear-0.6.3-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: lib3ds-devel mercator-devel varconf-devel eris-devel sage-devel
@@ -34,6 +35,7 @@
%patch2 -p1 -b .paths
%patch3 -p1 -b .gcc43
%patch4 -p1 -b .sigc2
+%patch5 -p1
chmod a-x COPYING AUTHORS
chmod a-x */*.h
chmod a-x */*.cpp
@@ -79,6 +81,9 @@
%changelog
+* Sat Feb 28 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.6.3-13
+- Fix build with recent compilers
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list