From 59400434a1493d9444eb408c9b51834e2706632c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 9 Sep 2019 23:24:44 +1000
Subject: [PATCH] Neverball: bump git revision

---
 ...recipe => neverball-1.6.1~20190808.recipe} |  9 ++--
 .../patches/neverball-1.6.1~20190808.patchset | 43 +++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)
 rename games-puzzle/neverball/{neverball-1.6.1~20190706.recipe => neverball-1.6.1~20190808.recipe} (92%)
 create mode 100644 games-puzzle/neverball/patches/neverball-1.6.1~20190808.patchset

diff --git a/games-puzzle/neverball/neverball-1.6.1~20190706.recipe b/games-puzzle/neverball/neverball-1.6.1~20190808.recipe
similarity index 92%
rename from games-puzzle/neverball/neverball-1.6.1~20190706.recipe
rename to games-puzzle/neverball/neverball-1.6.1~20190808.recipe
index 73cf0c8da..45795bf50 100644
--- a/games-puzzle/neverball/neverball-1.6.1~20190706.recipe
+++ b/games-puzzle/neverball/neverball-1.6.1~20190808.recipe
@@ -7,11 +7,12 @@ HOMEPAGE="https://neverball.org"
 COPYRIGHT="2002-2019 The Neverball Team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="3821fa506313b8a740b22947e9e694ab4d8ece98"
+srcGitRev="09a2a620a6b71bfc0afca1f0fc96a7dfb6cb9208"
 SOURCE_URI="https://github.com/Neverball/neverball/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="f5accd8e63a2e20f99ca960b088ca8c51b69c93a26387bbd1ece3a2e5b63fe17"
+CHECKSUM_SHA256="66a9fa8b0f7676991e32b4dda669a64e902ddc07e5612d1f4f21a9003549fcde"
 SOURCE_FILENAME="neverball-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="neverball-$srcGitRev"
+PATCHES="neverball-$portVersion.patchset"
 ADDITIONAL_FILES="
 	neverball.rdef.in
 	neverputt.rdef.in
@@ -49,7 +50,7 @@ BUILD_REQUIRES="
 	devel:libjpeg$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libphysfs$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
 	devel:libSDL2$secondaryArchSuffix
 	devel:libSDL2_mixer$secondaryArchSuffix
 	devel:libSDL2_ttf$secondaryArchSuffix
@@ -59,7 +60,7 @@ BUILD_PREREQUIRES="
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libpng_config$secondaryArchSuffix
+	cmd:libpng_config$secondaryArchSuffix >= 1.6
 	cmd:make
 	"
 
diff --git a/games-puzzle/neverball/patches/neverball-1.6.1~20190808.patchset b/games-puzzle/neverball/patches/neverball-1.6.1~20190808.patchset
new file mode 100644
index 000000000..9ab89c16e
--- /dev/null
+++ b/games-puzzle/neverball/patches/neverball-1.6.1~20190808.patchset
@@ -0,0 +1,43 @@
+From 5938896afe87f30e3690ba7f917a75fadf79efba Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 9 Sep 2019 23:15:44 +1000
+Subject: Set working directory
+
+
+diff --git a/ball/main.c b/ball/main.c
+index e7725e0..4b5dfb9 100644
+--- a/ball/main.c
++++ b/ball/main.c
+@@ -530,6 +530,12 @@ int main(int argc, char *argv[])
+ {
+     int t1, t0;
+ 
++#ifdef __HAIKU__
++	char *binpath = realpath(argv[0], NULL);
++	if (binpath != NULL)
++		argv[0] = strdup(binpath);
++#endif
++
+     if (!fs_init(argc > 0 ? argv[0] : NULL))
+     {
+         fprintf(stderr, "Failure to initialize virtual file system (%s)\n",
+diff --git a/putt/main.c b/putt/main.c
+index 8202cfd..b1f45bf 100644
+--- a/putt/main.c
++++ b/putt/main.c
+@@ -289,6 +289,12 @@ int main(int argc, char *argv[])
+ {
+     int camera = 0;
+ 
++#ifdef __HAIKU__
++	char *binpath = realpath(argv[0], NULL);
++	if (binpath != NULL)
++		argv[0] = strdup(binpath);
++#endif
++
+     if (!fs_init(argc > 0 ? argv[0] : NULL))
+     {
+         fprintf(stderr, "Failure to initialize virtual file system (%s)\n",
+-- 
+2.23.0
+