diff --git a/games-simulation/simutrans/patches/simutrans-122.0.patchset b/games-simulation/simutrans/patches/simutrans-122.0.patchset index bb56c77b5..64c7e371a 100644 --- a/games-simulation/simutrans/patches/simutrans-122.0.patchset +++ b/games-simulation/simutrans/patches/simutrans-122.0.patchset @@ -1,31 +1,38 @@ -From fa13abc3706cfa8ea8ef130a026c5e65cfbf4eef Mon Sep 17 00:00:00 2001 +From 0955075a76eec41822ba97d5d338d9192b8f5ead Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Fri, 4 Jan 2019 19:45:50 +0100 Subject: Fix DT_DIR handling under Haiku diff --git a/sys/simsys.cc b/sys/simsys.cc -index 1ba72c4..d63a62e 100644 +index caa3b13..5420fc9 100644 --- a/sys/simsys.cc +++ b/sys/simsys.cc -@@ -470,7 +470,12 @@ const char *dr_query_fontpath(int which) +@@ -470,7 +470,9 @@ const char *dr_query_fontpath(int which) // look for subdirectories struct dirent *entry; while( (entry = readdir( dir )) ) { -+#ifdef __HAIKU__ -+ struct stat sp; -+ if( S_ISDIR(sp.st_mode )) { -+#else ++#ifndef __HAIKU__ if( entry->d_type == DT_DIR ) { +#endif if( ((strcmp( entry->d_name, "." )) != 0) && ((strcmp( entry->d_name, ".." )) != 0) ) { j++; if( subdir_offset < j ) { +@@ -483,7 +485,9 @@ const char *dr_query_fontpath(int which) + return buffer; + } + } ++#ifndef __HAIKU__ + } ++#endif + } + // last return parent folder + closedir( dir ); -- 2.30.2 -From c29b78f02c8b0ae734a08c8d71294f067feed183 Mon Sep 17 00:00:00 2001 +From 433a87d166f0c7c5afe911f9447d48f4ed08ecae Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Fri, 4 Jan 2019 19:45:50 +0100 Subject: Fix UINT type handling under Haiku diff --git a/games-simulation/simutrans/simutrans-122.0.recipe b/games-simulation/simutrans/simutrans-122.0.recipe index 2ddf64592..48207f8b1 100644 --- a/games-simulation/simutrans/simutrans-122.0.recipe +++ b/games-simulation/simutrans/simutrans-122.0.recipe @@ -9,11 +9,11 @@ HOMEPAGE="http://www.simutrans.com" COPYRIGHT="1997-2004 Hj. Malthaner 2005-2021 The Simutrans Team" LICENSE="Artistic" -REVISION="1" -SvnRevision="9901" -GitRevision="f3841f0a7fafc47d4d6d85372bdd2be4335434a0" +REVISION="2" +SvnRevision="9937" +GitRevision="960fc0700cc581dc89282712943689aeeeecfe4f" SOURCE_URI="https://github.com/aburch/simutrans/archive/$GitRevision.tar.gz" -CHECKSUM_SHA256="838feb8a8781001b326c4790f11c84e62d525d1feb137112ed33d0e9d8a111ad" +CHECKSUM_SHA256="865840c2bd4157e9aa91ac155f33611ae40d57274fc8d48577b0c1c9bb423750" SOURCE_FILENAME="simutrans-$GitRevision.tar.gz" SOURCE_DIR="simutrans-$GitRevision" PATCHES="simutrans-$portVersion.patchset" @@ -32,6 +32,8 @@ REQUIRES=" lib:libbz2$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libGL$secondaryArchSuffix + lib:libgraphite2$secondaryArchSuffix + lib:libharfbuzz$secondaryArchSuffix lib:libltdl$secondaryArchSuffix lib:libminiupnpc$secondaryArchSuffix lib:libpng16$secondaryArchSuffix @@ -44,6 +46,9 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libgraphite2$secondaryArchSuffix + devel:libharfbuzz$secondaryArchSuffix devel:libltdl$secondaryArchSuffix devel:libminiupnpc$secondaryArchSuffix devel:libpng16$secondaryArchSuffix