From c7517882f1875c1986023c42867b6c4c70bc2bee Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 26 Feb 2025 10:47:18 -0500 Subject: [PATCH] OpenRCT2: update to 0.4.22. --- .../OpenRCT2/patches/i686-FormatToken.patch | 26 +++++++++++++++++++ srcpkgs/OpenRCT2/patches/time_t-musl.patch | 12 +++++++++ srcpkgs/OpenRCT2/template | 12 ++++----- 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/OpenRCT2/patches/i686-FormatToken.patch create mode 100644 srcpkgs/OpenRCT2/patches/time_t-musl.patch diff --git a/srcpkgs/OpenRCT2/patches/i686-FormatToken.patch b/srcpkgs/OpenRCT2/patches/i686-FormatToken.patch new file mode 100644 index 00000000000..b21b30ed3a3 --- /dev/null +++ b/srcpkgs/OpenRCT2/patches/i686-FormatToken.patch @@ -0,0 +1,26 @@ +diff --git a/src/openrct2/interface/InteractiveConsole.h b/src/openrct2/interface/InteractiveConsole.h +index 45ac4ee..ff5a835 100644 +--- a/src/openrct2/interface/InteractiveConsole.h ++++ b/src/openrct2/interface/InteractiveConsole.h +@@ -16,7 +16,7 @@ + struct DrawPixelInfo; + struct TextInputSession; + +-enum class FormatToken : uint8_t; ++enum class FormatToken; + + enum class ConsoleInput : uint8_t + { +diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h +index e8980e7..ad39eba 100644 +--- a/src/openrct2/localisation/FormatCodes.h ++++ b/src/openrct2/localisation/FormatCodes.h +@@ -13,7 +13,7 @@ + #include + #include + +-enum class FormatToken : uint8_t ++enum class FormatToken + { + Unknown, + Literal, diff --git a/srcpkgs/OpenRCT2/patches/time_t-musl.patch b/srcpkgs/OpenRCT2/patches/time_t-musl.patch new file mode 100644 index 00000000000..7b089fd1f10 --- /dev/null +++ b/srcpkgs/OpenRCT2/patches/time_t-musl.patch @@ -0,0 +1,12 @@ +diff --git a/src/openrct2-ui/interface/FileBrowser.h b/src/openrct2-ui/interface/FileBrowser.h +index baf4855..6174b85 100644 +--- a/src/openrct2-ui/interface/FileBrowser.h ++++ b/src/openrct2-ui/interface/FileBrowser.h +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include + + struct TrackDesign; diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template index bf35fa5be1a..e1e6a5f8088 100644 --- a/srcpkgs/OpenRCT2/template +++ b/srcpkgs/OpenRCT2/template @@ -2,12 +2,12 @@ # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421 pkgname=OpenRCT2 -version=0.4.19.1 +version=0.4.22 revision=1 # versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt -_objects_version=1.5.1 +_objects_version=1.6.1 _titles_version=0.4.14 -_replays_version=0.0.86 +_replays_version=0.0.87 _opensfx_version=1.0.5 _openmsx_version=1.6 build_style=cmake @@ -40,11 +40,11 @@ distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz https://github.com/OpenRCT2/OpenMusic/releases/download/v${_openmsx_version}/openmusic.zip>openmusic-${_openmsx_version}.zip https://github.com/OpenRCT2/replays/releases/download/v${_replays_version}/replays.zip>replays-${_replays_version}.zip https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip>title-sequences-${_titles_version}.zip" -checksum="7421c61a86875b68f1d1a371baeae50dd2e8b5825dd0d6899584f1de62e25887 - c6b800cbcd7b1b9c707f3657fbc5f2db9d3cfd9c2adf668accc9ddbacd7841df +checksum="a626c2ceea6a20a5edb7908c045de52629f5b48be40c05c29fbf42796df94344 + 6829186630e52c332b6a4847ebb936c549a522fcadaf8f5e5e4579c4c91a4450 a952148be164c128e4fd3aea96822e5f051edd9a0b1f2c84de7f7628ce3b2e18 f097d3a4ccd39f7546f97db3ecb1b8be73648f53b7a7595b86cccbdc1a7557e4 - c7a68c186e9bec827fe55eceb67e2b4cd789f239750ffff2da51f0c8d92bb16b + 4d5ed2b3fa62e239c0c8ed0c96b8d1f5be8d2be6a464b33603affc75a5ff510f 140df714e806fed411cc49763e7f16b0fcf2a487a57001d1e50fce8f9148a9f3" skip_extraction="objects-${_objects_version}.zip opensound-${_opensfx_version}.zip