From 38c9f0bebf478a7a55d26a3a044873c5f59c7d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20M=C3=A1t=C3=A9=20R=C3=B3bert?=
 <mateusz.meszaros@gmail.com>
Date: Tue, 8 Nov 2022 13:49:34 +0100
Subject: [PATCH] GH-4966 Refactor the desktop entry

Changed the desktop file icon lookup, to enable app icon theming.
The Icon line uses the icon name instead of the full path.
For this to work, the icon is moved to a directory specified by the
standard (`/usr/share/icons/hicolor/scalable/apps/`).
As the standard highly suggests, a 48x48 png icon is also added
(rendered from the svg with inkscape).

Added the `StartupWMClass` directive, so that window managers can
associate the created windows with the desktop icon.

Changed the rpm spec file to reflect the aforementioned changes.

Fixes #4966
---
 launcher/package/rpm/MultiMC5.spec               |  10 ++++++++--
 .../usr/share/applications/multimc.desktop       |   3 ++-
 .../share/icons/hicolor/48x48/apps/multimc.png   | Bin 0 -> 3663 bytes
 .../icons/hicolor/scalable/apps/multimc.svg}     |   0
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 launcher/package/ubuntu/multimc/usr/share/icons/hicolor/48x48/apps/multimc.png
 rename launcher/package/ubuntu/multimc/{opt/multimc/icon.svg => usr/share/icons/hicolor/scalable/apps/multimc.svg} (100%)

diff --git a/launcher/package/rpm/MultiMC5.spec b/launcher/package/rpm/MultiMC5.spec
index 4b7e5002fd..f6cad878d4 100644
--- a/launcher/package/rpm/MultiMC5.spec
+++ b/launcher/package/rpm/MultiMC5.spec
@@ -26,8 +26,11 @@ A local install wrapper for MultiMC
 
 %install
 mkdir -p %{buildroot}/opt/multimc
-install -m 0644 ../ubuntu/multimc/opt/multimc/icon.svg %{buildroot}/opt/multimc/icon.svg
 install -m 0755 ../ubuntu/multimc/opt/multimc/run.sh %{buildroot}/opt/multimc/run.sh
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps
+install -m 0644 ../ubuntu/multimc/usr/share/icons/hicolor/48x48/apps/multimc.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/multimc.png
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps
+install -m 0644 ../ubuntu/multimc/usr/share/icons/hicolor/scalable/apps/multimc.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/multimc.svg
 mkdir -p %{buildroot}/%{_datadir}/applications
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications ../ubuntu/multimc/usr/share/applications/multimc.desktop
 
@@ -41,8 +44,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/multimc.metain
 
 %files
 %dir /opt/multimc
-/opt/multimc/icon.svg
 /opt/multimc/run.sh
+%dir %{_datadir}/icons/hicolor/48x48/apps
+%{_datadir}/icons/hicolor/48x48/apps/multimc.png
+%dir %{_datadir}/icons/hicolor/scalable/apps
+%{_datadir}/icons/hicolor/scalable/apps/multimc.svg
 %{_datadir}/applications/multimc.desktop
 %{_metainfodir}/multimc.metainfo.xml
 %dir %{_mandir}/man1
diff --git a/launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop b/launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop
index e0456f896b..c7a58c30a0 100644
--- a/launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop
+++ b/launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop
@@ -1,12 +1,13 @@
 [Desktop Entry]
 Categories=Game;
 Exec=/opt/multimc/run.sh
-Icon=/opt/multimc/icon.svg
+Icon=multimc
 Keywords=game;Minecraft;
 MimeType=
 Name=MultiMC 5
 Path=
 StartupNotify=true
+StartupWMClass=org.multimc.MultiMC
 Terminal=false
 TerminalOptions=
 Type=Application
diff --git a/launcher/package/ubuntu/multimc/usr/share/icons/hicolor/48x48/apps/multimc.png b/launcher/package/ubuntu/multimc/usr/share/icons/hicolor/48x48/apps/multimc.png
new file mode 100644
index 0000000000000000000000000000000000000000..654fe24d4ffdd8cb08d44fc8226380f59f8a8b15
GIT binary patch
literal 3663
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

literal 0
HcmV?d00001

diff --git a/launcher/package/ubuntu/multimc/opt/multimc/icon.svg b/launcher/package/ubuntu/multimc/usr/share/icons/hicolor/scalable/apps/multimc.svg
similarity index 100%
rename from launcher/package/ubuntu/multimc/opt/multimc/icon.svg
rename to launcher/package/ubuntu/multimc/usr/share/icons/hicolor/scalable/apps/multimc.svg