diff --git a/community/openrct2/0002-gtest.patch b/community/openrct2/0002-gtest.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0224f17da2a126b57cca1a9688eb46dd13bc1aef
--- /dev/null
+++ b/community/openrct2/0002-gtest.patch
@@ -0,0 +1,11 @@
+Taken from Gentoo
+https://gitweb.gentoo.org/repo/gentoo.git/tree/games-simulation/openrct2/files/openrct2-0.4.1-gtest-1.10.patch
+
+--- a/test/tests/ReplayTests.cpp
++++ b/test/tests/ReplayTests.cpp
+@@ -115,4 +115,5 @@
+ }
+ };
+
++GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ReplayTests);
+ INSTANTIATE_TEST_SUITE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());
diff --git a/community/openrct2/0003-disable-version-check.patch b/community/openrct2/0003-disable-version-check.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1491dc6636f18c2aa8970f1ed9b1d8ea1ea69e21
--- /dev/null
+++ b/community/openrct2/0003-disable-version-check.patch
@@ -0,0 +1,45 @@
+Disable the version check as the package is managed through apk
+
+diff --git a/src/openrct2/Version.cpp b/src/openrct2/Version.cpp
+index 703d110..5121a3a 100644
+--- a/src/openrct2/Version.cpp
++++ b/src/openrct2/Version.cpp
+@@ -59,38 +59,5 @@ NewVersionInfo get_latest_version()
+ // with invalid data.
+ std::string tag = gVersionInfoTag;
+ NewVersionInfo verinfo{ tag, "", "", "" };
+-#ifndef DISABLE_HTTP
+- auto now = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+- auto then = gConfigGeneral.LastVersionCheckTime;
+- if (then < now - 24 * 60 * 60)
+- {
+- Http::Request request;
+- request.url = "https://api.github.com/repos/OpenRCT2/OpenRCT2/releases/latest";
+- request.method = Http::Method::GET;
+-
+- Http::Response res;
+- try
+- {
+- res = Do(request);
+- if (res.status != Http::Status::Ok)
+- throw std::runtime_error("bad http status");
+- }
+- catch (std::exception& e)
+- {
+- Console::Error::WriteLine("Failed to download '%s', cause %s", request.url.c_str(), e.what());
+- return {};
+- }
+-
+- json_t root = Json::FromString(res.body);
+-
+- verinfo.tag = Json::GetString(root["tag_name"]);
+- verinfo.name = Json::GetString(root["name"]);
+- verinfo.changelog = Json::GetString(root["body"]);
+- verinfo.url = Json::GetString(root["html_url"]);
+-
+- gConfigGeneral.LastVersionCheckTime = now;
+- ConfigSaveDefault();
+- }
+-#endif
+ return verinfo;
+ }
diff --git a/community/openrct2/0004-ftello.patch b/community/openrct2/0004-ftello.patch
deleted file mode 100644
index 1afcf673ee71e9c673211720b22271861ec1da20..0000000000000000000000000000000000000000
--- a/community/openrct2/0004-ftello.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/openrct2/core/FileStream.cpp b/src/openrct2/core/FileStream.cpp
-index 90a7f7a36..6fd7b7b1b 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
diff --git a/community/openrct2/APKBUILD b/community/openrct2/APKBUILD
index a4495cd61af041a3503693c9c77660cfd570f31a..c2c9acbd931e1bf77f76d1343f66c9ead2eec046 100644
--- a/community/openrct2/APKBUILD
+++ b/community/openrct2/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=openrct2
-pkgver=0.4.4
-_pkgver_objects=1.3.10
-_pkgver_title_sequences=0.4.0
+pkgver=0.4.8
+_pkgver_objects=1.3.11
+_pkgver_title_sequences=0.4.6
_pkgver_replays=0.0.78
_pkgver_opensfx=1.0.3
-_pkgver_openmsx=1.2.0
-pkgrel=3
+_pkgver_openmsx=1.4
+pkgrel=0
pkgdesc="Open-source re-implementation of Roller Coaster Tycoon 2"
# s390x is not supported upstream
arch="all !s390x"
@@ -43,12 +43,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/openrct2/openrct2/archive/re
$pkgname-$_pkgver_openmsx-openmsx.zip::https://github.com/OpenRCT2/OpenMusic/releases/download/v$_pkgver_openmsx/openmusic.zip
Werror.patch
0001-int32_t.patch
- 0004-ftello.patch
+ 0002-gtest.patch
+ 0003-disable-version-check.patch
"
-# localisation tests fail with new libstdc++ support
-#options="!check"
case "$CARCH" in
-arm*) options="!check" ;; # https://github.com/OpenRCT2/OpenRCT2/issues/12727
+ arm*) options="!check" ;; # https://github.com/OpenRCT2/OpenRCT2/issues/12727
esac
builddir="$srcdir/OpenRCT2-$pkgver"
@@ -86,8 +85,23 @@ build() {
check() {
ln -s "$builddir"/data build/data
- cd build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "replay_tests|string|localisation|enummaptests"
+
+ local skipped_tests=""
+ local tests="
+ replay_tests
+ string
+ localisation
+ enummaptests
+ Localisation.RCT2_to_UTF8_JP
+ Localisation.RCT2_to_UTF8_ZH_TW
+ Localisation.RCT2_to_UTF8_ZH_TW_PREMATURE_END
+ RideRatings.BigMap
+ StringTest.Convert_950_to_UTF8
+ "
+ for test in $tests; do
+ skipped_tests="$skipped_tests|$test"
+ done
+ ctest --test-dir build --output-on-failure -E "$skipped_tests"
}
package() {
@@ -109,13 +123,14 @@ cli() {
amove usr/bin/openrct2-cli
}
sha512sums="
-8e969e08023a6232dfffa31593cfacedafdf5eb778d1c1471deb095b3d056006ea0c1b219c9042f9fe94118fcbde219580ba2fca29d70a042a016a7fde0abdc9 openrct2-0.4.4.tar.gz
-fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487 openrct2-0.4.0-title_sequences.zip
-64efe9a147b31e3b88e816558b205b3a1709473ded75193f5838d9bb86c07dfec2bc0e6cd6ec3f9e12327247a015f455bc71024a4645b23d683ea238cb25b14d openrct2-1.3.10-objects.zip
+5035eff3cef4f05e60d3ac0ab76648cbda4553068ba44c81faec2344e6665c5bf6319ddb5f336c20f49369cefd0378aa725da10824217d6af5be81b99f660b9f openrct2-0.4.8.tar.gz
+bd7d0f25047540572be75a4a8886e8dabdceb7a3e11fdeb5473b66fe804d829acdb763d34ec7cfa656df9bc527268a3e0e7ca09c699995804b22ff2a529ad5da openrct2-0.4.6-title_sequences.zip
+98ab374a4899f60f45d6c87a570298a5788ec8cf277b67cb6b54c2f68388a99f201705377406b883eac45a97edff3cf7736898ed0b97a290f3d999dad7c821b9 openrct2-1.3.11-objects.zip
c6ff18c2206192ed4fb56535732137229f9bced96da00037d691bc64dcdb102cffe37f180054319e7c8ef8dbbd7de49792c3a7e845199fa180612ed97a149b32 openrct2-0.0.78-replays.zip
89784703fb2cda67b5440e06381b44e59ce4a42a88004761c76f0c2b23f78be3692e5fe5e2c8655943e04f7a45e479cfcbc2c3998202222dab16a092b9a73195 openrct2-1.0.3-opensfx.zip
-29e3ce57553571b9bf8630520245dbc756f2640318aa4102ec9ff358d7b4507fdb669366d7934620bf50a4445aa9107c52bd93ed6202b565e9e90521638edbb6 openrct2-1.2.0-openmsx.zip
+3a05addea8fbf73c73e2c5b0d219cc5ed396b0e520625374d057e27c15a7a4069c3fe8478b0a26f9241912a8e7b91661a08621498c91b618930c86fd33b1f201 openrct2-1.4-openmsx.zip
cd39a38a59b8544d38895255e8719a8c1ca404d56073649c2434db5c4aa121d4f86460cb90e04d16d5da61dff95826de9a634d433087c08dcc4f2222208507b1 Werror.patch
c56151de6ec2f4b9ca279ef038e3c3be87f1a61d6d6ebb1abbddc0aabbd5913aaa88fa724663cd2e2cd3729868b61e727c3dcfd03af5685ed6ca583e16ee0cb3 0001-int32_t.patch
-98b7f0d0fda5a25aaec21e31a65e15cf9cff647af66e1e619afb43d01662d050390f936435e761d8eacdf1c44cd12b7c69009af9791fc77436af41e43ba75b32 0004-ftello.patch
+92231018fdfa42bd62bc0318dbd886f01837f655906d14565a1f9af3a7a6d5cde8d09bbb8eeedd904791dfd56d2cc64187ce27bc1333c52bdc028191d696a0c9 0002-gtest.patch
+bed74cd3895e5aaeab6865af949d909222b14de6bc42401bf0f787a9924319c6e5b20ce4974d61a4913475c0d169d4062e9cf0656ccb348a2b92f24ca19c3b48 0003-disable-version-check.patch
"