diff --git a/games-puzzle/fish-fillets/fish_fillets-1.0.1.recipe b/games-puzzle/fish-fillets/fish_fillets-1.0.1.recipe index a35569eb7..e9205c567 100644 --- a/games-puzzle/fish-fillets/fish_fillets-1.0.1.recipe +++ b/games-puzzle/fish-fillets/fish_fillets-1.0.1.recipe @@ -7,12 +7,13 @@ fish. The whole game is accompanied by quiet, comforting music." HOMEPAGE="http://fillets.sourceforge.net/" COPYRIGHT="2004-2011 Ivo Danihelka" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="http://prdownloads.sourceforge.net/fillets/fillets-ng-$portVersion.tar.gz" CHECKSUM_SHA256="329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da" SOURCE_DIR="fillets-ng-1.0.1" SOURCE_URI_2="http://prdownloads.sourceforge.net/fillets/fillets-ng-data-$portVersion.tar.gz" CHECKSUM_SHA256_2="f0c979fb35ec550a43246fc209add8f45ca550a382c94d6383bb3f01b1073799" +PATCHES="fish_fillets-$portVersion.patchset" ADDITIONAL_FILES="fish_fillets.rdef.in" ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -26,23 +27,23 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libfribidi$secondaryArchSuffix lib:liblua$secondaryArchSuffix >= 5.1 - lib:libsdl$secondaryArchSuffix - lib:libsdl_image$secondaryArchSuffix - lib:libsdl_mixer$secondaryArchSuffix - lib:libsdl_ttf$secondaryArchSuffix + lib:libSDL_1.2$secondaryArchSuffix + lib:libSDL_image_1.2$secondaryArchSuffix + lib:libSDL_mixer_1.2$secondaryArchSuffix + lib:libSDL_ttf_2.0$secondaryArchSuffix lib:libsmpeg$secondaryArchSuffix -" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfribidi$secondaryArchSuffix devel:liblua$secondaryArchSuffix >= 5.1 - devel:libsdl$secondaryArchSuffix - devel:libsdl_image$secondaryArchSuffix - devel:libsdl_mixer$secondaryArchSuffix - devel:libsdl_ttf$secondaryArchSuffix + devel:libSDL$secondaryArchSuffix + devel:libSDL_image$secondaryArchSuffix + devel:libSDL_mixer$secondaryArchSuffix + devel:libSDL_ttf$secondaryArchSuffix devel:libsmpeg$secondaryArchSuffix -" + " BUILD_PREREQUIRES=" cmd:autoconf cmd:gcc$secondaryArchSuffix @@ -50,7 +51,7 @@ BUILD_PREREQUIRES=" cmd:lua5.1$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix -" + " BUILD() { diff --git a/games-puzzle/fish-fillets/patches/fish_fillets-1.0.1.patchset b/games-puzzle/fish-fillets/patches/fish_fillets-1.0.1.patchset new file mode 100644 index 000000000..b78e555d1 --- /dev/null +++ b/games-puzzle/fish-fillets/patches/fish_fillets-1.0.1.patchset @@ -0,0 +1,22 @@ +From 1b528015bc27f2f6699b01cd6e02eb1e4480d703 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Fri, 30 Aug 2019 11:18:09 +0200 +Subject: Fix userdir path + + +diff --git a/src/gengine/OptionAgent.cpp b/src/gengine/OptionAgent.cpp +index dc2fb00..453eff5 100644 +--- a/src/gengine/OptionAgent.cpp ++++ b/src/gengine/OptionAgent.cpp +@@ -38,7 +38,7 @@ + + //NOTE: userdir = $HOME + USER_DATA_DIR + #ifndef USER_DATA_DIR +-#define USER_DATA_DIR ".fillets-ng" ++#define USER_DATA_DIR "config/settings/fillets-ng" + #endif + + const char *OptionAgent::CONFIG_FILE = "script/options.lua"; +-- +2.21.0 +