diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-04-19 12:05:02 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-19 12:05:02 +0100 |
| commit | b6cfc0c19effe2d9f7b8ab303cd00636f16da253 (patch) | |
| tree | a0158050dac0a7ebfb9df4f667ec6ad2dd185538 /games-simulation | |
| parent | 2d01b3d133c0fbf17de8d7b47905585af88bd6e4 (diff) | |
gentoo auto-resync : 19:04:2024 - 12:05:02
Diffstat (limited to 'games-simulation')
| -rw-r--r-- | games-simulation/Manifest.gz | bin | 3936 -> 3931 bytes | |||
| -rw-r--r-- | games-simulation/openrct2/Manifest | 1 | ||||
| -rw-r--r-- | games-simulation/openrct2/files/openrct2-0.4.7-musl.patch | 55 |
3 files changed, 0 insertions, 56 deletions
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz Binary files differindex f1390dd012b4..70afe0c57df3 100644 --- a/games-simulation/Manifest.gz +++ b/games-simulation/Manifest.gz diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest index bbb5a40505d2..97d3b2e5c984 100644 --- a/games-simulation/openrct2/Manifest +++ b/games-simulation/openrct2/Manifest @@ -1,7 +1,6 @@ AUX README.gentoo 715 BLAKE2B c7e27f799a33a73dccd75bf2f28882bda609b3ba74fc98ca1b1fcdcbb91290a81a878d10fa1b9b15f0ebebe9ef496a7ac7b8fdfd3a455ca3ebad3dd3df908035 SHA512 c18d5b5950523e2abedd0f9218e71c1f7222615d34eb56c24c69f7dea446e17248086525603d1da63302db6e8c5b642086eb8b154fd531c26db611b9f799d4d8 AUX openrct2-0.4.0-include-additional-paths.patch 928 BLAKE2B 0af967acd22b8f11b15bfcb433b1c586dab100839bba49867c374669e27f9677c82f16c727b939dec28e95fbb42278b9661935aac3cc23fe6b8ad8b64901a029 SHA512 6f2359f8fbf1fc915909fe404300e016d4f8d55f3b0f59dbdbf10e6376c38c412de23394c2138fb56666be059221c60a8b488a6965f1b6be19e834a6fc624b53 AUX openrct2-0.4.1-gtest-1.10.patch 269 BLAKE2B 40e85e87627ca627faff555248a46307f79f923dffffae1b47af55643b64d2776c075ad237530d0a0a074ffd62a18ce021d72fc3c4b4126e2880683c75648908 SHA512 8526095e8716d4885524483e6fe6b6f2ba7edf29bc7bd30602f37aebd5bafdc3a299e5890d3844fc1d573c69244d5415f7d02791e6ac73f9e421f88987bce2dd -AUX openrct2-0.4.7-musl.patch 1834 BLAKE2B f2d939c659f0fedef6f7a0078d745e3163e488adc71f3ce1cb2dc0ec52ead5e887d8ad35417468d5c11e88d223fb0c9d180685d0d30c45ddc123000c34731674 SHA512 1004b8a8660e27c86872e7245da7c0bc93fc3547bb95d8d6d017ae9c4c296577f4401bc6721aeecd6732ecdb7dd998c96576074679238f421bfd77faec4bb3cb AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409 DIST openrct2-0.4.10.tar.gz 21854907 BLAKE2B 001918bf436be79a96b222971cdbb9118f26c5350c027360b749588c2112e8a12ae9aa435f6111dec1cb5c3f03d53560ca8b429c7ef0cccb4a5fe12eaf01c9ba SHA512 5ed9a6c790d5603fd1605669294a56908f493f347517d4c3bc8403df91b3678996d76980a42e9e3076b02fba598ee0bd33f2ad080762898cee7c40a865eed89d diff --git a/games-simulation/openrct2/files/openrct2-0.4.7-musl.patch b/games-simulation/openrct2/files/openrct2-0.4.7-musl.patch deleted file mode 100644 index 1096bc018ff2..000000000000 --- a/games-simulation/openrct2/files/openrct2-0.4.7-musl.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 010c19ba61a3180dab6350aadc578414ad0c0051 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conikost@gentoo.org> -Date: Mon, 1 Jan 2024 20:34:19 +0100 -Subject: [PATCH 1/2] src/openrct2/core/FileStream.cpp: drop ftello64, fseeko64 - -The static usage definition of ftello64 and friends is not correct. -While this currently works on glibc, this breaks on musl, as musl -already is LFS aware. The solution is to drop this and add instead -'-D_FILE_OFFSET_BITS=64' to the build system. - -Signed-off-by: Conrad Kostecki <conikost@gentoo.org> ---- - src/openrct2/core/FileStream.cpp | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/openrct2/core/FileStream.cpp b/src/openrct2/core/FileStream.cpp -index 90a7f7a366cc..6fd7b7b1b42c 100644 ---- a/src/openrct2/core/FileStream.cpp -+++ b/src/openrct2/core/FileStream.cpp -@@ -21,11 +21,6 @@ - # include <io.h> - #endif - --#if defined(__linux__) && !defined(__ANDROID__) --# define ftello ftello64 --# define fseeko fseeko64 --#endif -- - #ifdef _MSC_VER - # define ftello _ftelli64 - # define fseeko _fseeki64 - -From 7c638c786527a26a3e83d155ca8ff4d55f01347f Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conikost@gentoo.org> -Date: Mon, 1 Jan 2024 20:23:24 +0100 -Subject: [PATCH 2/2] CMakeLists.txt: add D_FILE_OFFSET_BITS=64 - -Signed-off-by: Conrad Kostecki <conikost@gentoo.org> -Signed-off-by: Conrad Kostecki <conrad@kostecki.com> ---- - src/openrct2/CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/openrct2/CMakeLists.txt b/src/openrct2/CMakeLists.txt -index 367939c9622c..55882a1097d3 100644 ---- a/src/openrct2/CMakeLists.txt -+++ b/src/openrct2/CMakeLists.txt -@@ -265,3 +265,7 @@ else () - # Dummy target to ease invocation - add_custom_target(${PROJECT_NAME}-headers-check) - endif () -+ -+if (UNIX) -+ add_definitions(-D_FILE_OFFSET_BITS=64) -+endif () |