From 6ddb456f60055f97897f2706c8fb30242a2a0168 Mon Sep 17 00:00:00 2001 From: Felipe Borges Date: Thu, 20 Jan 2022 13:24:52 +0100 Subject: [PATCH] Set an existing Icon name in the Applications' panel desktop file While we dynamically append --symbolic to the icons while creating the sidebar model in https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/master/shell/cc-shell-model.c#L270 There are automation tools (such as rpmdiff) that parse desktop files and verify whether their Icon= matches to an existing file in the icon theme package. preferences-desktop-apps doesn't exist in adwaita-icon-theme but preferences-desktop-apps-symbolic does. Resolves: rhbz#2041348 --- application-use-icon-name-that-exists.patch | 42 +++++++++++++++++++++ gnome-control-center.spec | 7 +++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 application-use-icon-name-that-exists.patch diff --git a/application-use-icon-name-that-exists.patch b/application-use-icon-name-that-exists.patch new file mode 100644 index 0000000..f86bd7b --- /dev/null +++ b/application-use-icon-name-that-exists.patch @@ -0,0 +1,42 @@ +From 0e2562c2c5ff081561424c625b090f089ef45fe7 Mon Sep 17 00:00:00 2001 +From: Felipe Borges +Date: Fri, 14 Jan 2022 13:28:24 +0100 +Subject: [PATCH] applications: Set the Icon key in desktop file to a icon that + exists + +While we dynamically append --symbolic to the icons while creating +the sidebar model in +https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/master/shell/cc-shell-model.c#L270 +There are automation tools (such as rpmdiff) that parse desktop files +and verify whether their Icon= matches to an existing file in the +icon theme package. + +preferences-desktop-apps doesn't exist in adwaita-icon-theme but +preferences-desktop-apps-symbolic does. +--- + panels/applications/gnome-applications-panel.desktop.in.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/panels/applications/gnome-applications-panel.desktop.in.in b/panels/applications/gnome-applications-panel.desktop.in.in +index 86e816645..83616c89e 100644 +--- a/panels/applications/gnome-applications-panel.desktop.in.in ++++ b/panels/applications/gnome-applications-panel.desktop.in.in +@@ -4,7 +4,7 @@ Comment=Control various application permissions and settings + Exec=gnome-control-center applications + # FIXME + # Translators: Do NOT translate or transliterate this text (this is an icon file name)! +-Icon=preferences-desktop-apps ++icon=preferences-desktop-apps-symbolic + Terminal=false + Type=Application + NoDisplay=true +@@ -13,4 +13,4 @@ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-Acc + OnlyShowIn=GNOME;Unity; + # Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! + Keywords=application;flatpak;permission;setting; +-X-GNOME-ControlCenter-HasSidebar=true +\ No newline at end of file ++X-GNOME-ControlCenter-HasSidebar=true +-- +2.33.1 + diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 0b4034f..72dee01 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -14,7 +14,7 @@ Name: gnome-control-center Version: 40.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Utilities to configure the GNOME desktop License: GPLv2+ and CC-BY-SA @@ -31,6 +31,7 @@ Patch1: gnome-control-center-Drop-the-unused-build-dependency-on-Grilo.p Patch2: power-profiles-backport.patch Patch3: wwan-backport-gnome-40.patch Patch4: subscription-manager-support.patch +Patch5: application-use-icon-name-that-exists.patch BuildRequires: chrpath BuildRequires: cups-devel @@ -220,6 +221,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center %dir %{_datadir}/gnome/wm-properties %changelog +* Fri Jan 14 2022 Felipe Borges - 40.0-17 +- Set an existing Icon name in the Applications' panel desktop file +- Resolves: #2041348 + * Tue Sep 07 2021 Kalev Lember - 40.0-16 - Add desktop file keywords for subscription support - Resolves: #1937113