diff --git a/games-strategy/7kaa/7kaa-2.15.5.recipe b/games-strategy/7kaa/7kaa-2.15.5.recipe index 0291249ec..4deb002a9 100644 --- a/games-strategy/7kaa/7kaa-2.15.5.recipe +++ b/games-strategy/7kaa/7kaa-2.15.5.recipe @@ -8,7 +8,7 @@ buildings with spies, or offering opponents money for their kingdom." HOMEPAGE="https://www.7kfans.com/" COPYRIGHT="Enlight Software Ltd." LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/the3dfxdude/7kaa/releases/download/v$portVersion/7kaa-$portVersion.tar.xz" CHECKSUM_SHA256="350a2681985feb4b71d20677d1a6d11921b9e3d97facbc94e4f020e848d8ab2b" PATCHES="7kaa-$portVersion.patchset" @@ -76,7 +76,7 @@ INSTALL() { mkdir -p $appsDir mkdir -p $dataDir - mv data/ $dataDir/7kaa + cp -R data/* $dataDir/7kaa mv $binDir/7kaa $appsDir/"Seven Kingdoms" diff --git a/games-strategy/7kaa/patches/7kaa-2.15.5.patchset b/games-strategy/7kaa/patches/7kaa-2.15.5.patchset index 52ed629c7..8390d23a4 100644 --- a/games-strategy/7kaa/patches/7kaa-2.15.5.patchset +++ b/games-strategy/7kaa/patches/7kaa-2.15.5.patchset @@ -1,11 +1,11 @@ -From 2805a040fc833ecb35a407b77a07a6a08b36c654 Mon Sep 17 00:00:00 2001 +From c9bb9e5e3ceed2b1bf942e29dac7101c5b6c4d52 Mon Sep 17 00:00:00 2001 From: Victor Gamper Date: Fri, 31 Dec 2021 02:19:54 +0100 Subject: 7kaa: fixed the config folder creation diff --git a/src/OMISC.cpp b/src/OMISC.cpp -index 409c1b1..d2e85a5 100644 +index 93a9900..e4baeb2 100644 --- a/src/OMISC.cpp +++ b/src/OMISC.cpp @@ -1216,6 +1216,15 @@ int misc_mkdir(char *path) @@ -25,5 +25,40 @@ index 409c1b1..d2e85a5 100644 int count; -- -2.30.2 +2.37.3 + + +From 511c6db404693d69228e8b0859ec3514c19630ed Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 11 May 2023 19:03:47 +0200 +Subject: change current dir after sdl init + + +diff --git a/src/OVGA.cpp b/src/OVGA.cpp +index 36a0583..0320136 100644 +--- a/src/OVGA.cpp ++++ b/src/OVGA.cpp +@@ -31,6 +31,10 @@ + #include + #include + ++#ifdef __HAIKU__ ++#include ++#endif ++ + DBGLOG_DEFAULT_CHANNEL(Vga); + + //--------- Declare static functions ---------// +@@ -87,6 +91,9 @@ int Vga::init() + + if (SDL_Init(SDL_INIT_VIDEO)) + return 0; ++#ifdef __HAIKU__ ++ chdir(PACKAGE_DATA_DIR); ++#endif + + init_window_size(); + +-- +2.37.3