CVS commit: pkgsrc/games/openrct2

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Jul 23 21:15:44 UTC 2023

Modified Files:
        pkgsrc/games/openrct2: Makefile distinfo
Added Files:
        pkgsrc/games/openrct2/patches:
            patch-src_openrct2_platform_Platform.macOS.mm

Log Message:
openrct2: Fix execution on macOS


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/games/openrct2/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/openrct2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/openrct2/Makefile
diff -u pkgsrc/games/openrct2/Makefile:1.32 pkgsrc/games/openrct2/Makefile:1.33
--- pkgsrc/games/openrct2/Makefile:1.32 Sat Jul 22 10:55:16 2023
+++ pkgsrc/games/openrct2/Makefile      Sun Jul 23 21:15:43 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2023/07/22 10:55:16 triaxx Exp $
+# $NetBSD: Makefile,v 1.33 2023/07/23 21:15:43 triaxx Exp $
 
 DISTNAME=      openrct2-0.3.0
+PKGREVISION=   1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenRCT2/}
 GITHUB_PROJECT=        OpenRCT2
@@ -43,6 +44,7 @@ SUBST_CLASSES+=               doc
 SUBST_STAGE.doc=       pre-configure
 SUBST_MESSAGE.doc=     Fixing documentation path.
 SUBST_FILES.doc=       src/openrct2/platform/Platform.Linux.cpp
+SUBST_FILES.doc+=      src/openrct2/platform/Platform.macOS.mm
 SUBST_VARS.doc=                PREFIX
 
 pre-configure:

Index: pkgsrc/games/openrct2/distinfo
diff -u pkgsrc/games/openrct2/distinfo:1.9 pkgsrc/games/openrct2/distinfo:1.10
--- pkgsrc/games/openrct2/distinfo:1.9  Sat Jul 22 10:55:16 2023
+++ pkgsrc/games/openrct2/distinfo      Sun Jul 23 21:15:43 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2023/07/22 10:55:16 triaxx Exp $
+$NetBSD: distinfo,v 1.10 2023/07/23 21:15:43 triaxx Exp $
 
 BLAKE2s (openrct2-0.3.0.tar.gz) = a2f6d83bb7a4155c87051e6747b6e7b8ab399a24a7144ce50ff85ba74abedbd1
 SHA512 (openrct2-0.3.0.tar.gz) = 585bcd7a077114dc5332b95cb44f7c689e47fcbd7cff7c2ab32a24253a4fd87f50e79f40f9428c79ea6bc6d8cd88019b4edfce88509c03bc2d43854926d21317
@@ -7,6 +7,7 @@ SHA1 (patch-src_openrct2-ui_title_TitleS
 SHA1 (patch-src_openrct2_CMakeLists.txt) = ddd579719c50c859ee4193791c028c9ba99a637d
 SHA1 (patch-src_openrct2_common.h) = e041bf7afab0d400b0860811e21bdc35503de573
 SHA1 (patch-src_openrct2_platform_Platform.Linux.cpp) = d8ddd15b91baff6041b4bd85ca8ea3dd6742b6c3
+SHA1 (patch-src_openrct2_platform_Platform.macOS.mm) = 8d753476ba13cc47d111ebb6de38605e604c3a9d
 SHA1 (patch-src_openrct2_platform_Platform2.h) = 9d97308addb5995a430244fc04aa961f8ca0deaa
 SHA1 (patch-src_openrct2_platform_Posix.cpp) = 103299bf299ccc347154ebad5d8ca1b1f26a34e3
 SHA1 (patch-src_openrct2_util_Util.cpp) = aaebb6b69cdb560a6db44fc8acc19bf23c576801

Added files:

Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm
diff -u /dev/null pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm:1.1
--- /dev/null   Sun Jul 23 21:15:44 2023
+++ pkgsrc/games/openrct2/patches/patch-src_openrct2_platform_Platform.macOS.mm Sun Jul 23 21:15:43 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_openrct2_platform_Platform.macOS.mm,v 1.1 2023/07/23 21:15:43 triaxx Exp $
+
+Support pkgsrc.
+
+--- src/openrct2/platform/Platform.macOS.mm.orig       2020-08-15 19:13:50.000000000 +0000
++++ src/openrct2/platform/Platform.macOS.mm
+@@ -73,18 +73,7 @@ namespace Platform
+         }
+         else
+         {
+-            auto exePath = GetCurrentExecutablePath();
+-            auto exeDirectory = Path::GetDirectory(exePath);
+-            path = Path::Combine(exeDirectory, "data");
+-            NSString* nsPath = [NSString stringWithUTF8String:path.c_str()];
+-            if (![[NSFileManager defaultManager] fileExistsAtPath:nsPath])
+-            {
+-                path = GetBundlePath();
+-                if (path.empty())
+-                {
+-                    path = "/";
+-                }
+-            }
++            path = "@PREFIX@/share/openrct2";
+         }
+         return path;
+     }