diff --git a/appdata.xml b/appdata.xml index eceef7e..5d35faf 100644 --- a/appdata.xml +++ b/appdata.xml @@ -25,6 +25,7 @@ </provides> <launchable type="desktop-id">io.github.shiiion.primehack.desktop</launchable> <releases> + <release date="2024-11-04" version="1.0.7a"/> <release date="2023-12-20" version="1.0.7"/> </releases> <url type="homepage">https://github.com/shiiion/dolphin</url> diff --git a/detectflatpak.patch b/detectflatpak.patch deleted file mode 100644 index 60dd1a2..0000000 --- a/detectflatpak.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f2d3b349d8487cf0ee50b36ba024ac513d36f826 Mon Sep 17 00:00:00 2001 -From: Carles Pastor <cpbadosa@gmail.com> -Date: Sat, 20 Aug 2022 13:35:32 +0200 -Subject: [PATCH] Detect we are running inside a flatpak sandbox - ---- - Source/Core/UICommon/UICommon.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp -index 8d9dc2abb8..8a9d39a3d5 100644 ---- a/Source/Core/UICommon/UICommon.cpp -+++ b/Source/Core/UICommon/UICommon.cpp -@@ -348,7 +348,7 @@ void SetUserDirectory(std::string custom_path) - // -> Use GetExeDirectory()/User - // 2. $DOLPHIN_EMU_USERPATH is set - // -> Use $DOLPHIN_EMU_USERPATH -- // 3. ~/.dolphin-emu directory exists -+ // 3. ~/.dolphin-emu directory exists, and we're not in flatpak - // -> Use ~/.dolphin-emu - // 4. Default - // -> Use XDG basedir, see -@@ -381,7 +381,7 @@ void SetUserDirectory(std::string custom_path) - { - user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP; - -- if (!File::Exists(user_path)) -+ if (File::Exists("/.flatpak-info") || !File::Exists(user_path)) - { - const char* data_home = getenv("XDG_DATA_HOME"); - std::string data_path = --- -2.37.1 - diff --git a/io.github.shiiion.primehack.yml b/io.github.shiiion.primehack.yml index 94ea11d..4b86bfb 100644 --- a/io.github.shiiion.primehack.yml +++ b/io.github.shiiion.primehack.yml @@ -1,6 +1,6 @@ app-id: io.github.shiiion.primehack runtime: org.kde.Platform -runtime-version: '6.6' +runtime-version: '6.8' sdk: org.kde.Sdk command: primehack-wrapper rename-desktop-file: primehack.desktop @@ -86,17 +86,7 @@ modules: sources: - type: git url: https://github.com/shiiion/dolphin.git - commit: bd2591a28ab4a367a3f11f65059e07314a13f081 - # detects whether dolphin is running in a flatpak sandbox - # and makes it use xdg directories if it is. - # prevents dolphin from attempting to write conf files - # in non-writable paths, typically happens when a user - # has leftover files from a previous non-flatpak install - - type: patch - path: detectflatpak.patch - # version strings must match exactly for online multiplayer - - type: patch - path: nodirtyversion.patch + commit: 1863d37c969764ed5d29d986ecea0d9f78245b52 - type: file path: appdata.xml - type: script diff --git a/nodirtyversion.patch b/nodirtyversion.patch deleted file mode 100644 index 8d8482e..0000000 --- a/nodirtyversion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMake/ScmRevGen.cmake b/CMake/ScmRevGen.cmake -index aacf7491ce..503791cda8 100644 ---- a/CMake/ScmRevGen.cmake -+++ b/CMake/ScmRevGen.cmake -@@ -7,7 +7,7 @@ if(GIT_FOUND) - OUTPUT_VARIABLE DOLPHIN_WC_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE) - # defines DOLPHIN_WC_DESCRIBE -- execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty -+ execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long - OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE - OUTPUT_STRIP_TRAILING_WHITESPACE) \ No newline at end of file