Stop installing app icon in pixmaps location

The /usr/share/pixmaps location is considered a legacy location for
application icons; since the application icons are already installed in
the global XDG hicolor theme, then simply stop installing the 48px one
in the legacy pixmaps location.
This commit is contained in:
Pino Toscano
2021-05-16 17:57:52 +02:00
parent b53bbe5a97
commit 71bcfe80e3
3 changed files with 1 additions and 7 deletions
-5
View File
@@ -37,11 +37,6 @@ endif()
# Desktop file
if (NOT WIN32)
# Application pixmap (fallback icon for desktop files).
# Same as 48/gsmartcontrol.png.
install(FILES 48/gsmartcontrol.png
DESTINATION "${CMAKE_INSTALL_DATADIR}/pixmaps/")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol.desktop"
DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/")
+1 -1
View File
@@ -22,7 +22,7 @@ Comment=Monitor and control SMART data on hard disk and solid-state drives
Comment[fr]=Surveille et contrôle les données SMART des disques durs et des SSD
# If it's a name only, it looks for "name.[png|xpm]" file in
# $XDG_DATA_DIRS/icons and /usr/share/pixmaps.
# $XDG_DATA_DIRS/icons.
# An absolute file path is also supported.
Icon=gsmartcontrol
-1
View File
@@ -119,7 +119,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/pixmaps/%{name}.png
%dir %{_datadir}/metainfo
%{_datadir}/metainfo/%{name}.appdata.xml
%{_datadir}/polkit-1/actions/org.%{name}.policy