[glest] Fix for gcc 4.7 changes

Bruno Wolff III bruno at fedoraproject.org
Thu Jan 26 04:10:02 UTC 2012


commit 8dd4b9b3dbfc7c4a6a2ba2d26f9f9e443a874694
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Wed Jan 25 21:40:37 2012 -0600

    Fix for gcc 4.7 changes

 glest-gcc47.patch |   10 ++++++++++
 glest.spec        |    7 ++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/glest-gcc47.patch b/glest-gcc47.patch
new file mode 100644
index 0000000..3efb348
--- /dev/null
+++ b/glest-gcc47.patch
@@ -0,0 +1,10 @@
+--- shared_lib/include/graphics/math_util.h.orig	2012-01-25 21:31:09.021829452 -0600
++++ shared_lib/include/graphics/math_util.h	2012-01-25 21:37:28.779094649 -0600
+@@ -12,6 +12,7 @@
+ #ifndef _SHARED_GRAPHICS_MATHUTIL_H_
+ #define _SHARED_GRAPHICS_MATHUTIL_H_
+ 
++#include <algorithm>
+ #include <cmath>
+ 
+ #include "vec.h"
diff --git a/glest.spec b/glest.spec
index 9def26d..cff499e 100644
--- a/glest.spec
+++ b/glest.spec
@@ -1,6 +1,6 @@
 Name:           glest
 Version:        3.2.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
@@ -13,6 +13,7 @@ Patch0:         glest.fix.includes.patch
 Patch1:         glest-xerces-c.patch
 Patch2:         glest-link-X11.patch
 Patch3:         glest-cflags.patch
+Patch4:         glest-gcc47.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-soft-devel, xerces-c-devel
@@ -46,6 +47,7 @@ exist in the environment and can be controlled.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
 find . -type f | xargs sed -i -e "s/\r//g" 
 #recode ISO-8859-1..UTF-8 README
 
@@ -120,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 25 2012 Bruno Wolff III <bruno at wolff.to> -  3.2.2-10
+- Fixes for gcc 4.7 changes
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list