funguloids 1.06.4-9 update: OGRE 1.10.4 compatibility

3 files changed, 121 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ada8c3475c8..53e5bfa7af04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = funguloids
 	pkgdesc = 3D game about collecting mushrooms in outerspace
 	pkgver = 1.06.4
-	pkgrel = 8
+	pkgrel = 9
 	url = http://funguloids.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = python
 	depends = boost
 	depends = ogre
 	depends = ois
@@ -28,6 +29,7 @@ pkgbase = funguloids
 	source = funguloids-compilation.patch
 	source = funguloids-boost-system.patch
 	source = funguloids-ogre-1.9.0.patch
+	source = funguloids-ogre-1.10.4.patch
 	sha256sums = e9c9074a5d2de11690484a7e8eef7de9dd7d360ea72185ea35c54976646ef5cf
 	sha256sums = ceaf1c19d5ed694ff3832320ef6b6b268f73cbf16bc5998c15de47c77298885a
 	sha256sums = 753a8ac858ff21e81f2a3466092e297703d081689ceaa1159fe6cb42d97d06a6
@@ -42,6 +44,7 @@ pkgbase = funguloids
 	sha256sums = 4ed88c6502601d684fd7e85dbe33684e36669bdf65583f782b24ddd596dcaf3c
 	sha256sums = e17a559558d49e493f3f19ae6baa147c64fb37497fb384d31e0d3bc7ae484df1
 	sha256sums = a007990ef35c249fe4440938553737d14f2dd8377407ee97fecdc6f17b1136ec
+	sha256sums = d00b04968aaaee97babd99ecca46cc22d567694fdcc341a5ff4124af9b08be95
 
 pkgname = funguloids
 
diff --git a/PKGBUILD b/PKGBUILD
index af4642a4912c..31e4e85d9842 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=funguloids
 pkgver=1.06.4
 _realver=1.06-4
-pkgrel=8
+pkgrel=9
 pkgdesc="3D game about collecting mushrooms in outerspace"
 arch=('i686' 'x86_64')
 url="http://funguloids.sourceforge.net/"
@@ -23,7 +23,8 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-linux-${_realver}
         funguloids-ogre-1.7.0.patch
         funguloids-compilation.patch
         funguloids-boost-system.patch
-        funguloids-ogre-1.9.0.patch)
+        funguloids-ogre-1.9.0.patch
+        funguloids-ogre-1.10.4.patch)
 sha256sums=('e9c9074a5d2de11690484a7e8eef7de9dd7d360ea72185ea35c54976646ef5cf'
             'ceaf1c19d5ed694ff3832320ef6b6b268f73cbf16bc5998c15de47c77298885a'
             '753a8ac858ff21e81f2a3466092e297703d081689ceaa1159fe6cb42d97d06a6'
@@ -37,7 +38,8 @@ sha256sums=('e9c9074a5d2de11690484a7e8eef7de9dd7d360ea72185ea35c54976646ef5cf'
             '334831c41160457a4b0162bab349ba77570bbcc0b8e8c63a8e01e8a50c40bd48'
             '4ed88c6502601d684fd7e85dbe33684e36669bdf65583f782b24ddd596dcaf3c'
             'e17a559558d49e493f3f19ae6baa147c64fb37497fb384d31e0d3bc7ae484df1'
-            'a007990ef35c249fe4440938553737d14f2dd8377407ee97fecdc6f17b1136ec')
+            'a007990ef35c249fe4440938553737d14f2dd8377407ee97fecdc6f17b1136ec'
+            'd00b04968aaaee97babd99ecca46cc22d567694fdcc341a5ff4124af9b08be95')
 
 prepare() {
   cd "${srcdir}/${pkgname}"
@@ -56,6 +58,7 @@ prepare() {
   patch -p1 < ../funguloids-compilation.patch
   patch -p1 < ../funguloids-boost-system.patch
   patch -p1 < ../funguloids-ogre-1.9.0.patch
+  patch -p1 < ../funguloids-ogre-1.10.4.patch
 
   sed -i -e 's;cp bootstrap.mpk "@gameinstalldir@";cp bootstrap.mpk "$(DESTDIR)@gameinstalldir@";' -e 's;funguloids.mpk "@gameinstalldir@";funguloids.mpk "$(DESTDIR)@gameinstalldir@";' bin/Makefile.in
   sed -i -e 's;cp MarylandInMay.ogg "@musicinstalldir@";cp MarylandInMay.ogg "$(DESTDIR)@musicinstalldir@";' bin/music/Makefile.in
diff --git a/funguloids-ogre-1.10.4.patch b/funguloids-ogre-1.10.4.patch
new file mode 100644
index 000000000000..954977f7c8d4
--- /dev/null
+++ b/funguloids-ogre-1.10.4.patch
@@ -0,0 +1,111 @@
+From: Nicolas Iooss
+Date: Wed, 10 May 2017 20:09:34 +0200
+Subject: Fix compilation issues with OGRE 1.10.4
+
+* Ogre::Rectangle2D now needs to be explicitly included
+* Ogre::Archive requires some pure virtual methods to be const
+---
+ include/mpakogre.h   | 10 +++++-----
+ src/bground.cpp      |  1 +
+ src/mpakogre.cpp     | 12 ++++++------
+ src/scriptsystem.cpp |  2 +-
+ 4 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/include/mpakogre.h b/include/mpakogre.h
+index a3700db4e98d..e46b0a9ee68a 100644
+--- a/include/mpakogre.h
++++ b/include/mpakogre.h
+@@ -50,15 +50,15 @@ public:
+ 
+ 	DataStreamPtr open(const String &filename) const;
+ 	DataStreamPtr open(const String &filename, bool) const { return open(filename); };
+-	StringVectorPtr list(bool recursive = true, bool dirs = false);
+-	FileInfoListPtr listFileInfo(bool recursive = true, bool dirs = false);
++	StringVectorPtr list(bool recursive = true, bool dirs = false) const;
++	FileInfoListPtr listFileInfo(bool recursive = true, bool dirs = false) const;
+ 
+-	StringVectorPtr find(const String &pattern, bool recursive = true, bool dirs = false);
++	StringVectorPtr find(const String &pattern, bool recursive = true, bool dirs = false) const;
+ 	FileInfoListPtr findFileInfo(const String &pattern, bool recursive, bool dirs = false) const;
+ 
+-	bool exists(const String &filename);
++	bool exists(const String &filename) const;
+ 
+-	time_t getModifiedTime(const String& filename)
++	time_t getModifiedTime(const String& filename) const
+ 	{
+ 		struct stat tagStat;
+ 		bool ret = (stat(mName.c_str(), &tagStat) == 0);
+diff --git a/src/bground.cpp b/src/bground.cpp
+index 333c0259d7b0..901aa448f09b 100644
+--- a/src/bground.cpp
++++ b/src/bground.cpp
+@@ -23,6 +23,7 @@
+ //
+ //***************************************************************************/
+ 
++#include <OgreRectangle2D.h>
+ #include "bground.h"
+ #include "game.h"
+ #include "scriptsystem.h"
+diff --git a/src/mpakogre.cpp b/src/mpakogre.cpp
+index ab2959e3fd12..e8453c6e4b05 100644
+--- a/src/mpakogre.cpp
++++ b/src/mpakogre.cpp
+@@ -144,10 +144,10 @@ DataStreamPtr MPakArchive::open(const String &filename) const {
+ }
+ 
+ 
+-StringVectorPtr MPakArchive::list(bool recursive, bool dirs) {
++StringVectorPtr MPakArchive::list(bool recursive, bool dirs) const {
+ 	StringVectorPtr ret = StringVectorPtr(new StringVector());
+ 
+-	FileInfoList::iterator i, iend;
++	FileInfoList::const_iterator i, iend;
+ 	iend = mFileList.end();
+ 	for(i = mFileList.begin(); i != iend; ++i) {
+ 		ret->push_back(i->filename);
+@@ -156,7 +156,7 @@ StringVectorPtr MPakArchive::list(bool recursive, bool dirs) {
+ 	return ret;
+ }
+ 
+-FileInfoListPtr MPakArchive::listFileInfo(bool recursive, bool dirs) {
++FileInfoListPtr MPakArchive::listFileInfo(bool recursive, bool dirs) const {
+ 	FileInfoList *fil = new FileInfoList();
+ 	FileInfoList::const_iterator i, iend;
+ 	iend = mFileList.end();
+@@ -167,10 +167,10 @@ FileInfoListPtr MPakArchive::listFileInfo(bool recursive, bool dirs) {
+ 	return FileInfoListPtr(fil);
+ }
+ 
+-StringVectorPtr MPakArchive::find(const String &pattern, bool recursive, bool dirs) {
++StringVectorPtr MPakArchive::find(const String &pattern, bool recursive, bool dirs) const {
+ 	StringVectorPtr ret = StringVectorPtr(new StringVector());
+ 
+-	FileInfoList::iterator i, iend;
++	FileInfoList::const_iterator i, iend;
+ 	iend = mFileList.end();
+ 	for(i = mFileList.begin(); i != iend; ++i) {
+ 		if(StringUtil::match(i->filename, pattern, true))
+@@ -193,7 +193,7 @@ FileInfoListPtr MPakArchive::findFileInfo(const String &pattern, bool recursive,
+ 	return ret;
+ }
+ 
+-bool MPakArchive::exists(const String &filename) {
++bool MPakArchive::exists(const String &filename) const {
+ 	int i = mPakFile->find_file(filename.c_str());
+ 	return (i != -1);
+ }
+diff --git a/src/scriptsystem.cpp b/src/scriptsystem.cpp
+index 8a2521afe4cb..f7eba11debc2 100644
+--- a/src/scriptsystem.cpp
++++ b/src/scriptsystem.cpp
+@@ -540,7 +540,7 @@ bool ScriptSystem::executeScript(const char *file) {
+ 	
+ 	// Load it as a string
+ 	DataStreamPtr dat = arch->open(String(file));
+-	if(dat.isNull()) {
++	if(!dat) {
+ 		OGRE_EXCEPT(Exception::ERR_FILE_NOT_FOUND, "ScriptSystem error: Could not find " + fil, "ScriptSystem::executeScript()");
+ 		return false;
+ 	}