From f0fdae168a5604472d79f2090b95f58b2ed44505 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 22 Oct 2021 23:08:23 +0100
Subject: [PATCH] OpenDingux/RetroFW: Remove `-hellfire` shortcuts

Game selection is now handled within DevilutionX
---
 Packaging/OpenDingux/gkd350h-hellfire.desktop | 11 -----------
 Packaging/OpenDingux/gkd350h.desktop          |  2 +-
 Packaging/OpenDingux/package-opk.sh           |  4 +---
 Packaging/OpenDingux/retrofw-hellfire.desktop | 12 ------------
 Packaging/OpenDingux/retrofw.desktop          |  2 +-
 Packaging/OpenDingux/rg350-hellfire.desktop   | 12 ------------
 Packaging/OpenDingux/rg350.desktop            |  2 +-
 7 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 Packaging/OpenDingux/gkd350h-hellfire.desktop
 delete mode 100644 Packaging/OpenDingux/retrofw-hellfire.desktop
 delete mode 100644 Packaging/OpenDingux/rg350-hellfire.desktop

diff --git a/Packaging/OpenDingux/gkd350h-hellfire.desktop b/Packaging/OpenDingux/gkd350h-hellfire.desktop
deleted file mode 100644
index 9af3e1ab5..000000000
--- a/Packaging/OpenDingux/gkd350h-hellfire.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=DevilutionX Hellfire
-Comment=Diablo 1: Hellfire for GKD350h
-Exec=devilutionx
-Terminal=false
-Type=Application
-StartupNotify=true
-Icon=hellfire_32
-Categories=games;
-X-OD-Manual=readme.gcw0.txt
-X-OD-NeedsDownscaling=true
diff --git a/Packaging/OpenDingux/gkd350h.desktop b/Packaging/OpenDingux/gkd350h.desktop
index d38e6e305..ec8ce43c1 100644
--- a/Packaging/OpenDingux/gkd350h.desktop
+++ b/Packaging/OpenDingux/gkd350h.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=DevilutionX
 Comment=Diablo 1 for GKD350h
-Exec=devilutionx --diablo
+Exec=devilutionx
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/Packaging/OpenDingux/package-opk.sh b/Packaging/OpenDingux/package-opk.sh
index 76fcdbb89..054d383b7 100755
--- a/Packaging/OpenDingux/package-opk.sh
+++ b/Packaging/OpenDingux/package-opk.sh
@@ -12,12 +12,10 @@ package_opk() {
 	rm -rf "$tmp"
 	mkdir -p "$tmp"
 	cp "Packaging/OpenDingux/${TARGET}.desktop" "${tmp}/default.${ext}.desktop"
-	cp "Packaging/OpenDingux/${TARGET}-hellfire.desktop" "${tmp}/hellfire.${ext}.desktop"
 	cp "Packaging/OpenDingux/${TARGET}-manual.txt" "${tmp}/readme.${ext}.txt"
 	mksquashfs "${BUILD_DIR}/devilutionx" \
-		"${tmp}/default.${ext}.desktop" "${tmp}/hellfire.${ext}.desktop" \
+		"${tmp}/default.${ext}.desktop" \
 		"${tmp}/readme.${ext}.txt" Packaging/resources/icon_32.png \
-		Packaging/resources/hellfire_32.png \
 		Packaging/resources/devilutionx.mpq \
 		"${BUILD_DIR}/devilutionx-${TARGET}.opk" \
 		-all-root -no-xattrs -noappend -no-exports -no-progress
diff --git a/Packaging/OpenDingux/retrofw-hellfire.desktop b/Packaging/OpenDingux/retrofw-hellfire.desktop
deleted file mode 100644
index 2c61e056d..000000000
--- a/Packaging/OpenDingux/retrofw-hellfire.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=DevilutionX Hellfire
-Comment=Diablo 1: Hellfire for RetroFW
-Exec=devilutionx
-Terminal=false
-Type=Application
-StartupNotify=true
-Icon=hellfire_32
-Categories=games;
-X-OD-Manual=readme.retrofw.txt
-X-OD-NeedsDownscaling=true
-X-OD-NeedsJoystick=true
diff --git a/Packaging/OpenDingux/retrofw.desktop b/Packaging/OpenDingux/retrofw.desktop
index 0bb0c3711..84c92ae56 100644
--- a/Packaging/OpenDingux/retrofw.desktop
+++ b/Packaging/OpenDingux/retrofw.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=DevilutionX
 Comment=Diablo 1 for RetroFW
-Exec=devilutionx --diablo
+Exec=devilutionx
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/Packaging/OpenDingux/rg350-hellfire.desktop b/Packaging/OpenDingux/rg350-hellfire.desktop
deleted file mode 100644
index 2846c103b..000000000
--- a/Packaging/OpenDingux/rg350-hellfire.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=DevilutionX Hellfire
-Comment=Diablo 1: Hellfire for RG350
-Exec=devilutionx
-Terminal=false
-Type=Application
-StartupNotify=true
-Icon=hellfire_32
-Categories=games;
-X-OD-Manual=readme.gcw0.txt
-X-OD-NeedsDownscaling=true
-X-OD-NeedsJoystick=true
diff --git a/Packaging/OpenDingux/rg350.desktop b/Packaging/OpenDingux/rg350.desktop
index bd843165c..26f4b82fa 100644
--- a/Packaging/OpenDingux/rg350.desktop
+++ b/Packaging/OpenDingux/rg350.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=DevilutionX
 Comment=Diablo 1 for RG350
-Exec=devilutionx --diablo
+Exec=devilutionx
 Terminal=false
 Type=Application
 StartupNotify=true