Update DevilutionX to 1.5.5 (#13171)

This commit is contained in:
Peppersawce
2025-11-22 12:47:10 +01:00
committed by GitHub
parent 8cb8bcb3a6
commit 75a78ccce2
2 changed files with 12 additions and 13 deletions

View File

@@ -10,9 +10,9 @@ Visit the homepage for more info, a FAQ, controller mappings, etc."
HOMEPAGE="https://devilutionx.com/"
COPYRIGHT="2025 DevilutionX"
LICENSE="Sustainable Use License"
REVISION="3"
REVISION="1"
SOURCE_URI="https://github.com/diasurgical/devilutionX/archive/$portVersion.zip"
CHECKSUM_SHA256="850ca8af8c0c86c9224be469f80e25f7fafdfc70bc29388ac0ab5a4c5e29da2c"
CHECKSUM_SHA256="ddfb845a6baad8227aedff0ceb578e7c33ef017c9f9d93ff19765319896796a9"
SOURCE_DIR="DevilutionX-$portVersion"
PATCHES="devilutionx-$portVersion.patchset"
ADDITIONAL_FILES="devilutionx.sh"
@@ -106,8 +106,7 @@ INSTALL()
# Install extra-attribs
rc devilutionx.rdef
resattr -o $appsDir/devilutionx/devilutionx.sh \
devilutionx.rsrc
resattr -o $appsDir/devilutionx/devilutionx.sh devilutionx.rsrc
addAppDeskbarSymlink $appsDir/devilutionx/devilutionx.sh "DevilutionX"
}

View File

@@ -1,17 +1,17 @@
From 99b4230d527066bb1297fc33c9ffe72007c6809d Mon Sep 17 00:00:00 2001
From 0720a2932d9364da07dbb1e6b23dfcaf1ea9ec03 Mon Sep 17 00:00:00 2001
From: Peppersawce <michaelpeppers89@yahoo.it>
Date: Thu, 17 Apr 2025 02:55:45 +0200
Date: Fri, 31 Oct 2025 19:20:33 +0100
Subject: Change settings path
diff --git a/Source/utils/paths.cpp b/Source/utils/paths.cpp
index 9635ac3..2298279 100644
index 6253e87..93feaf7 100644
--- a/Source/utils/paths.cpp
+++ b/Source/utils/paths.cpp
@@ -11,6 +11,11 @@
#include "utils/log.hpp"
@@ -10,6 +10,11 @@
#include "utils/sdl_ptrs.h"
#include "utils/stdcompat/optional.hpp"
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#include <fs_info.h>
@@ -20,7 +20,7 @@ index 9635ac3..2298279 100644
#ifdef __IPHONEOS__
#include "platform/ios/ios_paths.h"
#endif
@@ -84,6 +89,11 @@ const std::string &PrefPath()
@@ -83,6 +88,11 @@ const std::string &PrefPath()
prefPath = FromSDL(IOSGetPrefPath());
#elif defined(NXDK)
prefPath = NxdkGetPrefPath();
@@ -32,7 +32,7 @@ index 9635ac3..2298279 100644
#else
prefPath = FromSDL(SDL_GetPrefPath("diasurgical", "devilution"));
#if !defined(__amigaos__)
@@ -103,6 +113,8 @@ const std::string &ConfigPath()
@@ -102,6 +112,8 @@ const std::string &ConfigPath()
configPath = FromSDL(IOSGetPrefPath());
#elif defined(NXDK)
configPath = NxdkGetPrefPath();
@@ -42,4 +42,4 @@ index 9635ac3..2298279 100644
configPath = FromSDL(SDL_GetPrefPath("diasurgical", "devilution"));
#if !defined(__amigaos__)
--
2.48.1
2.51.0