rpms/mercator/devel mercator-0.2.5-gcc43.patch, NONE, 1.1 mercator.spec, 1.4, 1.5

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	mercator.spec 
Added Files:
	mercator-0.2.5-gcc43.patch 
Log Message:
Rebuild for gcc 4.3



mercator-0.2.5-gcc43.patch:

--- NEW FILE mercator-0.2.5-gcc43.patch ---
--- mercator-0.2.5/Mercator/AreaShader.cpp.orig	2008-02-09 16:57:37.000000000 -0800
+++ mercator-0.2.5/Mercator/AreaShader.cpp	2008-02-09 16:58:24.000000000 -0800
@@ -14,6 +14,7 @@
 
 #include <set>
 #include <iostream>
+#include <algorithm>
 
 namespace Mercator
 {
--- mercator-0.2.5/Mercator/RandCache.h.orig	2008-02-09 16:56:36.000000000 -0800
+++ mercator-0.2.5/Mercator/RandCache.h	2008-02-09 16:57:21.000000000 -0800
@@ -58,7 +58,7 @@
     {
         if (x==0 && y==0) return 0;
         
-        int d=std::max(std::abs(x), std::abs(y));
+        int d=std::max(std::abs((double) x), std::abs((double) y));
         int min=(2*d-1)*(2*d-1);
 
         if (y == d)  return min + 2*d - x;
--- mercator-0.2.5/Mercator/AreaShader.h.orig	2008-02-09 16:55:06.000000000 -0800
+++ mercator-0.2.5/Mercator/AreaShader.h	2008-02-09 16:55:21.000000000 -0800
@@ -22,7 +22,7 @@
     virtual bool checkIntersect(const Segment &) const;
 private:
     /// helper to shader a single area into the surface
-    void shadeArea(Surface& s, const Area* const s) const;
+    void shadeArea(Surface& s, const Area* const s1) const;
     
     int m_layer;
 };


Index: mercator.spec
===================================================================
RCS file: /cvs/extras/rpms/mercator/devel/mercator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mercator.spec	17 Dec 2007 03:59:35 -0000	1.4
+++ mercator.spec	10 Feb 2008 01:04:32 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           mercator
 Version:        0.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Terrain library for WorldForge client/server
 
 Group:          Development/Libraries
 License:        GPL+
 URL:            http://worldforge.org/dev/eng/libraries/mercator
 Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
+Patch0:         mercator-0.2.5-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wfmath-devel doxygen
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -75,6 +77,9 @@
 
 
 %changelog
+* Sat Feb 9 2008 Wart <wart at kobold.org> 0.2.5-4
+- Rebuild for gcc 4.3
+
 * Sun Dec 16 2007 Wart <wart at kobold.org> 0.2.5-3
 - Modify docs for multiarch support (BZ #342591)