Update GemRB to 0.9.5 (#13869)

This commit is contained in:
Peppersawce
2026-04-02 07:58:48 +02:00
committed by GitHub
parent fd74bd028f
commit c951f7b5d8
4 changed files with 33 additions and 62 deletions

View File

@@ -1,11 +0,0 @@
#!/bin/bash
CACHE_PATH=$(finddir B_USER_CACHE_DIRECTORY)/gemrb
SAVE_PATH=$(finddir B_USER_SETTINGS_DIRECTORY)/gemrb
if [ ! -e $CACHE_PATH ]; then
mkdir -p $CACHE_PATH
fi
if [ ! -e $SAVE_PATH ]; then
mkdir -p $SAVE_PATH
fi

View File

@@ -11,20 +11,14 @@ to point GemRB to the data of the game you want to play and to customize your Ge
* ~/config/settings/gemrb is the default folder for saves
* ~/config/cache/gemrb is the default folder for GemRB's log and temporary files"
HOMEPAGE="https://gemrb.org/"
COPYRIGHT="2003-2025 The GemRB Team"
COPYRIGHT="2003-2026 The GemRB Team"
LICENSE="MIT"
REVISION="1"
srcGitRev="bab0d94c25df1a3e81288e8f5c4a723a07378c4e"
SOURCE_URI="https://github.com/gemrb/gemrb/archive/$srcGitRev.zip"
CHECKSUM_SHA256="0b1d760ee47ebdf8c87137e534f7d24ad4a28dda132365f7c780444b3c1e3109"
SOURCE_DIR="gemrb-$srcGitRev"
SOURCE_FILENAME="v$portVersion.tar.gz"
SOURCE_URI="https://github.com/gemrb/gemrb/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="cf9528f5e2fcaf70a9addc02222ba58f9d814e7e1522a41000e0d4de19dbd3ae"
SOURCE_DIR="gemrb-$portVersion"
PATCHES="gemrb-$portVersion.patchset"
ADDITIONAL_FILES="
gemrb.rdef.in
gemrb-postinstall.sh
"
POST_INSTALL_SCRIPTS="$relativePostInstallDir/gemrb-postinstall.sh"
ADDITIONAL_FILES="gemrb.rdef.in"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -43,6 +37,7 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
cmd:python3 # GemRB needs it to run
lib:libfreetype$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
@@ -65,6 +60,7 @@ BUILD_REQUIRES="
devel:libpng16$secondaryArchSuffix
devel:libSDL2_2.0$secondaryArchSuffix
devel:libSDL2_mixer_2.0$secondaryArchSuffix
devel:libvlc$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
@@ -117,11 +113,10 @@ INSTALL()
-e "s|@MINOR@|$MINOR|" \
$portDir/additional-files/gemrb.rdef.in > gemrb.rdef
# Setup post-install script (to prevent issues with save and cache paths)
mkdir -p $postInstallDir
cp $portDir/additional-files/gemrb-postinstall.sh $postInstallDir
chmod +x $postInstallDir/gemrb-postinstall.sh
addResourcesToBinaries gemrb.rdef $prefix/bin/gemrb
addAppDeskbarSymlink $prefix/bin/gemrb "GemRB"
# Make the app name uppercase then link it back in lowercase for cmd
mkdir -p $appsDir && mv $prefix/bin/gemrb $appsDir/GemRB
ln -s $appsDir/GemRB $prefix/bin/gemrb
addAppDeskbarSymlink $appsDir/GemRB
}

View File

@@ -0,0 +1,21 @@
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
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
#
--
2.48.1

View File

@@ -1,34 +0,0 @@
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