[sear] Include missing includes.

Bruno Wolff III bruno at fedoraproject.org
Sun May 29 21:00:14 UTC 2011


commit e3c6e709739cd5df9077025e7e3892cd5c397661
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun May 29 10:19:25 2011 -0500

    Include missing includes.
    
    Mostly there were missing assert includes.

 sear-missing-includes.patch |  132 +++++++++++++++++++++++++++++++++++++++++++
 sear.spec                   |    2 +
 2 files changed, 134 insertions(+), 0 deletions(-)
---
diff --git a/sear-missing-includes.patch b/sear-missing-includes.patch
new file mode 100644
index 0000000..193d249
--- /dev/null
+++ b/sear-missing-includes.patch
@@ -0,0 +1,132 @@
+--- Eris/TerrainModHandler.cpp.orig	2011-05-29 09:49:51.000000000 -0500
++++ Eris/TerrainModHandler.cpp	2011-05-29 09:50:25.000000000 -0500
+@@ -11,6 +11,8 @@
+ 
+ #include <Mercator/TerrainMod.h>
+ 
++#include <assert.h>
++
+ // Loop through the entity tree triggering the created method.
+ static void checkEntities(Eris::Entity *e, Eris::TerrainModHandler *tmh) {
+   if (e != 0) {
+--- renderers/Frustum.cpp.orig	2011-05-29 10:09:32.000000000 -0500
++++ renderers/Frustum.cpp	2011-05-29 10:09:51.000000000 -0500
+@@ -4,6 +4,8 @@
+ 
+ // $Id: Frustum.cpp,v 1.7 2007-04-15 19:13:11 simon Exp $
+ 
++#include <math.h>
++
+ #include "common/Utility.h"
+ 
+ #include "src/System.h"
+--- loaders/BoundBox.cpp.orig	2011-05-29 09:54:00.000000000 -0500
++++ loaders/BoundBox.cpp	2011-05-29 09:54:31.000000000 -0500
+@@ -4,6 +4,8 @@
+ 
+ // $Id: BoundBox.cpp,v 1.35 2007-05-02 20:47:54 simon Exp $
+ 
++#include <assert.h>
++
+ #include "renderers/RenderSystem.h"
+ 
+ #include "BoundBox.h"
+--- renderers/Camera.cpp.orig	2011-05-29 10:07:59.000000000 -0500
++++ renderers/Camera.cpp	2011-05-29 10:08:21.000000000 -0500
+@@ -8,6 +8,8 @@
+ 
+ #include <varconf/config.h>
+ 
++#include <assert.h>
++
+ #include "common/Utility.h"
+ #include "common/Log.h"
+ 
+--- loaders/LibModelFile.cpp.orig	2011-05-29 10:01:07.000000000 -0500
++++ loaders/LibModelFile.cpp	2011-05-29 10:01:44.000000000 -0500
+@@ -24,6 +24,8 @@
+ #include <sage/sage.h>
+ #include <sage/GL.h>
+ 
++#include <assert.h>
++
+ #include "common/Utility.h"
+ 
+ #include "src/System.h"
+--- loaders/WireFrame.cpp.orig	2011-05-29 10:07:06.000000000 -0500
++++ loaders/WireFrame.cpp	2011-05-29 10:07:23.000000000 -0500
+@@ -7,6 +7,8 @@
+ #include <sage/sage.h>
+ #include <sage/GL.h>
+ 
++#include <assert.h>
++
+ #include "src/System.h"
+ #include "renderers/RenderTypes.h"
+ #include "renderers/Render.h"
+--- loaders/SearObject.cpp.orig	2011-05-29 10:05:00.000000000 -0500
++++ loaders/SearObject.cpp	2011-05-29 10:05:19.000000000 -0500
+@@ -7,6 +7,8 @@
+ #include <sage/sage.h>
+ #include <sage/GL.h>
+ 
++#include <assert.h>
++
+ #include "common/Log.h"
+ #include "common/Utility.h"
+ 
+--- loaders/NPlane.cpp.orig	2011-05-29 10:02:35.000000000 -0500
++++ loaders/NPlane.cpp	2011-05-29 10:02:53.000000000 -0500
+@@ -4,6 +4,8 @@
+ 
+ #include <iostream>
+ 
++#include <assert.h>
++
+ #include "common/Utility.h"
+ 
+ #include "renderers/RenderSystem.h"
+--- loaders/3ds.cpp.orig	2011-05-29 09:53:15.000000000 -0500
++++ loaders/3ds.cpp	2011-05-29 09:52:10.000000000 -0500
+@@ -32,6 +32,8 @@
+ #include <lib3ds/vector.h>
+ #include <lib3ds/light.h>
+ 
++#include <assert.h>
++
+ #include "common/Log.h"
+ #include "common/Utility.h"
+ 
+--- loaders/EntityMapperRule_Random.cpp.orig	2011-05-29 09:55:12.000000000 -0500
++++ loaders/EntityMapperRule_Random.cpp	2011-05-29 09:55:41.000000000 -0500
+@@ -4,6 +4,8 @@
+ 
+ #include <string.h>
+ #include <inttypes.h>
++
++#include <assert.h>
+  
+ #include "EntityMapperRule_Random.h"
+ 
+--- loaders/StaticObjectFunctions.cpp.orig	2011-05-29 10:06:16.000000000 -0500
++++ loaders/StaticObjectFunctions.cpp	2011-05-29 10:06:35.000000000 -0500
+@@ -6,6 +6,8 @@
+ #include <algorithm>
+ #include <limits>
+ 
++#include <assert.h>
++
+ #include "StaticObjectFunctions.h"
+ 
+ #ifdef DEBUG
+--- loaders/ParticleSystem.cpp.orig	2011-05-29 10:03:52.000000000 -0500
++++ loaders/ParticleSystem.cpp	2011-05-29 10:04:19.000000000 -0500
+@@ -21,6 +21,8 @@
+ 
+ #include <wfmath/MersenneTwister.h>
+ 
++#include <assert.h>
++
+ #include "common/types.h"
+ #include "renderers/RenderSystem.h"
+ //#include "renderers/Render.h"
diff --git a/sear.spec b/sear.spec
index bd5f6f6..e1dcb26 100644
--- a/sear.spec
+++ b/sear.spec
@@ -19,6 +19,7 @@ Patch0:         sear-0.6.3-desktop.patch
 Patch1:         sear-0.6.3-erisupgrade.patch
 Patch2:         sear-0.6.4-mercatorupgrade.patch
 Patch3:         sear-eris-api-change.patch
+Patch4:         sear-missing-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  lib3ds-devel mercator-devel varconf-devel eris-devel sage-devel
@@ -40,6 +41,7 @@ in which quests and full games can be built.
 %patch1 -p0 -b .erisupgrade
 %patch2 -p0 -b .mercatorupgrade
 %patch3 -p0 -b .erisapichange
+%patch4 -p0 -b .missingincludes
 chmod a-x COPYING AUTHORS
 chmod a-x */*.h
 chmod a-x */*.cpp


More information about the scm-commits mailing list