[SCM] WorldForge 3D client branch, master, updated. upstream/0.6.2-41-g3203194

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit e4b9e9215af40719e0f32c199245b00b611cd3d2
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Tue Apr 10 15:09:02 2012 -0400

    0008-replace-fastdeletegate-with-boost.patch: replaced FastDelegate
      - used GPL-compatible boost::function instead

diff --git a/debian/changelog b/debian/changelog
index 108c023..e4fd67e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ ember (0.6.2-1) unstable; urgency=low
   * used xz compression in packaging
   * debian/control: updated Standards-Version to 3.9.3
   * debian/copyright: changed to computer-readable format (DEP-5)
+  * 0008-replace-fastdeletegate-with-boost.patch: replaced FastDelegate
+    - used GPL-compatible boost::function instead
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 20 Mar 2012 12:50:06 -0400
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 10 Apr 2012 15:05:18 -0400
 
 ember (0.5.7-1.1) unstable; urgency=high
 
diff --git a/debian/patches/0008-replace-fastdeletegate-with-boost.patch b/debian/patches/0008-replace-fastdeletegate-with-boost.patch
new file mode 100644
index 0000000..be48d0a
--- /dev/null
+++ b/debian/patches/0008-replace-fastdeletegate-with-boost.patch
@@ -0,0 +1,42 @@
+Description: replaces FastDelegate with GPL-compatible boost::function
+Author: Stephen M. Webb <stephen.webB at bregmasoft.ca>
+Bug: https://bugs.launchpad.net/ember/+bug/977460
+
+--- a/src/components/ogre/SceneManagers/EmberPagingSceneManager/include/OgrePagingLandScapeCallBackEvent.h
++++ b/src/components/ogre/SceneManagers/EmberPagingSceneManager/include/OgrePagingLandScapeCallBackEvent.h
+@@ -2,7 +2,7 @@
+ #define __PagingLandScapeCallBackEvent_H__
+ 
+ #include "Ogre.h"
+-#include "OgrePagingLandScapeCallback.h"
++#include <boost/function.hpp>
+ 
+ namespace Ogre
+ {
+@@ -32,6 +32,6 @@
+ 		const AxisAlignedBox &mBbox;
+ 
+ 	};
+-	typedef fastdelegate::FastDelegate1<PagingLandscapeEvent *> PagingLandscapeDelegate;
++	typedef boost::function<void (PagingLandscapeEvent *)> PagingLandscapeDelegate;
+ }
+ #endif //__PagingLandScapeCallBackEvent_H__
+--- a/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/EmberPagingSceneManagerAdapter.cpp
++++ b/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/EmberPagingSceneManagerAdapter.cpp
+@@ -35,6 +35,7 @@
+ #include "OgrePagingLandScapeRenderableManager.h"
+ #include "OgrePagingLandScapeTileManager.h"
+ #include "OgrePagingLandScapeListenerManager.h"
++#include <boost/bind.hpp>
+ 
+ namespace Ember {
+ namespace OgreView {
+@@ -225,7 +226,7 @@
+ 	Terrain::ITerrainObserver* EmberPagingSceneManagerAdapter::createObserver()
+ 	{
+ 		EmberPagingTerrainObserver* observer = new EmberPagingTerrainObserver();
+-		Ogre::PagingLandscapeDelegate* delegate = new Ogre::PagingLandscapeDelegate(observer, &EmberPagingTerrainObserver::tileShow);
++		Ogre::PagingLandscapeDelegate* delegate = new Ogre::PagingLandscapeDelegate(boost::bind(&EmberPagingTerrainObserver::tileShow, observer, _1));
+ 		mSceneManager.getListenerManager()->addShowTileListener(delegate);
+ 		mTerrainObservers.insert(TerrainObserverStore::value_type(observer, delegate));
+ 		return observer;
diff --git a/debian/patches/series b/debian/patches/series
index f71167f..960510a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-ember.in-prefix.patch
 0006-spellcheck-similiar.patch
 0007-revert-libwfut-version.patch
+0008-replace-fastdeletegate-with-boost.patch

-- 
WorldForge 3D client