beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Ports: Update openrct2 to version 0.4.9

Browse source
This commit is contained in:
Julian Offenhäuser 2024-03-24 17:01:00 +01:00 committed by Tim Schumacher
parent 87f51ef7dd
commit 003ac1bd51
Notes: sideshowbarker 2024-07-16 21:51:02 +09:00 
Author: https://github.com/janso3
Commit: https://github.com/SerenityOS/serenity/commit/003ac1bd51
Pull-request: https://github.com/SerenityOS/serenity/pull/23702
Reviewed-by: https://github.com/timschumi ✅
10 changed files with 15 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -234,7 +234,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`ObjFW`](ObjFW/) | ObjFW | 8d19ba9 | https://objfw.nil.im/ | | [`ObjFW`](ObjFW/) | ObjFW | 8d19ba9 | https://objfw.nil.im/ |
| [`oksh`](oksh/) | oksh | 7.1 | https://github.com/ibara/oksh | | [`oksh`](oksh/) | oksh | 7.1 | https://github.com/ibara/oksh |
| [`OpenJDK`](OpenJDK/) | OpenJDK | 17.0.6 | https://openjdk.java.net/ | | [`OpenJDK`](OpenJDK/) | OpenJDK | 17.0.6 | https://openjdk.java.net/ |
| [`openrct2`](openrct2/) | OpenRCT2 | 0.4.8 | https://openrct2.org/ | | [`openrct2`](openrct2/) | OpenRCT2 | 0.4.9 | https://openrct2.org/ |
| [`openssh`](openssh/) | OpenSSH | 9.0-94eb685 | https://github.com/openssh/openssh-portable | | [`openssh`](openssh/) | OpenSSH | 9.0-94eb685 | https://github.com/openssh/openssh-portable |
| [`openssl`](openssl/) | OpenSSL | 3.1.2 | https://www.openssl.org/ | | [`openssl`](openssl/) | OpenSSL | 3.1.2 | https://www.openssl.org/ |
| [`openttd`](openttd/) | OpenTTD | 13.4 | https://www.openttd.org/ | | [`openttd`](openttd/) | OpenTTD | 13.4 | https://www.openttd.org/ |

6
Ports/openrct2/package.sh
View file

@ -1,6 +1,6 @@
#!/usr/bin/env -S bash ../.port_include.sh #!/usr/bin/env -S bash ../.port_include.sh
port='openrct2' port='openrct2'
version='0.4.8' version='0.4.9'
depends=( depends=(
'curl' 'curl'
'flac' 'flac'
@ -18,8 +18,8 @@ depends=(
'zlib' 'zlib'
) )
files=( files=(
"https://github.com/OpenRCT2/OpenRCT2/archive/refs/tags/v${version}.tar.gz#b79bdfd91e2676b0238a94ef3a53bf13a6b6ba417a8d77056a8ea2a903967fd1" "https://github.com/OpenRCT2/OpenRCT2/archive/refs/tags/v${version}.tar.gz#d9eb7bb99923152122716707888a6182491662e106bef91b86106fa7b45b4309"
"https://github.com/OpenRCT2/OpenRCT2/releases/download/v${version}/OpenRCT2-${version}-linux-jammy-x86_64.tar.gz#a9152601612e2c5249324bce849c5fbdbfe40886128cf3848aae4b62b0c51936" "https://github.com/OpenRCT2/OpenRCT2/releases/download/v${version}/OpenRCT2-${version}-linux-jammy-x86_64.tar.gz#f388d46956f32755a504df1582fea7b800a8c100333667cb3f9c495c5c9d7201"
) )
useconfigure='true' useconfigure='true'
workdir="OpenRCT2-${version}" workdir="OpenRCT2-${version}"

2
Ports/openrct2/patches/0001-Add-SerenityOS-platform-detection.patch
View file

@ -9,7 +9,7 @@ We teach OpenRCT2 about the name of our platform.
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h
index 4495fa0b66b840b88034d2e8e3e023b1a1edfb68..1212b43a3745a46ab4ed6d4316ab4894a1f96ddc 100644 index 14c26ea19956318a1a82d21d69a63c6a2cebdbe6..07df815d073a4e623ac9ae5ff01936e1055a9891 100644
--- a/src/openrct2/Version.h --- a/src/openrct2/Version.h
+++ b/src/openrct2/Version.h +++ b/src/openrct2/Version.h
@@ -70,6 +70,9 @@ @@ -70,6 +70,9 @@

36
Ports/openrct2/patches/0002-Add-missing-includes.patch
View file

@ -1,36 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Offenh=C3=A4user?= <offenhaeuser@protonmail.com>
Date: Tue, 7 Feb 2023 21:21:46 +0100
Subject: [PATCH] Add missing includes
These are missing when compiling the release build.
---
src/openrct2/core/String.cpp | 1 +
src/openrct2/network/Socket.cpp | 2 ++
2 files changed, 3 insertions(+)
diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp
index 4cc60ce853d4ab8b707483c949032f48271f9660..32a88bde45fd53082cf5ba38c9f7bd02a6c16d5d 100644
--- a/src/openrct2/core/String.cpp
+++ b/src/openrct2/core/String.cpp
@@ -8,6 +8,7 @@
*****************************************************************************/
#include <algorithm>
+#include <alloca.h>
#include <cctype>
#include <cwctype>
#include <iomanip>
diff --git a/src/openrct2/network/Socket.cpp b/src/openrct2/network/Socket.cpp
index b8b2edbf32a292acefc67893e4c6f1f12f266691..a84c92fc471b55bdf9476821a234cd727a0b370b 100644
--- a/src/openrct2/network/Socket.cpp
+++ b/src/openrct2/network/Socket.cpp
@@ -52,6 +52,8 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+ #include <sys/time.h>
+ #include <sys/select.h>
#include <unistd.h>
#include "../common.h"
using SOCKET = int32_t;

0
Ports/openrct2/patches/0003-Read-the-executable-path-from-proc-self-exe.patch → Ports/openrct2/patches/0002-Read-the-executable-path-from-proc-self-exe.patch
View file

0
Ports/openrct2/patches/0004-Remove-use-of-strptime.patch → Ports/openrct2/patches/0003-Remove-use-of-strptime.patch
View file

6
Ports/openrct2/patches/0005-Add-compile-options-to-CMakeLists.txt.patch → Ports/openrct2/patches/0004-Add-compile-options-to-CMakeLists.txt.patch
View file

@ -9,10 +9,10 @@ This irons out some compiler warnings that turned into errors when compiling a r
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index e10c7a2f1115916f52c389f0774b69aa03c6cf37..59df8b88d3b937fd8c61d6f8b98c4ba4d12783bc 100644 index 0f62a0bb62ebb1ea867898f3eb18e819d6a513ac..6a5da9dd95fb23f2063e79951b0df29032f9dcc0 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -301,6 +301,8 @@ else () @@ -304,6 +304,8 @@ else ()
# unused-const-variable[=2] would check for unused values from headers as well # unused-const-variable[=2] would check for unused values from headers as well
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_UNUSED_CONST_VARIABLE -Wunused-const-variable=1) ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_UNUSED_CONST_VARIABLE -Wunused-const-variable=1)
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WNO_CLOBBERED -Wno-clobbered) ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WNO_CLOBBERED -Wno-clobbered)
@ -21,7 +21,7 @@ index e10c7a2f1115916f52c389f0774b69aa03c6cf37..59df8b88d3b937fd8c61d6f8b98c4ba4
# Disabled due to problems compiling OpenSSL on macOS. # Disabled due to problems compiling OpenSSL on macOS.
# ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_DOCUMENTATION -Wdocumentation) # ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_DOCUMENTATION -Wdocumentation)
@@ -310,7 +312,7 @@ else () @@ -313,7 +315,7 @@ else ()
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_REDUNDANT_DECLS -Wredundant-decls) ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_REDUNDANT_DECLS -Wredundant-decls)
# Currently used MinGW w/GCC 7.2 doesn't provide sane error messages for this # Currently used MinGW w/GCC 7.2 doesn't provide sane error messages for this

0
Ports/openrct2/patches/0006-Disable-locale-detection-for-writing-the-default-con.patch → Ports/openrct2/patches/0005-Disable-locale-detection-for-writing-the-default-con.patch
View file

4
Ports/openrct2/patches/0007-Disable-g2.dat-target.patch → Ports/openrct2/patches/0006-Disable-g2.dat-target.patch
View file

@ -9,10 +9,10 @@ Normally, the build system uses one of the compiled binaries to pack assets into
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59df8b88d3b937fd8c61d6f8b98c4ba4d12783bc..86e6b82ae0a2cdc1fd6e209bd39b9b9292411f47 100644 index 6a5da9dd95fb23f2063e79951b0df29032f9dcc0..aff9e6bed903b3701fff69c098adf619326f92c4 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -389,7 +389,7 @@ endif () @@ -395,7 +395,7 @@ endif ()
# g2 # g2

16
Ports/openrct2/patches/ReadMe.md
View file

@ -6,37 +6,31 @@ Add SerenityOS platform detection
We teach OpenRCT2 about the name of our platform. We teach OpenRCT2 about the name of our platform.
## `0002-Add-missing-includes.patch` ## `0002-Read-the-executable-path-from-proc-self-exe.patch`
Add missing includes
These are missing when compiling the release build.
## `0003-Read-the-executable-path-from-proc-self-exe.patch`
Read the executable path from /proc/self/exe Read the executable path from /proc/self/exe
When looking for the executable path, we behave exactly like Linux. When looking for the executable path, we behave exactly like Linux.
## `0004-Remove-use-of-strptime.patch` ## `0003-Remove-use-of-strptime.patch`
Remove use of strptime() Remove use of strptime()
This is a hack to patch out strptime() from duktape, which is not being used by this project. This is a hack to patch out strptime() from duktape, which is not being used by this project.
## `0005-Add-compile-options-to-CMakeLists.txt.patch` ## `0004-Add-compile-options-to-CMakeLists.txt.patch`
Add compile options to CMakeLists.txt Add compile options to CMakeLists.txt
This irons out some compiler warnings that turned into errors when compiling a release build. This irons out some compiler warnings that turned into errors when compiling a release build.
## `0006-Disable-locale-detection-for-writing-the-default-con.patch` ## `0005-Disable-locale-detection-for-writing-the-default-con.patch`
Disable locale detection for writing the default config.ini Disable locale detection for writing the default config.ini
At the time of writing, locale support in Serenity is not great. We always returned the "C" locale, which this code interpreted wrong. Since this is just used for writing a default value to the game config (which can be changed later), we just default to English. At the time of writing, locale support in Serenity is not great. We always returned the "C" locale, which this code interpreted wrong. Since this is just used for writing a default value to the game config (which can be changed later), we just default to English.
## `0007-Disable-g2.dat-target.patch` ## `0006-Disable-g2.dat-target.patch`
Disable g2.dat target Disable g2.dat target