haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Gemrb to 0.9.4 (#12014)

Browse Source
This commit is contained in:
Peppersawce
2025-03-19 15:42:17 +01:00
committed by GitHub
parent 901009e9f5
commit 955e900bb4
3 changed files with 37 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
games-engines/gemrb/gemrb-0.9.3.recipe → games-engines/gemrb/gemrb-0.9.4.recipe
View File

@@ -6,11 +6,11 @@ to Linux/Unix, MacOS X, Windows (and Haiku) with some enhancements.
(Originals games' data is not included)"
HOMEPAGE="https://gemrb.org/"
COPYRIGHT="2003-2024 The GemRB Team"
COPYRIGHT="2003-2025 The GemRB Team"
LICENSE="MIT"
REVISION="3"
REVISION="1"
SOURCE_URI="https://github.com/gemrb/gemrb/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="71bb16a77b84cd873d5582af675357c0cb94bbc64d54fac2e3397b366ac2adde"
CHECKSUM_SHA256="2cb39244945d1e5ec885c4040892eea1efb6d7b183ade36f4ab2e852778e401f"
SOURCE_FILENAME="v$portVersion.tar.gz"
PATCHES="gemrb-$portVersion.patchset"
ADDITIONAL_FILES="
@@ -68,9 +68,6 @@ BUILD_PREREQUIRES="
cmd:python3
"
defineDebugInfoPackage gemrb$secondaryArchSuffix \
$prefix/bin/gemrb
BUILD()
{
mkdir -p build

61
games-engines/gemrb/patches/gemrb-0.9.3.patchset
View File

@@ -1,61 +0,0 @@
From 7a7535d517ab1073b37b97efb2e887649e0d4816 Mon Sep 17 00:00:00 2001
From: Yourself <user@shredder.fritz.box>
Date: Mon, 23 Sep 2024 17:36:06 +0200
Subject: Fixes to extend2da.py, Cmake build and handling cache directory
diff --git a/admin/extend2da.py b/admin/extend2da.py
index 6ea945f..49c6a18 100755
--- a/admin/extend2da.py
+++ b/admin/extend2da.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!python3
# GemRB - Infinity Engine Emulator
# Copyright (C) 2011 The GemRB Project
#
diff --git a/cmake/Helpers.cmake b/cmake/Helpers.cmake
index 6084862..854600b 100644
--- a/cmake/Helpers.cmake
+++ b/cmake/Helpers.cmake
@@ -678,10 +678,10 @@ FUNCTION(INSTALL_APP_RESOURCES)
IF (NOT APPLE)
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/gemrb.6" DESTINATION ${MAN_DIR})
+ SET(ADMIN_PATH ${CMAKE_SOURCE_DIR}/admin)
IF (NOT HAIKU)
SET(ARTWORK_PATH ${CMAKE_SOURCE_DIR}/artwork)
SET(LINUX_PATH ${CMAKE_SOURCE_DIR}/platforms/linux)
- SET(ADMIN_PATH ${CMAKE_SOURCE_DIR}/admin)
INSTALL(FILES ${ARTWORK_PATH}/gemrb-logo.png DESTINATION ${ICON_DIR} RENAME gemrb.png)
INSTALL(FILES ${ARTWORK_PATH}/logo04-rb_only.svg DESTINATION ${SVG_DIR} RENAME gemrb.svg)
diff --git a/cmake/modules/FindSDL2_mixer.cmake b/cmake/modules/FindSDL2_mixer.cmake
index def6a4a..044cf25 100644
--- a/cmake/modules/FindSDL2_mixer.cmake
+++ b/cmake/modules/FindSDL2_mixer.cmake
@@ -37,7 +37,7 @@ find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
HINTS
ENV SDLMIXERDIR
ENV SDLDIR
- PATH_SUFFIXES include/SDL2 include/SDL include
+ PATH_SUFFIXES include/SDL2 include/SDL include SDL2
PATHS
~/Library/Frameworks/
/Library/Frameworks/
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index 14e0e3d..543e089 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -237,7 +237,7 @@ Interface::Interface(CoreSettings&& cfg)
gamedata = new GameData();
sgiterator = new SaveGameIterator();
- if (!MakeDirectories(config.CachePath)) {
+ if (!MakeDirectories(config.CachePath) && errno != EEXIST && errno != EROFS) {
throw CIE(fmt::format("Unable to create cache directory '{}'", config.CachePath));
}
--
2.45.2

34
games-engines/gemrb/patches/gemrb-0.9.4.patchset Normal file
View File

@@ -0,0 +1,34 @@
From 1aab6c11a523d1f2b0c45fcf7e3fd88afd698185 Mon Sep 17 00:00:00 2001
From: Peppersawce <michaelpeppers89@yahoo.it>
Date: Wed, 19 Mar 2025 04:23:27 +0100
Subject: Fix extend2da.py, handling cache dir
diff --git a/admin/extend2da.py b/admin/extend2da.py
old mode 100755
new mode 100644
index ae4c1ef..c1d8e0b
--- a/admin/extend2da.py
+++ b/admin/extend2da.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!python3
# GemRB - Infinity Engine Emulator
# Copyright (C) 2011 The GemRB Project
#
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index ecd76fa..05b2144 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -254,7 +254,7 @@ Interface::Interface(CoreSettings&& cfg)
gamedata = new GameData();
sgiterator = new SaveGameIterator();
- if (!MakeDirectories(config.CachePath)) {
+ if (!MakeDirectories(config.CachePath) && errno != EEXIST && errno != EROFS) {
ThrowException(fmt::format("Unable to create cache directory '{}'", config.CachePath));
}
--
2.48.1