Files
haikuports/games-puzzle/lpairs/patches/lpairs-1.0.4.patchset
Shiroko bd9ef372da Fix 4 building failed in x86_64 issues. (#1993)
* Fix bdhcalc

* Fix ppviewer

* Fix helios

* Fix lpairs

* Remove autoreconf

* Remove 'x'

* Update helios-1.7.2.recipe

* revision update

* Change arch variable

* x86_64 issues has been fixed upstream

* patches of ppviewer hass been merged to upstream

* Patches of BDH-Calc has been merged to upstream
2018-01-02 11:44:13 -08:00

91 lines
2.3 KiB
Plaintext

From 0861af061dad76b3fdb3aa6f34ce06d74273b1b3 Mon Sep 17 00:00:00 2001
From: Markus Himmel <markus@himmel-villmar.de>
Date: Wed, 14 Jan 2015 19:19:28 +0000
Subject: applying patch lpairs-1.0.4.patch
diff --git a/configure b/configure
index 4dcecb1..a1908af 100755
--- a/configure
+++ b/configure
@@ -13034,7 +13034,7 @@ fi
localedir=$datadir/locale
locdir_flag="-DLOCALEDIR=\\\"$localedir\\\""
-inst_dir=$datadir/games/lpairs
+inst_dir=$datadir/lpairs
inst_flag="-DSRC_DIR=\\\"$inst_dir/\\\""
# Check whether --enable-install was given.
--
2.14.2
From 4055056b9afda14cee1255e846d3fb4ffb52743d Mon Sep 17 00:00:00 2001
From: Markus Himmel <markus@himmel-villmar.de>
Date: Wed, 14 Jan 2015 19:36:34 +0000
Subject: Move config to LGames folder in user settings
diff --git a/lpairs/cfg.c b/lpairs/cfg.c
index 301878a..a786e39 100644
--- a/lpairs/cfg.c
+++ b/lpairs/cfg.c
@@ -15,6 +15,11 @@
* *
***************************************************************************/
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#include <fs_info.h>
+#endif
+
#include <SDL/SDL.h>
#include <stdio.h>
#include <stdlib.h>
@@ -32,10 +37,18 @@ Cfg cfg;
*/
void C_StPth(char *p)
{
+ size_t length;
memset( c_pth, 0, sizeof( c_pth ) );
if (p[0] == '~') {
+#ifdef __HAIKU__
+ find_directory(B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false,
+ c_pth, sizeof(c_pth) - 1);
+ length = strlen(c_pth);
+ snprintf(c_pth+length, sizeof(c_pth)-(1+length), "/LGames%s", p+1);
+#else
snprintf(c_pth, sizeof(c_pth)-1, "%s%s",
home_dir, p+1);
+#endif
}
else
strncpy(c_pth, p, sizeof(c_pth)-1);
--
2.14.2
From 51114168f60efd37ff3b7983535512cff43c3123 Mon Sep 17 00:00:00 2001
From: Shiroko <hhx.xxm@gmail.com>
Date: Fri, 29 Dec 2017 12:52:29 +0000
Subject: Solved gcc2->gcc5 problem
diff --git a/lpairs/sdl.c b/lpairs/sdl.c
index 5937097..e4779c4 100644
--- a/lpairs/sdl.c
+++ b/lpairs/sdl.c
@@ -480,7 +480,7 @@ void hardware_cap()
/*
update rectangle (0,0,0,0)->fullscreen
*/
-inline void refresh_screen(int x, int y, int w, int h)
+void refresh_screen(int x, int y, int w, int h)
{
SDL_UpdateRect(sdl.screen, x, y, w, h);
}
--
2.14.2