From 1212fb7b08e40e9850b756a46ca38874c49617d0 Mon Sep 17 00:00:00 2001 From: flathubbot Date: Wed, 4 Sep 2024 16:52:59 +0000 Subject: [PATCH 1/4] dolphin-emu: Update dolphin.git to 2409 --- org.DolphinEmu.dolphin-emu.metainfo.xml | 3 +++ org.DolphinEmu.dolphin-emu.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/org.DolphinEmu.dolphin-emu.metainfo.xml b/org.DolphinEmu.dolphin-emu.metainfo.xml index 47457b8..0be28fe 100644 --- a/org.DolphinEmu.dolphin-emu.metainfo.xml +++ b/org.DolphinEmu.dolphin-emu.metainfo.xml @@ -36,6 +36,9 @@ dolphin-emu.desktop + + + diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml index 81a0aed..cda3fa8 100644 --- a/org.DolphinEmu.dolphin-emu.yml +++ b/org.DolphinEmu.dolphin-emu.yml @@ -85,7 +85,7 @@ modules: sources: - type: git url: https://github.com/dolphin-emu/dolphin.git - commit: b92e354389bb7c0bd114a8631b8af110d3cb3a14 + commit: 3c4d4fcd09173ea070dc812ab5d64ca3a3af5f29 x-checker-data: type: json url: https://dolphin-emu.org/update/latest/beta From f2bf5562494e4da933fcec4897d548470b5596db Mon Sep 17 00:00:00 2001 From: Carles Pastor Date: Wed, 4 Sep 2024 23:00:01 +0200 Subject: [PATCH 2/4] The icon was fixed upstream --- org.DolphinEmu.dolphin-emu.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml index cda3fa8..82ac848 100644 --- a/org.DolphinEmu.dolphin-emu.yml +++ b/org.DolphinEmu.dolphin-emu.yml @@ -78,8 +78,6 @@ modules: post-install: - install -D -t ${FLATPAK_DEST}/bin/ dolphin-emu-wrapper - install -Dm644 -t ${FLATPAK_DEST}/share/metainfo/ org.DolphinEmu.dolphin-emu.metainfo.xml - - sed -i -e 's/viewBox="0 0 1024.02 571.29"/viewBox="0 -285.645 1024 1024" width="2048" - height="2048"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg - desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper' /app/share/applications/dolphin-emu.desktop sources: From 6f5a900d7a3edda1bf41b2506a7ab6f850cf63f4 Mon Sep 17 00:00:00 2001 From: Carles Pastor Date: Wed, 4 Sep 2024 23:01:57 +0200 Subject: [PATCH 3/4] Dropping the patches, they are already upstream --- detectflatpak.patch | 34 ---------------------------------- nodirtyversion.patch | 13 ------------- org.DolphinEmu.dolphin-emu.yml | 10 ---------- 3 files changed, 57 deletions(-) delete mode 100644 detectflatpak.patch delete mode 100644 nodirtyversion.patch 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 -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/nodirtyversion.patch b/nodirtyversion.patch deleted file mode 100644 index 583edbb..0000000 --- a/nodirtyversion.patch +++ /dev/null @@ -1,13 +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) - diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml index 82ac848..db11994 100644 --- a/org.DolphinEmu.dolphin-emu.yml +++ b/org.DolphinEmu.dolphin-emu.yml @@ -91,16 +91,6 @@ modules: version-query: .shortrev timestamp-query: .date is-main-source: true - # 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 - type: file path: org.DolphinEmu.dolphin-emu.metainfo.xml - type: script From eaa81d71c1005e9b9276a674283c46869d710dd9 Mon Sep 17 00:00:00 2001 From: Carles Pastor Date: Mon, 19 Aug 2024 00:24:41 +0200 Subject: [PATCH 4/4] Bundle SDL2 2.30.6 shared-modules only has 2.30.3, I'll send a pr to update but let's bundle it in the mean time. --- SDL2/SDL2-no-libdecor.json | 22 ++++++++++++++++++++++ org.DolphinEmu.dolphin-emu.yml | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 SDL2/SDL2-no-libdecor.json diff --git a/SDL2/SDL2-no-libdecor.json b/SDL2/SDL2-no-libdecor.json new file mode 100644 index 0000000..672ac0f --- /dev/null +++ b/SDL2/SDL2-no-libdecor.json @@ -0,0 +1,22 @@ +{ + "name": "SDL2", + "buildsystem": "autotools", + "config-opts": ["--disable-static"], + "sources": [ + { + "type": "archive", + "url": "https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-2.30.6.tar.gz", + "sha256": "c6ef64ca18a19d13df6eb22df9aff19fb0db65610a74cc81dae33a82235cacd4" + } + ], + "cleanup": [ "/bin/sdl2-config", + "/include", + "/lib/libSDL2.la", + "/lib/libSDL2main.a", + "/lib/libSDL2main.la", + "/lib/libSDL2_test.a", + "/lib/libSDL2_test.la", + "/lib/cmake", + "/share/aclocal", + "/lib/pkgconfig"] +} diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml index db11994..6d37be4 100644 --- a/org.DolphinEmu.dolphin-emu.yml +++ b/org.DolphinEmu.dolphin-emu.yml @@ -65,6 +65,9 @@ modules: url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399 + # The kde runtime bundles 2.28.5 but current dolphin versions require 2.30.6 + - SDL2/SDL2-no-libdecor.json + - name: dolphin-emu buildsystem: cmake-ninja config-opts: