[ember: 2/2] Fixes for gcc 4.7

[Bruno Wolff III]

commit b4d4a47045622e0c53e643f251b0493ec1618c83
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Jan 23 22:49:03 2012 -0600

    Fixes for gcc 4.7
    
    Some this pointers needed to be added and an invalid link option
    removed.

 ember-gcc47.patch |   72 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 ember.spec        |    7 ++++-
 2 files changed, 78 insertions(+), 1 deletions(-)
---
diff --git a/ember-gcc47.patch b/ember-gcc47.patch
new file mode 100644
index 0000000..3765862
--- /dev/null
+++ b/ember-gcc47.patch
@@ -0,0 +1,72 @@
+--- src/components/lua/Connectors_impl.h.orig	2012-01-23 21:33:34.499327469 -0600
++++ src/components/lua/Connectors_impl.h	2012-01-23 21:35:22.044995972 -0600
+@@ -120,7 +120,7 @@
+ template <typename TReturn>
+ TReturn ConnectorZero<TReturn>::signal_receive()
+ {
+-	callLuaMethod(Empty(), Empty());
++	this->callLuaMethod(Empty(), Empty());
+ 	return returnValueFromLua<TReturn>();
+ }
+ 
+@@ -128,14 +128,14 @@
+ template <typename TReturn, typename TAdapter0, typename T0>
+ TReturn ConnectorOne<TReturn, TAdapter0, T0>::signal_receive(const T0 t0)
+ {
+-	callLuaMethod(t0, Empty());
++	this->callLuaMethod(t0, Empty());
+ 	return ConnectorBase::returnValueFromLua<TReturn>();
+ }
+ 
+ template <typename TReturn, typename TAdapter0, typename TAdapter1, typename T0, typename T1>
+ TReturn ConnectorTwo<TReturn, TAdapter0, TAdapter1, T0, T1>::signal_receive(const T0 t0, const T1 t1)
+ {
+-	callLuaMethod(t0, t1);
++	this->callLuaMethod(t0, t1);
+ 	return ConnectorBase::returnValueFromLua<TReturn>();
+ }
+ 
+--- src/framework/osdir.h.orig	2012-01-23 22:36:55.462410336 -0600
++++ src/framework/osdir.h	2012-01-23 22:37:28.072554915 -0600
+@@ -26,6 +26,8 @@
+ #define OSLINK_OSDIR_POSIX
+ #endif
+ 
++#include <unistd.h>
++
+ #include <string>
+ #include <string.h>
+ 
+--- src/main/Ember.cpp.orig	2012-01-23 22:38:12.942257623 -0600
++++ src/main/Ember.cpp	2012-01-23 22:39:31.300216518 -0600
+@@ -20,6 +20,8 @@
+ #include "config.h"
+ #endif
+ 
++#include <unistd.h>
++
+ // Redefines main() on Win32 and MacOS
+ #include <SDL_main.h>
+ 
+--- src/main/Makefile.am.orig	2012-01-23 22:45:31.283968599 -0600
++++ src/main/Makefile.am	2012-01-23 22:46:22.517480115 -0600
+@@ -52,7 +52,7 @@
+ if !BUILD_WEBEMBER
+ bin_PROGRAMS = ember.bin
+ 
+-ember_bin_LDFLAGS = -Wl
++ember_bin_LDFLAGS = 
+ ember_bin_LDADD = $(emberlibs)
+ ember_bin_SOURCES = $(embersources) $(top_srcdir)/src/main/Ember.cpp
+ 
+--- src/main/Makefile.in.orig	2012-01-23 22:45:42.086341527 -0600
++++ src/main/Makefile.in	2012-01-23 22:46:11.261049481 -0600
+@@ -344,7 +344,7 @@
+ 	$(top_builddir)/src/framework/libFramework.a \
+ 	${BOOST_THREAD_LIB}
+ 
+- at BUILD_WEBEMBER_FALSE@ember_bin_LDFLAGS = -Wl
++ at BUILD_WEBEMBER_FALSE@ember_bin_LDFLAGS = 
+ @BUILD_WEBEMBER_FALSE at ember_bin_LDADD = $(emberlibs)
+ @BUILD_WEBEMBER_FALSE at ember_bin_SOURCES = $(embersources) \
+ @BUILD_WEBEMBER_FALSE@	$(top_srcdir)/src/main/Ember.cpp \
diff --git a/ember.spec b/ember.spec
index 33d2419..cb6907f 100644
--- a/ember.spec
+++ b/ember.spec
@@ -1,6 +1,6 @@
 Name:           ember
 Version:        0.6.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        3D client for WorldForge
 
 Group:          Amusements/Games
@@ -8,6 +8,7 @@ License:        GPLv3+
 URL:            http://www.worldforge.org/dev/eng/clients/ember
 Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
 Patch1:         ember-0.6.0-fix_implicit_dso.patch
+Patch2:         ember-gcc47.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel tinyxml-devel DevIL-devel cegui-devel ogre-devel
@@ -27,6 +28,7 @@ It uses the Ogre 3D engine with CEGUI.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p0
 
 # Encoding fix
 iconv -f iso-8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
@@ -84,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/%{name}/*
 
 %changelog
+* Mon Jan 23 2012 Bruno Wolff III <bruno at wolff.to> - 0.6.2-5
+- Fixes for gcc 4.7
+
 * Wed Jan 18 2012 Bruno Wolff III <bruno at wolff.to> - 0.6.2-4
 - Allow a small bit of version skew between ember and ember-media