From 2ba274baad0df08e01bb2034c10e23ec90908359 Mon Sep 17 00:00:00 2001
From: Crestwave <35413013+Crestwave@users.noreply.github.com>
Date: Thu, 20 Feb 2020 15:40:45 +0800
Subject: [PATCH] supertux: bump to 0.6.1 and fix build (#4735)

---
 .../supertux/patches/supertux-0.6.1.patch     | 18 +++++++++++++
 ...tux-0.6.0.recipe => supertux-0.6.1.recipe} | 26 +++++++++----------
 2 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 games-arcade/supertux/patches/supertux-0.6.1.patch
 rename games-arcade/supertux/{supertux-0.6.0.recipe => supertux-0.6.1.recipe} (79%)

diff --git a/games-arcade/supertux/patches/supertux-0.6.1.patch b/games-arcade/supertux/patches/supertux-0.6.1.patch
new file mode 100644
index 000000000..08ee8461d
--- /dev/null
+++ b/games-arcade/supertux/patches/supertux-0.6.1.patch
@@ -0,0 +1,18 @@
+--- a/src/supertux/main.cpp
++++ b/src/supertux/main.cpp
+@@ -242,6 +242,7 @@
+   #pragma GCC diagnostic pop
+ #endif
+ 
++#ifndef __HAIKU__
+ #ifdef _WIN32
+ 	std::string olduserdir = FileSystem::join(physfs_userdir, PACKAGE_NAME);
+ #else
+@@ -282,6 +283,7 @@
+ 	    log_info << "Moved old config dir " << olduserdir << " to " << userdir << std::endl;
+ 	  }
+ 	}
++#endif
+ 
+     if (!FileSystem::is_directory(userdir))
+     {
diff --git a/games-arcade/supertux/supertux-0.6.0.recipe b/games-arcade/supertux/supertux-0.6.1.recipe
similarity index 79%
rename from games-arcade/supertux/supertux-0.6.0.recipe
rename to games-arcade/supertux/supertux-0.6.1.recipe
index b3c404863..cec878a68 100644
--- a/games-arcade/supertux/supertux-0.6.0.recipe
+++ b/games-arcade/supertux/supertux-0.6.1.recipe
@@ -1,21 +1,21 @@
 SUMMARY="A game similar to Super Mario Bros"
 DESCRIPTION="SuperTux is a classic 2D jump'n run sidescroller game in a style \
 similar to the original Super Mario games."
-HOMEPAGE="https://supertux.lethargik.org/"
-COPYRIGHT="2003-2018 SuperTux Devel Team"
-LICENSE="GNU GPL v2"
-REVISION="3"
+HOMEPAGE="https://supertux.org/"
+COPYRIGHT="2003-2020 The SuperTux Team"
+LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="https://github.com/SuperTux/supertux/releases/download/v$portVersion/SuperTux-v$portVersion-Source.tar.gz"
 SOURCE_DIR="SuperTux-v$portVersion-Source"
-CHECKSUM_SHA256="c4c3e5fa6f90e87b8c5ad6b22a179e9a9839bf997e7f219e22bbcd1c97223ac0"
-#PATCHES="supertux-$portVersion.patchset"
+CHECKSUM_SHA256="3a19e042cb10933bcbdc50a296779082a3bb46c8e98fe4afb68c19cc5e810c53"
+PATCHES="supertux-$portVersion.patch"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	supertux$secondaryArchSuffix = $portVersion
-	cmd:supertux$secondaryArchSuffix = $portVersion
+	app:SuperTux
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -25,7 +25,7 @@ REQUIRES="
 	lib:libfribidi$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libglew$secondaryArchSuffix
-	lib:libglu$secondaryArchSuffix
+	lib:libGLU$secondaryArchSuffix
 	lib:libharfbuzz$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
@@ -73,8 +73,8 @@ BUILD()
 	cd build
 	cmake .. $cmakeDirArgs \
 		-DUSE_SYSTEM_PHYSFS=ON \
-		-DCMAKE_INSTALL_PREFIX=$appsDir/SuperTux \
-		-DINSTALL_SUBDIR_BIN=$appsDir/SuperTux \
+		-DCMAKE_INSTALL_PREFIX="$appsDir/SuperTux" \
+		-DINSTALL_SUBDIR_BIN="$appsDir/SuperTux" \
 		-DCMAKE_BUILD_TYPE=Release
 	make $jobArgs
 }
@@ -83,6 +83,6 @@ INSTALL()
 {
 	cd build
 	make install
-	mv $appsDir/SuperTux/supertux2 $appsDir/SuperTux/SuperTux
+	mv "$appsDir/SuperTux/supertux2" "$appsDir/SuperTux/SuperTux"
 	addAppDeskbarSymlink $appsDir/SuperTux/SuperTux
 }