funguloids 1.06.4-12 update: display OGRE settings window on first start

Fixes: https://github.com/fishilico/funguloids/issues/1

3 files changed, 53 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9353bc56b86..170e93b35b0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = funguloids
 	pkgdesc = 3D game about collecting mushrooms in outerspace
 	pkgver = 1.06.4
-	pkgrel = 11
+	pkgrel = 12
 	url = http://funguloids.sourceforge.net/
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = ZLIB
+	makedepends = boost
 	makedepends = python
-	depends = boost
+	depends = boost-libs
 	depends = ogre>=1.10
 	depends = ois>=0.7
 	depends = freealut
@@ -33,6 +34,7 @@ pkgbase = funguloids
 	source = funguloids-ogre-1.10.8.patch
 	source = funguloids-ois-1.4.patch
 	source = funguloids-ogre-1.11.0.patch
+	source = funguloids-gcc8-ogre-settings.patch
 	sha256sums = e9c9074a5d2de11690484a7e8eef7de9dd7d360ea72185ea35c54976646ef5cf
 	sha256sums = ceaf1c19d5ed694ff3832320ef6b6b268f73cbf16bc5998c15de47c77298885a
 	sha256sums = 753a8ac858ff21e81f2a3466092e297703d081689ceaa1159fe6cb42d97d06a6
@@ -51,6 +53,7 @@ pkgbase = funguloids
 	sha256sums = 6d356bf604073f9314ec581439ad4e6d3d4ea00592e6340f6316c61af48bd863
 	sha256sums = ec9722d796781852bbeeb39d7a8b2493067c15180a8fd807cae2097aedc17074
 	sha256sums = 2bb7a71375256d89e6851bea025ac96a917b90c4299f04af8ef1f6837ef97ead
+	sha256sums = c9a5a0797bd54fcae56853522fce7e968d1a662453831077504384ffe1790395
 
 pkgname = funguloids
 
diff --git a/PKGBUILD b/PKGBUILD
index 784d8422fb22..c61afeb47673 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=funguloids
 pkgver=1.06.4
 _realver=1.06-4
-pkgrel=11
+pkgrel=12
 pkgdesc="3D game about collecting mushrooms in outerspace"
 arch=('i686' 'x86_64')
 url="http://funguloids.sourceforge.net/"
@@ -30,7 +30,8 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-linux-${_realver}
         funguloids-ogre-1.10.4.patch
         funguloids-ogre-1.10.8.patch
         funguloids-ois-1.4.patch
-        funguloids-ogre-1.11.0.patch)
+        funguloids-ogre-1.11.0.patch
+        funguloids-gcc8-ogre-settings.patch)
 sha256sums=('e9c9074a5d2de11690484a7e8eef7de9dd7d360ea72185ea35c54976646ef5cf'
             'ceaf1c19d5ed694ff3832320ef6b6b268f73cbf16bc5998c15de47c77298885a'
             '753a8ac858ff21e81f2a3466092e297703d081689ceaa1159fe6cb42d97d06a6'
@@ -48,7 +49,8 @@ sha256sums=('e9c9074a5d2de11690484a7e8eef7de9dd7d360ea72185ea35c54976646ef5cf'
             'd00b04968aaaee97babd99ecca46cc22d567694fdcc341a5ff4124af9b08be95'
             '6d356bf604073f9314ec581439ad4e6d3d4ea00592e6340f6316c61af48bd863'
             'ec9722d796781852bbeeb39d7a8b2493067c15180a8fd807cae2097aedc17074'
-            '2bb7a71375256d89e6851bea025ac96a917b90c4299f04af8ef1f6837ef97ead')
+            '2bb7a71375256d89e6851bea025ac96a917b90c4299f04af8ef1f6837ef97ead'
+            'c9a5a0797bd54fcae56853522fce7e968d1a662453831077504384ffe1790395')
 
 prepare() {
   cd "${srcdir}/${pkgname}"
@@ -71,6 +73,7 @@ prepare() {
   patch -p1 < ../funguloids-ogre-1.10.8.patch
   patch -p1 < ../funguloids-ois-1.4.patch
   patch -p1 < ../funguloids-ogre-1.11.0.patch
+  patch -p1 < ../funguloids-gcc8-ogre-settings.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-gcc8-ogre-settings.patch b/funguloids-gcc8-ogre-settings.patch
new file mode 100644
index 000000000000..83a603cb1b51
--- /dev/null
+++ b/funguloids-gcc8-ogre-settings.patch
@@ -0,0 +1,41 @@
+From: Nicolas Iooss
+Date: Sun, 21 Oct 2018 11:59:42 +0200
+Subject: Display OGRE settings window on first start
+
+* Fix OGRE 1.10.8 patch with showConfigDialog(), in order to display
+  OGRE settings window
+* Fix -Wstringop-truncation reported by gcc 8.2.1
+diff --git a/src/hiscore.cpp b/src/hiscore.cpp
+index 5b6a8e417a61..7cc4e8f199b4 100644
+--- a/src/hiscore.cpp
++++ b/src/hiscore.cpp
+@@ -221,7 +221,7 @@ void HiscoreList::sort() {
+ void HiscoreList::clear() {
+ 	for(int f=0; f<NUM_NAMES; f++) {
+ 		memset(mList[f].name, 0, sizeof(mList[f].name));
+-		strncpy(mList[f].name, "- - - - - - - - - - - - - - - -", NAME_LEN);
++		strncpy(mList[f].name, "- - - - - - - - - - - - ", NAME_LEN);
+ 		mList[f].score = 0;
+ 	}
+ }
+diff --git a/src/ogreapp.cpp b/src/ogreapp.cpp
+index d9ed3eced4dc..0c15bf52069d 100644
+--- a/src/ogreapp.cpp
++++ b/src/ogreapp.cpp
+@@ -30,6 +30,7 @@
+ #include "soundsystem.h"
+ #include "mpakogre.h"
+ #include <OgreOverlaySystem.h>
++#include <OgreBitesConfigDialog.h>
+ 
+ #if(OGRE_PLATFORM == OGRE_PLATFORM_WIN32)
+ #define WIN32_LEAN_AND_MEAN
+@@ -103,7 +104,7 @@ bool OgreApplication::setup() {
+ 
+ 	// Get the configuration
+ 	if(!mRoot->restoreConfig())
+-		if(!mRoot->showConfigDialog(NULL))
++		if(!mRoot->showConfigDialog(OgreBites::getNativeConfigDialog()))
+ 			return false;
+ 
+ 	// Initialise the system