SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

Ports: Update gemrb to 0.9.5

Browse Source 
The dropped patches were addressed upstream:
- https://github.com/gemrb/gemrb/commit/a5e6be23d9c803a35a290ad2b38a0d0a92574b74
- https://github.com/gemrb/gemrb/commit/d1099bc7fa02281c23e952ce53ffdc1bd47fd185
This commit is contained in:
Linus Groh authored and Lucas Chollet committed 2026-09-21 09:58:38 +02:00
1 parent 15c4a2431c
commit ae561e204e
7 files changed
+9 -82
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Ports/AvailablePorts.md
+1 -1
View File
@@ -97,7 +97,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`gcc`](gcc/) | GNU Compiler Collection | 16.2.0 | https://gcc.gnu.org/ |
| [`gdb`](gdb/) | GNU Project Debugger | 11.2 | https://sourceware.org/gdb |
| [`gdk-pixbuf`](gdk-pixbuf/) | GdkPixbuf | 2.42.12 | https://gitlab.gnome.org/GNOME/gdk-pixbuf/ |
| [`gemrb`](gemrb/) | GemRB | 0.9.2 | https://gemrb.org/ |
| [`gemrb`](gemrb/) | GemRB | 0.9.5 | https://gemrb.org/ |
| [`genemu`](genemu/) | Genesis / MegaDrive Emulator | e39f690 | https://github.com/rasky/genemu |
| [`genext2fs`](genext2fs/) | genext2fs | 1.6.3 | https://github.com/bestouff/genext2fs |
| [`gettext`](gettext/) | GNU gettext | 1.0 | https://www.gnu.org/software/gettext/ |
Ports/gemrb/package.sh
+3 -2
View File
@@ -1,9 +1,9 @@
#!/usr/bin/env -S bash ../.port_include.sh
port='gemrb'
version='0.9.2'
version='0.9.5'
useconfigure='true'
files=(
"https://github.com/gemrb/gemrb/archive/refs/tags/v${version}.tar.gz#ea614c067483606dab680ab18cd50527f56803bd46e0888e3c786eec05d3bb7d"
"https://github.com/gemrb/gemrb/archive/refs/tags/v${version}.tar.gz#cf9528f5e2fcaf70a9addc02222ba58f9d814e7e1522a41000e0d4de19dbd3ae"
)
depends=(
'freetype'
@@ -36,5 +36,6 @@ build() {
}
install() {
export DESTDIR="${SERENITY_INSTALL_ROOT}"
ninja -C "${PORT_BUILD_DIR}/gemrb-${version}-build" install
}
Ports/gemrb/patches/0001-Hard-code-some-paths-for-runtime-purposes.patch
+3 -3
View File
@@ -12,10 +12,10 @@ this is to hard-code these paths in the header file.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/cmake_config.h.in b/cmake/cmake_config.h.in
index 8368c3b0e9b1b67b9cbf18a1abd8b2194733094b..4bc1c7b283dce482b1e40561c46a82c954d79ac9 100644
index b42a954c6f86fb3757b9d5f6fff055edcb831d13..a80a11a8dbe127e149144cae16cebca92f138820 100644
--- a/cmake/cmake_config.h.in
+++ b/cmake/cmake_config.h.in
@@ -10,9 +10,9 @@
@@ -8,9 +8,9 @@
#cmakedefine HAVE_MEMALIGN 1
#cmakedefine HAVE_ALIGNED_MALLOC 1
#cmakedefine HAVE_POSIX_MEMALIGN 1
@@ -25,6 +25,6 @@ index 8368c3b0e9b1b67b9cbf18a1abd8b2194733094b..4bc1c7b283dce482b1e40561c46a82c9
+#cmakedefine PLUGIN_DIR "/usr/local/lib/gemrb/plugins/"
+#cmakedefine DATA_DIR "/usr/local/share/gemrb/"
+#cmakedefine SYSCONF_DIR "/usr/local/etc/gemrb/"
#cmakedefine NO_COLOR ${NOCOLOR}
#cmakedefine OPENGL_BACKEND ${OPENGL_BACKEND}
#cmakedefine NOFPSLIMIT ${NOFPSLIMIT}
#cmakedefine HAVE_UNISTD_H 1
Ports/gemrb/patches/0002-Create-SDL2-renderer-as-unaccelerated.patch
+2 -2
View File
@@ -8,10 +8,10 @@ Subject: [PATCH] Create SDL2 renderer as unaccelerated
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gemrb/plugins/SDLVideo/SDL20Video.cpp b/gemrb/plugins/SDLVideo/SDL20Video.cpp
index 8d906ec6066cac11a91ebcc372810b3e0a4f71db..741f4085458a6b7cc03c7613e8fa93beb7a60a2d 100644
index 859d6ec5175d83fd1c104ec978aa3be674ee7e29..760baac349affdbdfb920404bc438fcfb032b871 100644
--- a/gemrb/plugins/SDLVideo/SDL20Video.cpp
+++ b/gemrb/plugins/SDLVideo/SDL20Video.cpp
@@ -171,7 +171,7 @@ int SDL20VideoDriver::CreateSDLDisplay(const char* title, bool vsync)
@@ -185,7 +185,7 @@ int SDL20VideoDriver::CreateSDLDisplay(const char* title, bool vsync)
SetWindowIcon(window);
#endif
Ports/gemrb/patches/0003-Get-rid-of-swscanf-usage.patch
-35
View File
@@ -1,35 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Offenh=C3=A4user?= <[email protected]>
Date: Sat, 11 Feb 2023 00:52:51 +0100
Subject: [PATCH] Get rid of swscanf() usage
This function is currently not implemented in our LibC.
---
gemrb/core/GUI/TextSystem/GemMarkup.cpp | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gemrb/core/GUI/TextSystem/GemMarkup.cpp b/gemrb/core/GUI/TextSystem/GemMarkup.cpp
index f0f604ccb0c3d37098976f0e05371fb4a1988a67..2741aa6cd6b27961ac9bcd11992cb6cef4fa2a9f 100644
--- a/gemrb/core/GUI/TextSystem/GemMarkup.cpp
+++ b/gemrb/core/GUI/TextSystem/GemMarkup.cpp
@@ -25,7 +25,19 @@ namespace GemRB {
static Color ParseColor(const String& colorString)
{
Color color = ColorWhite;
- swscanf(colorString.c_str(), L"%02hhx%02hhx%02hhx%02hhx", &color.r, &color.g, &color.b, &color.a);
+
+ auto h2i = [](wchar_t c) -> int {
+ if (c >= '0' && c <= '9') return c - '0';
+ else if (c >= 'a' && c <='f') return c - 'a' + 10;
+ else if (c >= 'A' && c <='F') return c - 'A' + 10;
+ return 0;
+ };
+
+ color.r = (h2i(colorString[0]) << 4) | h2i(colorString[1]);
+ color.g = (h2i(colorString[2]) << 4) | h2i(colorString[3]);
+ color.b = (h2i(colorString[4]) << 4) | h2i(colorString[5]);
+ color.a = (h2i(colorString[6]) << 4) | h2i(colorString[7]);
+
return color;
}
Ports/gemrb/patches/0004-Be-a-bit-more-lenient-with-matching-savegame-directo.patch
-25
View File
@@ -1,25 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Offenh=C3=A4user?= <[email protected]>
Date: Sat, 11 Feb 2023 02:30:10 +0100
Subject: [PATCH] Be a bit more lenient with matching savegame directories
Our sscanf() implementation failed to match this case. Making it more
inclusive should be fine, since invalid savegame directories probably
won't contain the right files anyway.
---
gemrb/core/SaveGameIterator.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gemrb/core/SaveGameIterator.h b/gemrb/core/SaveGameIterator.h
index 4d1550eddcd2f656205170131a04f570570430f9..e93b171123c68e41e607518e6c4ffc93e455f92d 100644
--- a/gemrb/core/SaveGameIterator.h
+++ b/gemrb/core/SaveGameIterator.h
@@ -29,7 +29,7 @@
namespace GemRB {
-#define SAVEGAME_DIRECTORY_MATCHER "%d - %[A-Za-z0-9- _+*#%&|()=!?':;]"
+#define SAVEGAME_DIRECTORY_MATCHER "%d - %s"
class GEM_EXPORT SaveGameIterator {
private:
Ports/gemrb/patches/ReadMe.md
-14
View File
@@ -14,17 +14,3 @@ this is to hard-code these paths in the header file.
Create SDL2 renderer as unaccelerated
## `0003-Get-rid-of-swscanf-usage.patch`
Get rid of swscanf() usage
This function is currently not implemented in our LibC.
## `0004-Be-a-bit-more-lenient-with-matching-savegame-directo.patch`
Be a bit more lenient with matching savegame directories
Our sscanf() implementation failed to match this case. Making it more
inclusive should be fine, since invalid savegame directories probably
won't contain the right files anyway.