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 26515d0..175da53 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.8"
+runtime-version: '6.8'
sdk: org.kde.Sdk
command: primehack-wrapper
rename-desktop-file: primehack.desktop
@@ -33,8 +33,8 @@ modules:
- /lib/pkgconfig
sources:
- type: archive
- url: https://github.com/libusb/libusb/releases/download/v1.0.27/libusb-1.0.27.tar.bz2
- sha256: ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575
+ url: https://github.com/libusb/libusb/releases/download/v1.0.28/libusb-1.0.28.tar.bz2
+ sha256: 966bb0d231f94a474eaae2e67da5ec844d3527a1f386456394ff432580634b29
x-checker-data:
type: anitya
project-id: 1749
@@ -50,8 +50,8 @@ modules:
- -Ddocumentation=disabled
sources:
- type: archive
- url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.2.tar.xz
- sha256: 3eca86a6ce55b81d5bce910637fc451c8bbe373b1f9698f375c7f1ad0de3ac48
+ url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.4.tar.xz
+ sha256: f00ab8d42ad8b905296fab67e13b871f1a424839331516642100f82ad88127cd
x-checker-data:
type: anitya
project-id: 20540
@@ -66,17 +66,6 @@ modules:
url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
- - name: stuff
- buildsystem: simple
- build-commands:
- - mkdir -p /app/share/icons/hicolor/scalable/apps/
- - cp icon.svg /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
- - mkdir -p /app/bin
- - echo 'echo hello' > /app/bin/primehack-wrapper
- sources:
- - type: file
- path: icon.svg
-
- name: dolphin-emu
buildsystem: cmake-ninja
config-opts:
@@ -89,31 +78,21 @@ modules:
- /share/man
post-install:
- install -D primehack-wrapper /app/bin/primehack-wrapper
- # # - install -Dm644 appdata.xml /app/share/appdata/primehack.appdata.xml
- # # - rm /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
- # # - mv /app/share/applications/dolphin-emu.desktop /app/share/applications/primehack.desktop
- # - cp retrodeck.png /app/share/icons/hicolor/scalable/apps/io.github.shiiion.primehack.png
- # - desktop-file-edit --set-key=Exec --set-value='primehack-wrapper' /app/share/applications/primehack.desktop
- # - desktop-file-edit --set-key=Name --set-value='PrimeHack' /app/share/applications/primehack.desktop
- # - desktop-file-edit --set-key=Icon --set-value='io.github.shiiion.primehack' /app/share/applications/primehack.desktop
+ - install -Dm644 appdata.xml /app/share/appdata/primehack.appdata.xml
+ - rm /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
+ - mv /app/share/applications/dolphin-emu.desktop /app/share/applications/primehack.desktop
+ - desktop-file-edit --set-key=Exec --set-value='primehack-wrapper' /app/share/applications/primehack.desktop
+ - desktop-file-edit --set-key=Name --set-value='PrimeHack' /app/share/applications/primehack.desktop
sources:
- type: git
url: https://github.com/shiiion/dolphin.git
- commit: 81bfb9686afd2d190134b44dd72d3cee876fe2ab # This commit refers to the PR 166: https://github.com/shiiion/dolphin/pull/166, but has been reworked in PR 118, https://github.com/shiiion/dolphin/pull/118 please change it when it's approved
- # 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
commands:
- for i in {0..9}; do
- test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
- done
- - primehack "$@"
- dest-filename: primehack-wrapper
+ - dolphin-emu "$@"
+ dest-filename: primehack-wrapper
\ No newline at end of file
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