Am Sat, 4 May 2024 13:29:18 +0200 schrieb Solene Rapenne <sol...@perso.pw>:
> a simple bugfix release > https://cdn.openttd.org/openttd-releases/14.1/changelog.txt > > the removed patch is now present upstream > > tested on amd64, worked fine > > ok? I've basically came up with the same diff. Thank you, I'm fine with it! > diff --git a/games/openttd/Makefile b/games/openttd/Makefile > index 93bc2f773e3..196d46e20b1 100644 > --- a/games/openttd/Makefile > +++ b/games/openttd/Makefile > @@ -1,6 +1,6 @@ > COMMENT= open source clone of the game Transport Tycoon Deluxe > > -V = 14.0 > +V = 14.1 > DISTNAME = openttd-$V-source > PKGNAME = openttd-$V > > diff --git a/games/openttd/distinfo b/games/openttd/distinfo > index 6280a398312..5b5c852a3ae 100644 > --- a/games/openttd/distinfo > +++ b/games/openttd/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (openttd/openttd-14.0-source.tar.xz) = > lvdquFiBal4wA4reBpLm6/NQufcL8Zx7SN2oRciEGLE= -SIZE > (openttd/openttd-14.0-source.tar.xz) = 7997536 +SHA256 > (openttd/openttd-14.1-source.tar.xz) = > LBTI8B9EFIxPLIjBaaMKvNsALrEoqSua23a6p2sBNJQ= +SIZE > (openttd/openttd-14.1-source.tar.xz) = 8015032 diff --git > a/games/openttd/patches/patch-src_core_random_func_cpp > b/games/openttd/patches/patch-src_core_random_func_cpp deleted file > mode 100644 index 5b1654c5db0..00000000000 --- > a/games/openttd/patches/patch-src_core_random_func_cpp +++ /dev/null > @@ -1,12 +0,0 @@ -Index: src/core/random_func.cpp > ---- src/core/random_func.cpp.orig > -+++ src/core/random_func.cpp > -@@ -113,7 +113,7 @@ void RandomBytesWithFallback(std::span<uint8_t> > buf) > - #if defined(_WIN32) > - auto res = BCryptGenRandom(nullptr, > static_cast<PUCHAR>(buf.data()), static_cast<ULONG>(buf.size()), > BCRYPT_USE_SYSTEM_PREFERRED_RNG); > - if (res >= 0) return; > --#elif defined(__APPLE__) || defined(__NetBSD__) || > defined(__FreeBSD__) -+#elif defined(__APPLE__) || > defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) > - arc4random_buf(buf.data(), buf.size()); > - return; > - #elif defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) > && (__GLIBC_MINOR__ >= 25))) > -- greetings, Florian Viehweger
