From ca28c1adea08fc8e5e3726f96ba6b5e872079f7b Mon Sep 17 00:00:00 2001
From: xargon <xargonwan@gmail.com>
Date: Fri, 8 Jul 2022 09:07:20 +0200
Subject: [PATCH] =?UTF-8?q?MANIFEST:=20moved=20CITRA=20after=20YUZU=20as?=
 =?UTF-8?q?=20it=C5=9B=20using=20submodule=20fmt=20as=20well?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flathub-push.sh             |  2 +-
 net.retrodeck.retrodeck.yml | 70 ++++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/flathub-push.sh b/flathub-push.sh
index d22ceb02..56f4135f 100644
--- a/flathub-push.sh
+++ b/flathub-push.sh
@@ -68,4 +68,4 @@ git submodule deinit -f .
 git submodule update --init --recursive
 git add *
 git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/main"
-git push origin master
\ No newline at end of file
+git push origin cooker-$(date +%d%m%y.%H%M)
\ No newline at end of file
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 8085387d..3e04787b 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -507,6 +507,41 @@ modules:
 
   # Yuzu - END
 
+  # CITRA - START
+
+  - name: citra
+    buildsystem: cmake-ninja
+    builddir: true
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DENABLE_QT_TRANSLATION=ON
+      - -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON
+      - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
+      #- '-DENABLE_FFMPEG_VIDEO_DUMPER=ON'
+      # Disabled because of this: https://github.com/citra-emu/citra/issues/5949
+      - -DENABLE_FDK=ON
+    cleanup:
+      - /share/man
+      - /share/pixmaps
+    post-install:
+      - >-
+        install -Dm644 ../dist/citra.svg
+        /app/share/icons/hicolor/scalable/apps/citra.svg
+      - >-
+        install -Dm644 ../dist/icon.png
+        /app/share/icons/hicolor/512x512/apps/citra.png
+    sources:
+      - type: git
+        url: https://github.com/citra-emu/citra-nightly.git
+        tag: nightly-1772
+        commit: 355933218d00603c910cd0a9daead0b1cd72a3c3
+        disable-shallow-clone: true
+        x-checker-data:
+          type: git
+          tag-pattern: ^(nightly-\d+)$
+
+  # CITRA - END
+
   # PCSX2 - START
   # https://github.com/flathub/net.pcsx2.PCSX2
 
@@ -873,41 +908,6 @@ modules:
 
   # MELONDS - END
 
-  # CITRA - START
-  # https://github.com/flathub/org.citra_emu.citra
-
-  - name: citra
-    buildsystem: cmake-ninja
-    builddir: true
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DENABLE_QT_TRANSLATION=ON
-      - -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON
-      - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
-      #- '-DENABLE_FFMPEG_VIDEO_DUMPER=ON'
-      # Disabled because of this: https://github.com/citra-emu/citra/issues/5949
-      - -DENABLE_FDK=ON
-    cleanup:
-      - /share/man
-      - /share/pixmaps
-    post-install:
-      - >-
-        install -Dm644 ../dist/citra.svg
-        /app/share/icons/hicolor/scalable/apps/citra.svg
-      - >-
-        install -Dm644 ../dist/icon.png
-        /app/share/icons/hicolor/512x512/apps/citra.png
-    sources:
-      - type: git
-        url: https://github.com/citra-emu/citra-nightly.git
-        tag: nightly-1772
-        commit: 355933218d00603c910cd0a9daead0b1cd72a3c3
-        disable-shallow-clone: true
-        x-checker-data:
-          type: git
-          tag-pattern: ^(nightly-\d+)$
-
-  # CITRA - END
   # RPCS3 - START
   # https://github.com/flathub/net.rpcs3.RPCS3