From b137b2d15ecc6d1486115c3e9090fa11920988f2 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sat, 24 Dec 2022 10:05:46 +0000
Subject: [PATCH] RetroDECK v0.6.0

---
 flathub.yml                 |  6 +++---
 net.retrodeck.retrodeck.yml | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/flathub.yml b/flathub.yml
index a91a0ae0..0155923d 100644
--- a/flathub.yml
+++ b/flathub.yml
@@ -5,7 +5,7 @@ runtime-version: 5.15-21.08
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm14    # Needed for rpcs3
-  - org.freedesktop.Sdk.Extension.dotnet6   # Needed for Ryujinx
+  #- org.freedesktop.Sdk.Extension.dotnet6   # Needed for Ryujinx - Removed, check if it's not breaking something else
 base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
 base-version: 5.15-21.08                    # Needed for Yuzu
 command: retrodeck.sh
@@ -17,13 +17,13 @@ finish-args:
   - --share=ipc
   - --share=network
   - --device=all
-  - --filesystem=~/retrodeck:create
+  - --filesystem=home # Needed to be able to relocate / remove / create symlink at ~/retrodeck
   - --filesystem=/run/media
   - --filesystem=/media
   - --allow=multiarch
   - --talk-name=org.freedesktop.ScreenSaver
   - --talk-name=org.freedesktop.PowerManagement.Inhibit
-  - --talk-name=org.freedesktop.login1
+  - --talk-name=org.freedesktop.login1.Manager
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
   # Yuzu
   # - --filesystem=home:ro # This may break Yuzu, let's see
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index cd085047..3bfbdf11 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -66,11 +66,11 @@ modules:
   # The version number is hardcoded in /app/retrodeck/version
   #
   # UPDATE STEPS FOR MAIN:
-  # [ ] Update the VERSION variable
-  # [ ] Update the appdata.xml with the version number and notes
-  # [ ] change branch into main in version-initialization (first one)
-  # [ ] change branch into main in retrodeck module (last one)
-  # [ ] if header (before modules) was edited, edit it even in flathub.yml
+  # [X] Update the VERSION variable
+  # [X] Update the appdata.xml with the version number and notes
+  # [X] change branch into main in version-initialization (first one)
+  # [X] change branch into main in retrodeck module (last one)
+  # [X] if header (before modules) was edited, edit it even in flathub.yml
   #
   - name: version-initialization
     buildsystem: simple
@@ -78,7 +78,7 @@ modules:
       - |
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/
-        VERSION="0.6.0b-cooker"
+        VERSION="0.6.0b"
         if [[ $VERSION == *"cooker"* ]];
         then
           VERSION="$VERSION-[$(git rev-parse --short HEAD)]"
@@ -88,7 +88,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.0b
+        branch: main
 
   - name: xmlstarlet
     config-opts:
@@ -999,7 +999,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.0b
+        branch: main
 
   # Ryujinx - START
   # https://github.com/flathub/org.ryujinx.Ryujinx