rpms/sear/devel sear-0.6.3-gcc43.patch,NONE,1.1 sear.spec,1.7,1.8

Michael Thomas (wart) fedora-extras-commits at redhat.com
Mon Feb 11 16:34:06 UTC 2008


Author: wart

Update of /cvs/extras/rpms/sear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5631

Modified Files:
	sear.spec 
Added Files:
	sear-0.6.3-gcc43.patch 
Log Message:
Rebuild for gcc 4.3


sear-0.6.3-gcc43.patch:

--- NEW FILE sear-0.6.3-gcc43.patch ---
--- sear-0.6.3/environment/TerrainRenderer.cpp.orig	2008-02-11 07:32:40.000000000 -0800
+++ sear-0.6.3/environment/TerrainRenderer.cpp	2008-02-11 07:33:18.000000000 -0800
@@ -24,6 +24,7 @@
 #include <Mercator/Surface.h>
 
 #include <iostream>
+#include <limits>
 
 namespace Sear {
 
--- sear-0.6.3/loaders/SearObject.cpp.orig	2008-02-09 22:51:08.000000000 -0800
+++ sear-0.6.3/loaders/SearObject.cpp	2008-02-09 22:51:22.000000000 -0800
@@ -22,6 +22,8 @@
 #include "SearObject.h"
 #include "SearObjectTypes.h"
 
+#include  <limits>
+
 #ifdef DEBUG
   static const bool debug = true;
 #else
--- sear-0.6.3/loaders/StaticObject.h.orig	2008-02-09 18:41:17.000000000 -0800
+++ sear-0.6.3/loaders/StaticObject.h	2008-02-09 18:41:28.000000000 -0800
@@ -6,6 +6,7 @@
 #define SEAR_RENDERERS_STATICOBJECT_H 1
 
 #include <vector>
+#include <cstring>
 
 #include <sage/GL.h>
 #include "common/Matrix.h"
--- sear-0.6.3/loaders/LibModelFile.cpp.orig	2008-02-09 22:47:24.000000000 -0800
+++ sear-0.6.3/loaders/LibModelFile.cpp	2008-02-09 22:47:40.000000000 -0800
@@ -35,6 +35,8 @@
 
 #include "StaticObject.h"
 
+#include <limits>
+
 #ifdef DEBUG
   static const bool debug = true;
 #else
--- sear-0.6.3/loaders/3ds.cpp.orig	2008-02-09 22:47:47.000000000 -0800
+++ sear-0.6.3/loaders/3ds.cpp	2008-02-09 22:47:59.000000000 -0800
@@ -21,6 +21,7 @@
 #include <list>
 #include <map>
 #include <algorithm>
+#include <limits>
 
 #include <sigc++/object_slot.h>
 
--- sear-0.6.3/gui/Button.h.orig	2008-02-11 08:23:33.000000000 -0800
+++ sear-0.6.3/gui/Button.h	2008-02-11 08:23:42.000000000 -0800
@@ -8,6 +8,7 @@
 #include "gui/Container.h"
 
 #include <sigc++/signal.h>
+#include <string>
 
 namespace Sear {
 
--- sear-0.6.3/gui/Label.h.orig	2008-02-11 07:59:32.000000000 -0800
+++ sear-0.6.3/gui/Label.h	2008-02-11 07:59:41.000000000 -0800
@@ -24,7 +24,7 @@
   explicit Label(const std::string & text);
   virtual ~Label();
 
-  virtual void map(Window * w, int x, int y, int & w, int & h);
+  virtual void map(Window * win, int x, int y, int & w, int & h);
 };
 
 } // namespace Sear
--- sear-0.6.3/src/CacheObject.cpp.orig	2008-02-11 08:26:53.000000000 -0800
+++ sear-0.6.3/src/CacheObject.cpp	2008-02-11 08:27:01.000000000 -0800
@@ -5,6 +5,7 @@
 // $Id: CacheObject.cpp,v 1.2 2006/04/26 14:39:00 simon Exp $
 
 #include "CacheObject.h"
+#include <cstring>
 
 namespace Sear {
 
--- sear-0.6.3/renderers/Light.h.orig	2008-02-10 10:45:41.000000000 -0800
+++ sear-0.6.3/renderers/Light.h	2008-02-10 10:46:10.000000000 -0800
@@ -8,6 +8,7 @@
 #define SEAR_LIGHT_H 1
 
 #include <wfmath/point.h>
+#include <cstring>
 
 namespace Sear {
 


Index: sear.spec
===================================================================
RCS file: /cvs/extras/rpms/sear/devel/sear.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sear.spec	1 Jan 2008 18:40:54 -0000	1.7
+++ sear.spec	11 Feb 2008 16:33:29 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           sear
 Version:        0.6.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        3D WorldForge client
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Patch0:         sear-0.6.3-desktop.patch
 Patch1:         sear-0.6.3-erisupgrade.patch
 Patch2:         cal3d-paths.patch
+Patch3:         sear-0.6.3-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  lib3ds-devel mercator-devel varconf-devel eris-devel sage-devel
@@ -30,6 +31,7 @@
 %patch0 -p0 -b .desktop
 %patch1 -p1 -b .erisupgrade
 %patch2 -p1 -b .paths
+%patch3 -p1 -b .gcc43
 chmod a-x COPYING AUTHORS
 chmod a-x */*.h
 chmod a-x */*.cpp
@@ -75,6 +77,9 @@
 
 
 %changelog
+* Mon Feb 11 2008 Wart <wart at kobold.org> 0.6.3-9
+- Rebuild for gcc 4.3
+
 * Tue Jan 1 2008 Wart <wart at kobold.org> 0.6.3-8
 - Add patch to support locally installed media files from sear-media
   (BZ #425774)




More information about the fedora-extras-commits mailing list