From 71bcfe80e34489969734bde4be891c869e01f3f9 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 16 May 2021 17:57:52 +0200 Subject: [PATCH] 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. --- data/CMakeLists.txt | 5 ----- data/gsmartcontrol.in.desktop | 2 +- packaging/obs_rpm/gsmartcontrol.spec | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 44d72df..2b760f7 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -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/") diff --git a/data/gsmartcontrol.in.desktop b/data/gsmartcontrol.in.desktop index daac53f..b2c2a11 100644 --- a/data/gsmartcontrol.in.desktop +++ b/data/gsmartcontrol.in.desktop @@ -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 diff --git a/packaging/obs_rpm/gsmartcontrol.spec b/packaging/obs_rpm/gsmartcontrol.spec index e757f4a..5641183 100644 --- a/packaging/obs_rpm/gsmartcontrol.spec +++ b/packaging/obs_rpm/gsmartcontrol.spec @@ -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