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.
This commit is contained in:
		@@ -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 \
 | 
			
		||||
 
 | 
			
		||||
@@ -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/*
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
@@ -10,4 +10,3 @@ Icon=org.polymc.PolyMC
 | 
			
		||||
PrefersNonDefaultGPU=true
 | 
			
		||||
Categories=Game;
 | 
			
		||||
Keywords=game;minecraft;launcher;
 | 
			
		||||
StartupWMClass=PolyMC
 | 
			
		||||
		Reference in New Issue
	
	Block a user