From 43535c873ac1b4ce80212b052b0455a1eaaa0208 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Thu, 19 Dec 2019 02:48:11 +0100
Subject: [PATCH] Remove redundant desktop file and change desktop/icon file
 name to net.kuribo64.melonDS, also change melonds to melonDS.

---
 ...kuribo64.melonds.yml => net.kuribo64.melonDS.yml} | 12 +++++-------
 flatpak/net.kuribo64.melonds.desktop                 |  8 --------
 melonDS.desktop => net.kuribo64.melonDS.desktop      |  2 +-
 src/libui_sdl/CMakeLists.txt                         |  4 ++--
 4 files changed, 8 insertions(+), 18 deletions(-)
 rename flatpak/{net.kuribo64.melonds.yml => net.kuribo64.melonDS.yml} (71%)
 delete mode 100644 flatpak/net.kuribo64.melonds.desktop
 rename melonDS.desktop => net.kuribo64.melonDS.desktop (91%)

diff --git a/flatpak/net.kuribo64.melonds.yml b/flatpak/net.kuribo64.melonDS.yml
similarity index 71%
rename from flatpak/net.kuribo64.melonds.yml
rename to flatpak/net.kuribo64.melonDS.yml
index dcc97b5b..e3369909 100644
--- a/flatpak/net.kuribo64.melonds.yml
+++ b/flatpak/net.kuribo64.melonDS.yml
@@ -1,5 +1,5 @@
 ---
-app-id: net.kuribo64.melonds
+app-id: net.kuribo64.melonDS
 runtime: org.freedesktop.Platform
 runtime-version: '18.08'
 sdk: org.freedesktop.Sdk
@@ -22,10 +22,8 @@ modules:
     buildsystem: cmake-ninja
     sources:
       - type: git
-        url: https://github.com/StapleButter/melonDS.git
-        commit: d4d4965b2fffc69958685a25a9d9fc0c78b54567
-      - type: file
-        path: net.kuribo64.melonds.desktop
+        url: https://github.com/Arisotura/melonDS.git
+        branch: master
     post-install:
-      - "desktop-file-install --dir=/app/share/applications net.kuribo64.melonds.desktop"
-      - "install -D icon/melon_256x256.png /app/share/icons/hicolor/256x256/apps/net.kuribo64.melonds.png"
+      - "desktop-file-install --dir=/app/share/applications net.kuribo64.melonDS.desktop"
+      - "install -D icon/melon_256x256.png /app/share/icons/hicolor/256x256/apps/net.kuribo64.melonDS.png"
diff --git a/flatpak/net.kuribo64.melonds.desktop b/flatpak/net.kuribo64.melonds.desktop
deleted file mode 100644
index e91f10d7..00000000
--- a/flatpak/net.kuribo64.melonds.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=melonDS
-Comment=Nintendo DS emulator
-Exec=melonDS
-Type=Application
-Categories=Game;
-Terminal=false
-Icon=net.kuribo64.melonds
diff --git a/melonDS.desktop b/net.kuribo64.melonDS.desktop
similarity index 91%
rename from melonDS.desktop
rename to net.kuribo64.melonDS.desktop
index 3dd921ce..c0dafe28 100644
--- a/melonDS.desktop
+++ b/net.kuribo64.melonDS.desktop
@@ -6,6 +6,6 @@ Exec=melonDS
 Type=Application
 Categories=Game;Emulator;
 Terminal=false
-Icon=melon_256x256
+Icon=net.kuribo64.melonDS
 MimeType=application/x-nintendo-ds-rom;
 Keywords=emulator;Nintendo;DS;NDS;Nintendo DS;
diff --git a/src/libui_sdl/CMakeLists.txt b/src/libui_sdl/CMakeLists.txt
index ae270e42..8c3d042f 100644
--- a/src/libui_sdl/CMakeLists.txt
+++ b/src/libui_sdl/CMakeLists.txt
@@ -66,7 +66,7 @@ elseif (WIN32)
 	target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi)
 endif ()
 
-install(FILES ../../melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-install(FILES ../../icon/melon_256x256.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
+install(FILES ../../net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+install(FILES ../../icon/melon_256x256.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME net.kuribo64.melonDS.png)
 install(FILES ../../romlist.bin DESTINATION ${CMAKE_INSTALL_PREFIX}/share/melonds)
 install(TARGETS melonDS RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)