mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
OpenRCT2: Update to 0.4.30 (#13578)
This commit is contained in:
@@ -11,7 +11,7 @@ COPYRIGHT="2015-2025 OpenRCT2 team"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/OpenRCT2/OpenRCT2/archive/refs/tags/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="88492fb962236b8a23794620f7b075aac01674676385d68dca650b7f9664fcc0"
|
||||
CHECKSUM_SHA256="7be2f10cc5289cc6de18c31cb298217c26ac2400ffe2380f3cdadd18b7d8aec9"
|
||||
SOURCE_DIR="OpenRCT2-$portVersion"
|
||||
SOURCE_URI_2="https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.26/title-sequences.zip"
|
||||
CHECKSUM_SHA256_2="dabb9787b1576342fca4dd9f64b3f8cfa04a7e6ce9c2bb9610f47b762905c858"
|
||||
@@ -1,11 +1,11 @@
|
||||
From f710637402541c59f0c90a1d4882374cb9c16050 Mon Sep 17 00:00:00 2001
|
||||
From a2fec2f3fcd1499d048aeabd214410a817a5a8a5 Mon Sep 17 00:00:00 2001
|
||||
From: Peppersawce <michaelpeppers89@yahoo.it>
|
||||
Date: Tue, 25 Nov 2025 15:16:58 +0100
|
||||
Subject: Haiku patches
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9a8e0c8..234c3e3 100644
|
||||
index b6edd7f..5e33ea6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -368,7 +368,7 @@ else ()
|
||||
@@ -74,10 +74,10 @@ index f314c9c..e74c6be 100644
|
||||
target_link_libraries(libopenrct2 dl)
|
||||
endif ()
|
||||
diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
|
||||
index 78867e2..a7b9229 100644
|
||||
index e697a8a..aa405f1 100644
|
||||
--- a/src/openrct2/Context.cpp
|
||||
+++ b/src/openrct2/Context.cpp
|
||||
@@ -479,7 +479,7 @@ namespace OpenRCT2
|
||||
@@ -482,7 +482,7 @@ namespace OpenRCT2
|
||||
_discordService = std::make_unique<Network::DiscordService>();
|
||||
}
|
||||
#endif
|
||||
@@ -86,7 +86,7 @@ index 78867e2..a7b9229 100644
|
||||
if (Platform::ProcessIsElevated())
|
||||
{
|
||||
std::string elevationWarning = _localisationService->GetString(STR_ADMIN_NOT_RECOMMENDED);
|
||||
@@ -492,6 +492,7 @@ namespace OpenRCT2
|
||||
@@ -495,6 +495,7 @@ namespace OpenRCT2
|
||||
_uiContext->ShowMessageBox(elevationWarning);
|
||||
}
|
||||
}
|
||||
@@ -95,7 +95,7 @@ index 78867e2..a7b9229 100644
|
||||
if (Platform::IsRunningInWine())
|
||||
{
|
||||
diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h
|
||||
index 1467479..bccdc0c 100644
|
||||
index c56269e..ac7ba84 100644
|
||||
--- a/src/openrct2/Version.h
|
||||
+++ b/src/openrct2/Version.h
|
||||
@@ -72,6 +72,9 @@
|
||||
@@ -177,7 +177,7 @@ index 10218ef..f7be97c 100644
|
||||
#define _stricmp(x, y) strcasecmp((x), (y))
|
||||
#endif
|
||||
diff --git a/src/openrct2/network/Socket.cpp b/src/openrct2/network/Socket.cpp
|
||||
index 73e2447..c2f26df 100644
|
||||
index 795b96b..a76caff 100644
|
||||
--- a/src/openrct2/network/Socket.cpp
|
||||
+++ b/src/openrct2/network/Socket.cpp
|
||||
@@ -74,6 +74,10 @@
|
||||
@@ -192,7 +192,7 @@ index 73e2447..c2f26df 100644
|
||||
|
||||
namespace OpenRCT2::Network
|
||||
diff --git a/src/openrct2/platform/Platform.Linux.cpp b/src/openrct2/platform/Platform.Linux.cpp
|
||||
index 28ab833..cbf10a3 100644
|
||||
index 5bcb8f9..1b464be 100644
|
||||
--- a/src/openrct2/platform/Platform.Linux.cpp
|
||||
+++ b/src/openrct2/platform/Platform.Linux.cpp
|
||||
@@ -38,6 +38,10 @@
|
||||
@@ -238,8 +238,8 @@ index 28ab833..cbf10a3 100644
|
||||
2.52.0
|
||||
|
||||
|
||||
From e355dd5da70c07362e52a4cdbd4f87aaced01aee Mon Sep 17 00:00:00 2001
|
||||
From: Jérome Duval <jerome.duval@gmail.com>
|
||||
From d85ac36365ed223d8c1f95b8c9c38a9a972c0972 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=A9rome=20Duval?= <jerome.duval@gmail.com>
|
||||
Date: Tue, 23 Dec 2025 11:58:37 +0100
|
||||
Subject: Haiku patch for gcc
|
||||
|
||||
@@ -283,7 +283,7 @@ index 49adfd9..f055e10 100644
|
||||
public:
|
||||
Iterator& operator++()
|
||||
diff --git a/src/openrct2/platform/Platform.Linux.cpp b/src/openrct2/platform/Platform.Linux.cpp
|
||||
index cbf10a3..c057f30 100644
|
||||
index 1b464be..10bb18e 100644
|
||||
--- a/src/openrct2/platform/Platform.Linux.cpp
|
||||
+++ b/src/openrct2/platform/Platform.Linux.cpp
|
||||
@@ -7,7 +7,7 @@
|
||||
@@ -309,13 +309,13 @@ index 5329756..f8dee1e 100644
|
||||
#include "Platform.h"
|
||||
|
||||
diff --git a/src/openrct2/platform/Platform.h b/src/openrct2/platform/Platform.h
|
||||
index 00603ad..9b003ca 100644
|
||||
index 6d477c7..94e9aba 100644
|
||||
--- a/src/openrct2/platform/Platform.h
|
||||
+++ b/src/openrct2/platform/Platform.h
|
||||
@@ -102,7 +102,7 @@ namespace OpenRCT2::Platform
|
||||
std::string GetUsername();
|
||||
@@ -147,7 +147,7 @@ namespace OpenRCT2::Platform
|
||||
|
||||
std::string GetSteamPath();
|
||||
SteamPaths GetSteamPaths();
|
||||
bool triggerSteamDownload();
|
||||
-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
|
||||
std::string GetEnvironmentPath(const char* name);
|
||||
@@ -325,14 +325,14 @@ index 00603ad..9b003ca 100644
|
||||
2.52.0
|
||||
|
||||
|
||||
From 936cfa6bf2731701fb85bf71784da4cb3dfe13ef Mon Sep 17 00:00:00 2001
|
||||
From 3a05fa620126970ae4415f4e79bc5a317114de40 Mon Sep 17 00:00:00 2001
|
||||
From: Peppersawce <michaelpeppers89@yahoo.it>
|
||||
Date: Tue, 23 Dec 2025 14:58:19 +0100
|
||||
Subject: Disable installing linux desktop files
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 234c3e3..47e9f57 100644
|
||||
index 5e33ea6..8a2b6da 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -517,6 +517,7 @@ if (NOT MACOS_BUNDLE OR (MACOS_BUNDLE AND WITH_TESTS))
|
||||
@@ -355,17 +355,17 @@ index 234c3e3..47e9f57 100644
|
||||
2.52.0
|
||||
|
||||
|
||||
From b726196c72e9fc298607fb4f72cc180055062632 Mon Sep 17 00:00:00 2001
|
||||
From 726948309b8fa4980f330be5bd51ae6343cccfe4 Mon Sep 17 00:00:00 2001
|
||||
From: Peppersawce <michaelpeppers89@yahoo.it>
|
||||
Date: Wed, 24 Dec 2025 14:51:59 +0100
|
||||
Subject: Disable multi-threading by default
|
||||
|
||||
|
||||
diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp
|
||||
index a2fa8d8..1d482b9 100644
|
||||
index 2aef53b..672cb20 100644
|
||||
--- a/src/openrct2/config/Config.cpp
|
||||
+++ b/src/openrct2/config/Config.cpp
|
||||
@@ -226,7 +226,7 @@ namespace OpenRCT2::Config
|
||||
@@ -238,7 +238,7 @@ namespace OpenRCT2::Config
|
||||
// Always have multi-threading disabled in debug builds, this makes things slower.
|
||||
model->multiThreading = false;
|
||||
#else
|
||||
Reference in New Issue
Block a user