update to Gargoyle 2019.1.1 (should be a noop for us)

This commit is contained in:
sthen 2019-11-19 14:49:11 +00:00
parent f1c3d659c4
commit 6a319ec2e1
4 changed files with 14 additions and 21 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.28 2019/11/04 15:01:28 sthen Exp $ # $OpenBSD: Makefile,v 1.29 2019/11/19 14:49:11 sthen Exp $
COMMENT = cross-platform interactive fiction player COMMENT = cross-platform interactive fiction player
GH_ACCOUNT = garglk GH_ACCOUNT = garglk
GH_PROJECT = garglk GH_PROJECT = garglk
GH_TAGNAME = 2019.1 GH_TAGNAME = 2019.1.1
EPOCH = 0 EPOCH = 0
CATEGORIES = games x11 CATEGORIES = games x11

View File

@ -1,2 +1,2 @@
SHA256 (garglk-2019.1.tar.gz) = oyZYW89vWIz/UUIyzrglskwI8NnQrouVEBbMgqpq114= SHA256 (garglk-2019.1.1.tar.gz) = bf32qVlbL13hlwLnjj5kYsnVSLTvgGpQ7sb+nFu6KcI=
SIZE (garglk-2019.1.tar.gz) = 14702153 SIZE (garglk-2019.1.1.tar.gz) = 14700448

View File

@ -1,26 +1,19 @@
$OpenBSD: patch-garglk_launchgtk_c,v 1.3 2019/06/05 12:54:03 sthen Exp $ $OpenBSD: patch-garglk_launchgtk_c,v 1.4 2019/11/19 14:49:11 sthen Exp $
Remove Linux'ism to figure out the libexec dir. Remove Linux'ism to figure out the libexec dir.
Index: garglk/launchgtk.c Index: garglk/launchgtk.c
--- garglk/launchgtk.c.orig --- garglk/launchgtk.c.orig
+++ garglk/launchgtk.c +++ garglk/launchgtk.c
@@ -180,6 +180,10 @@ static void winbrowsefile(char *buffer) @@ -185,7 +185,10 @@ static void winbrowsefile(char *buffer)
void winpath(char *buffer) void winpath(char *buffer)
{ {
-#ifdef __FreeBSD__
+#if defined(__OpenBSD__) +#if defined(__OpenBSD__)
+ char exepath[MaxBuffer] = "${TRUEPREFIX}/libexec/gargoyle/"; + char exepath[MaxBuffer] = "${TRUEPREFIX}/libexec/gargoyle/";
+ snprintf(buffer, sizeof(exepath), "%s", exepath ); + snprintf(buffer, sizeof(exepath), "%s", exepath );
+#else +#elif defined(__FreeBSD__)
char exepath[MaxBuffer] = {0}; int mib[4];
ssize_t exelen; mib[0] = CTL_KERN;
mib[1] = KERN_PROC;
@@ -192,6 +196,7 @@ void winpath(char *buffer)
}
strcpy(buffer, exepath);
+#endif
char *dirpos = strrchr(buffer, *DirSeparator);
if ( dirpos != NULL )

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.6 2019/06/05 12:54:03 sthen Exp $ @comment $OpenBSD: PLIST,v 1.7 2019/11/19 14:49:11 sthen Exp $
bin/gargoyle bin/gargoyle
lib/libgarglk.so @so lib/libgarglk.so
libexec/gargoyle/ libexec/gargoyle/
@bin libexec/gargoyle/advsys @bin libexec/gargoyle/advsys
@bin libexec/gargoyle/agility @bin libexec/gargoyle/agility
@ -15,7 +15,7 @@ libexec/gargoyle/
@bin libexec/gargoyle/hugo @bin libexec/gargoyle/hugo
@bin libexec/gargoyle/jacl @bin libexec/gargoyle/jacl
@bin libexec/gargoyle/level9 @bin libexec/gargoyle/level9
libexec/gargoyle/libgarglk.so @so libexec/gargoyle/libgarglk.so
@bin libexec/gargoyle/magnetic @bin libexec/gargoyle/magnetic
@bin libexec/gargoyle/nitfol @bin libexec/gargoyle/nitfol
@bin libexec/gargoyle/scare @bin libexec/gargoyle/scare