haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Lugaru: fix working directory

Browse Source 
* fix crash on exit
* fix libpng version
This commit is contained in:
Gerasim Troeglazov
2019-09-09 20:56:46 +10:00
parent e41cad8d4e
commit b8cad31ddd
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
games-action/lugaru/lugaru-1.2.recipe
View File

@@ -10,7 +10,7 @@ HOMEPAGE="https://osslugaru.gitlab.io/"
COPYRIGHT="2017 OSS Lugaru Team"
LICENSE="GNU GPL v2
CC-BY-SA-3.0"
REVISION="2"
REVISION="3"
SOURCE_URI="https://bitbucket.org/osslugaru/lugaru/downloads/lugaru-$portVersion.tar.xz"
CHECKSUM_SHA256="f3ea477caf78911c69939fbdc163f9f6517c7ef2267e716a0e050be1a166ef97"
SOURCE_DIR="lugaru-$portVersion"
@@ -44,7 +44,7 @@ BUILD_REQUIRES="
devel:libjpeg$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libopenal$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libSDL2$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libz$secondaryArchSuffix

43
games-action/lugaru/patches/lugaru-1.2.patchset
View File

@@ -1,4 +1,4 @@
From 636e2f8b9584ded6df785fafb4088fb5943d363d Mon Sep 17 00:00:00 2001
From b6803ff333dedffab76d8e426434e059963e6519 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Oct 2018 20:40:18 +1000
Subject: Fixes for Haiku
@@ -84,5 +84,44 @@ index 3593c69..3a70596 100644
}
--
2.19.1
2.23.0
From aaabcdb146910860d2f7a16f4117504342f0606f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 9 Sep 2019 20:54:50 +1000
Subject: Fix working directory
diff --git a/Source/main.cpp b/Source/main.cpp
index 3a70596..2598662 100644
--- a/Source/main.cpp
+++ b/Source/main.cpp
@@ -477,6 +477,8 @@ void CleanUp(void)
OPENAL_Close();
SDL_Quit();
+
+ kill(::getpid(), SIGKILL);
}
// --------------------------------------------------------------------------
@@ -566,7 +568,15 @@ char* calcBaseDir(const char* argv0)
static inline void chdirToAppPath(const char* argv0)
{
+#if defined(__HAIKU__)
+ char *dir = realpath(argv0, NULL);
+ if (dir != NULL) {
+ char *appdir = strrchr(dir, '/');
+ *appdir = '\0';
+ }
+#else
char* dir = calcBaseDir(argv0);
+#endif
if (dir) {
#if (defined(__APPLE__) && defined(__MACH__))
// Chop off /Contents/MacOS if it's at the end of the string, so we
--
2.23.0