From ec1e27031a0b1fb9760f650ad8415d9e14e3f9f3 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Wed, 26 Jan 2022 23:51:29 -0500 Subject: Fix Freedesktop icons This fixes #51. The desktop file is now exactly the same as the window class, which is also now corrected to org.polymc.polymc. The file capitalization is also consistent with other Freedesktop files as well. --- packages/nix/polymc/default.nix | 2 +- packages/rpm/polymc.spec | 4 ++-- program_info/CMakeLists.txt | 6 +++--- program_info/org.polymc.PolyMC.desktop.in | 13 ------------- program_info/org.polymc.polymc.desktop.in | 12 ++++++++++++ 5 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 program_info/org.polymc.PolyMC.desktop.in create mode 100644 program_info/org.polymc.polymc.desktop.in diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 5da00ff8..b6bf6c5e 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -88,7 +88,7 @@ mkDerivation rec { postInstall = '' install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/polymc.svg - install -Dm644 ${desktopItem}/share/applications/polymc.desktop $out/share/applications/org.polymc.PolyMC.desktop + install -Dm644 ${desktopItem}/share/applications/polymc.desktop $out/share/applications/org.polymc.polymc.desktop # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapProgram $out/bin/polymc \ diff --git a/packages/rpm/polymc.spec b/packages/rpm/polymc.spec index 259dc526..f52b6261 100644 --- a/packages/rpm/polymc.spec +++ b/packages/rpm/polymc.spec @@ -112,7 +112,7 @@ echo "%{_libdir}/%{name}" > "%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ # skip tests on systems that aren't officially supported %if ! 0%{?suse_version} %ctest -desktop-file-validate %{buildroot}%{_datadir}/applications/org.polymc.PolyMC.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/org.polymc.polymc.desktop %endif @@ -123,7 +123,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.polymc.PolyMC.des %{_libdir}/%{name}/* %{_datadir}/%{name}/* %{_datadir}/metainfo/org.polymc.PolyMC.metainfo.xml -%{_datadir}/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg +%{_datadir}/icons/hicolor/scalable/apps/org.polymc.polymC.svg %{_datadir}/applications/org.polymc.PolyMC.desktop %config %{_sysconfdir}/ld.so.conf.d/* diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index 77b971fc..26369fe5 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -1,19 +1,19 @@ set(Launcher_CommonName "PolyMC") set(Launcher_Copyright "PolyMC Contributors" PARENT_SCOPE) -set(Launcher_Domain "github.com/PolyMC" PARENT_SCOPE) +set(Launcher_Domain "polymc.org" PARENT_SCOPE) set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE) set(Launcher_ConfigFile "polymc.cfg" PARENT_SCOPE) set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE) -set(Launcher_Desktop "program_info/org.polymc.PolyMC.desktop" PARENT_SCOPE) +set(Launcher_Desktop "program_info/org.polymc.polymc.desktop" PARENT_SCOPE) set(Launcher_MetaInfo "program_info/org.polymc.PolyMC.metainfo.xml" PARENT_SCOPE) set(Launcher_SVG "program_info/org.polymc.PolyMC.svg" PARENT_SCOPE) set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE) set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE) set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE) -configure_file(org.polymc.PolyMC.desktop.in org.polymc.PolyMC.desktop) +configure_file(org.polymc.polymc.desktop.in org.polymc.polymc.desktop) configure_file(org.polymc.PolyMC.metainfo.xml.in org.polymc.PolyMC.metainfo.xml) diff --git a/program_info/org.polymc.PolyMC.desktop.in b/program_info/org.polymc.PolyMC.desktop.in deleted file mode 100644 index 5d982b38..00000000 --- a/program_info/org.polymc.PolyMC.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=PolyMC -Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. -Type=Application -Terminal=false -Exec=@Launcher_APP_BINARY_NAME@ -StartupNotify=true -Icon=org.polymc.PolyMC -PrefersNonDefaultGPU=true -Categories=Game; -Keywords=game;minecraft;launcher; -StartupWMClass=PolyMC diff --git a/program_info/org.polymc.polymc.desktop.in b/program_info/org.polymc.polymc.desktop.in new file mode 100644 index 00000000..8bbdc505 --- /dev/null +++ b/program_info/org.polymc.polymc.desktop.in @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Name=PolyMC +Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. +Type=Application +Terminal=false +Exec=@Launcher_APP_BINARY_NAME@ +StartupNotify=true +Icon=org.polymc.PolyMC +PrefersNonDefaultGPU=true +Categories=Game; +Keywords=game;minecraft;launcher; -- cgit From cd5faee7d746a132bd690f9e3a2b35dcc5af91c6 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Wed, 26 Jan 2022 23:51:29 -0500 Subject: Fix RPM spec referencing old desktop file --- packages/rpm/polymc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rpm/polymc.spec b/packages/rpm/polymc.spec index f52b6261..0b659ed5 100644 --- a/packages/rpm/polymc.spec +++ b/packages/rpm/polymc.spec @@ -123,8 +123,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.polymc.polymc.des %{_libdir}/%{name}/* %{_datadir}/%{name}/* %{_datadir}/metainfo/org.polymc.PolyMC.metainfo.xml -%{_datadir}/icons/hicolor/scalable/apps/org.polymc.polymC.svg -%{_datadir}/applications/org.polymc.PolyMC.desktop +%{_datadir}/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg +%{_datadir}/applications/org.polymc.polymc.desktop %config %{_sysconfdir}/ld.so.conf.d/* -- cgit