diff --git a/games-simulation/simutrans/patches/simutrans-122.0.patchset b/games-simulation/simutrans/patches/simutrans-123.0.1.patchset similarity index 61% rename from games-simulation/simutrans/patches/simutrans-122.0.patchset rename to games-simulation/simutrans/patches/simutrans-123.0.1.patchset index 64c7e371a..e717b9ce4 100644 --- a/games-simulation/simutrans/patches/simutrans-122.0.patchset +++ b/games-simulation/simutrans/patches/simutrans-123.0.1.patchset @@ -1,14 +1,14 @@ -From 0955075a76eec41822ba97d5d338d9192b8f5ead Mon Sep 17 00:00:00 2001 +From c76e7b2b9fec72b2e56c9664ed05052100174d80 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 caa3b13..5420fc9 100644 +index 4541b20..30a2af5 100644 --- a/sys/simsys.cc +++ b/sys/simsys.cc -@@ -470,7 +470,9 @@ const char *dr_query_fontpath(int which) +@@ -476,7 +476,9 @@ const char *dr_query_fontpath(int which) // look for subdirectories struct dirent *entry; while( (entry = readdir( dir )) ) { @@ -18,7 +18,7 @@ index caa3b13..5420fc9 100644 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) +@@ -489,7 +491,9 @@ const char *dr_query_fontpath(int which) return buffer; } } @@ -32,50 +32,76 @@ index caa3b13..5420fc9 100644 2.30.2 -From 433a87d166f0c7c5afe911f9447d48f4ed08ecae Mon Sep 17 00:00:00 2001 +From 6f8dea69fb6267f0809b5a7de44210cc35dedcb7 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/simtypes.h b/simtypes.h -index 2f687ec..9fa48aa 100644 +index 8ca5bf5..15bff0a 100644 --- a/simtypes.h +++ b/simtypes.h @@ -9,6 +9,7 @@ - - #include "utils/for.h" - #include + + #include "utils/for.h" + #include +#include - - #ifndef PATH_MAX - #ifdef MAX_PATH + + #ifndef PATH_MAX + #ifdef MAX_PATH @@ -169,19 +170,25 @@ typedef unsigned short uint16; - #ifndef __BEOS__ - typedef signed int sint32; - #ifndef NO_UINT32_TYPES + #ifndef __BEOS__ + typedef signed int sint32; + #ifndef NO_UINT32_TYPES +#ifndef __HAIKU__ - typedef unsigned int uint32; - #endif + typedef unsigned int uint32; + #endif +#endif - #else - // BeOS: int!=long (even though both 32 bit) - typedef signed long sint32; - #ifndef NO_UINT32_TYPES + #else + // BeOS: int!=long (even though both 32 bit) + typedef signed long sint32; + #ifndef NO_UINT32_TYPES +#ifndef __HAIKU__ - typedef unsigned long uint32; - #endif - #endif + typedef unsigned long uint32; + #endif + #endif +#endif - typedef signed long long sint64; - #ifndef NO_UINT64_TYPES + typedef signed long long sint64; + #ifndef NO_UINT64_TYPES +#ifndef __HAIKU__ - typedef unsigned long long uint64; - #endif + typedef unsigned long long uint64; + #endif +#endif - #ifdef _MSC_VER - # define GCC_PACKED - # define GCC_ALIGN(a) + #ifdef _MSC_VER + # define GCC_PACKED + # define GCC_ALIGN(a) +-- +2.30.2 + + +From f6d08a8374f251df352062c18b49431199e029cc Mon Sep 17 00:00:00 2001 +From: Ken Mays +Date: Fri, 4 Jan 2019 19:45:50 +0100 +Subject: Fix save game issue on Haiku + + +diff --git a/dataobj/loadsave.cc b/dataobj/loadsave.cc +index 5772ae2..84f0143 100644 +--- a/dataobj/loadsave.cc ++++ b/dataobj/loadsave.cc +@@ -31,7 +31,11 @@ + + #define INVALID_RDWR_ID (-1) + ++#ifdef __HAIKU__ ++#undef MULTI_THREAD ++#else + //#undef MULTI_THREAD ++#endif + + // buffer size for read/write - bzip2 gains up to 8M for non-threaded, 1M for threaded. binary, zipped ok with 256K or smaller. + #define LS_BUF_SIZE (1 << 20) // 1 MiB -- 2.30.2 diff --git a/games-simulation/simutrans/simutrans-122.0.recipe b/games-simulation/simutrans/simutrans-123.0.1.recipe similarity index 85% rename from games-simulation/simutrans/simutrans-122.0.recipe rename to games-simulation/simutrans/simutrans-123.0.1.recipe index 5b219f356..d71da3788 100644 --- a/games-simulation/simutrans/simutrans-122.0.recipe +++ b/games-simulation/simutrans/simutrans-123.0.1.recipe @@ -6,20 +6,18 @@ Interconnect districts, cities, public buildings, industries and \ tourist attractions by building a transport network you always dreamed \ of." HOMEPAGE="http://www.simutrans.com" -COPYRIGHT="1997-2004 Hj. Malthaner - 2005-2021 The Simutrans Team" +COPYRIGHT="1997-2004 Hansjörg Malthaner + 2005-2022 The Simutrans Team" LICENSE="Artistic" -REVISION="2" -SvnRevision="9937" -GitRevision="960fc0700cc581dc89282712943689aeeeecfe4f" -SOURCE_URI="https://github.com/aburch/simutrans/archive/$GitRevision.tar.gz" -CHECKSUM_SHA256="865840c2bd4157e9aa91ac155f33611ae40d57274fc8d48577b0c1c9bb423750" -SOURCE_FILENAME="simutrans-$GitRevision.tar.gz" -SOURCE_DIR="simutrans-$GitRevision" +REVISION="1" +SvnRevision="10421" +SOURCE_URI="https://sourceforge.net/projects/simutrans/files/simutrans/123-0-1/simutrans-src-123-0-1.zip" +CHECKSUM_SHA256="8deb38c8de41fb5558640cdd4b9b161c38de92c077b3e506f74c34f93214f469" +SOURCE_FILENAME="simutrans-$portVersion.zip" +SOURCE_DIR="" PATCHES="simutrans-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="?x86" PROVIDES=" simutrans$secondaryArchSuffix = $portVersion