mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2024-11-22 14:05:39 +00:00
Submodules cleanup
This commit is contained in:
parent
9046697e8e
commit
fb70c82806
9
.gitmodules
vendored
9
.gitmodules
vendored
|
|
@ -1,9 +0,0 @@
|
|||
[submodule "rd-submodules/shared-modules"]
|
||||
path = rd-submodules/shared-modules
|
||||
url = https://github.com/flathub/shared-modules.git
|
||||
[submodule "rd-submodules/retroarch"]
|
||||
path = rd-submodules/retroarch
|
||||
url = https://github.com/flathub/org.libretro.RetroArch.git
|
||||
[submodule "rd-submodules/ryujinx"]
|
||||
path = rd-submodules/ryujinx
|
||||
url = https://github.com/flathub/org.ryujinx.Ryujinx
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,33 +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
|
||||
|
|
@ -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)
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
diff -au1r melonDS/src/frontend/qt_sdl/main.cpp melonDS/src/frontend/qt_sdl/main.cpp
|
||||
--- melonDS/src/frontend/qt_sdl/main.cpp 2023-05-06 17:27:24.822375255 +0200
|
||||
+++ melonDS/src/frontend/qt_sdl/main.cpp 2023-05-06 17:47:19.587498189 +0200
|
||||
@@ -1467,3 +1467,3 @@
|
||||
actSaveState[0] = submenu->addAction("File...");
|
||||
- actSaveState[0]->setShortcut(QKeySequence(Qt::ShiftModifier | Qt::Key_F9));
|
||||
+ actSaveState[0]->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_S));
|
||||
actSaveState[0]->setData(QVariant(0));
|
||||
@@ -1483,3 +1483,3 @@
|
||||
actLoadState[0] = submenu->addAction("File...");
|
||||
- actLoadState[0]->setShortcut(QKeySequence(Qt::Key_F9));
|
||||
+ actLoadState[0]->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_A));
|
||||
actLoadState[0]->setData(QVariant(0));
|
||||
@@ -1489,3 +1489,3 @@
|
||||
actUndoStateLoad = menu->addAction("Undo state load");
|
||||
- actUndoStateLoad->setShortcut(QKeySequence(Qt::Key_F12));
|
||||
+ actUndoStateLoad->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_8));
|
||||
connect(actUndoStateLoad, &QAction::triggered, this, &MainWindow::onUndoStateLoad);
|
||||
|
|
@ -1,33 +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
|
||||
|
|
@ -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)
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit eec4bcca8c9e514467fb62cca4a7b2d12c6a2328
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 41761a7dc36ec8520bdaca796d9d0b1219b66a07
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 782d3cc04ccdd8071017f622d4bacd35faecbd86
|
||||
Loading…
Reference in a new issue