Backport an upstream patch to use the new icon in various places
This commit is contained in:
Kalev Lember
parent
d0e80f38d8
commit
4423709bf6
86
0001-Stop-using-old-icon-name.patch
Normal file
86
0001-Stop-using-old-icon-name.patch
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
From 1a5fe2bfe79886a9f3420e35c283787824b0a0b8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Mikhaylenko <exalm7659@gmail.com>
|
||||||
|
Date: Fri, 15 Mar 2019 11:19:37 +0500
|
||||||
|
Subject: [PATCH] Stop using old icon name
|
||||||
|
|
||||||
|
Fix the name in:
|
||||||
|
* Window icon
|
||||||
|
* About dialog
|
||||||
|
* PolicyKit policy
|
||||||
|
* KDE desktop file
|
||||||
|
---
|
||||||
|
data/interface.ui | 2 +-
|
||||||
|
gnome-system-monitor-kde.desktop.in.in | 2 +-
|
||||||
|
org.gnome.gnome-system-monitor.policy.in.in | 2 +-
|
||||||
|
src/application.cpp | 2 +-
|
||||||
|
src/interface.cpp | 2 +-
|
||||||
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/data/interface.ui b/data/interface.ui
|
||||||
|
index 9f1e40cf..d136f1dd 100644
|
||||||
|
--- a/data/interface.ui
|
||||||
|
+++ b/data/interface.ui
|
||||||
|
@@ -6,7 +6,7 @@
|
||||||
|
<property name="title" translatable="yes">System Monitor</property>
|
||||||
|
<property name="default_width">440</property>
|
||||||
|
<property name="default_height">495</property>
|
||||||
|
- <property name="icon_name">utilities-system-monitor</property>
|
||||||
|
+ <property name="icon_name">org.gnome.SystemMonitor</property>
|
||||||
|
<child type="titlebar">
|
||||||
|
<object class="GtkHeaderBar" id="header_bar">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
diff --git a/gnome-system-monitor-kde.desktop.in.in b/gnome-system-monitor-kde.desktop.in.in
|
||||||
|
index 9cb97ad4..23435234 100644
|
||||||
|
--- a/gnome-system-monitor-kde.desktop.in.in
|
||||||
|
+++ b/gnome-system-monitor-kde.desktop.in.in
|
||||||
|
@@ -4,7 +4,7 @@ Comment=View current processes and monitor system state
|
||||||
|
TryExec=gnome-system-monitor
|
||||||
|
Exec=gnome-system-monitor
|
||||||
|
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
|
||||||
|
-Icon=utilities-system-monitor
|
||||||
|
+Icon=org.gnome.SystemMonitor
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
StartupNotify=true
|
||||||
|
diff --git a/org.gnome.gnome-system-monitor.policy.in.in b/org.gnome.gnome-system-monitor.policy.in.in
|
||||||
|
index 45b5da47..d36e1d5c 100644
|
||||||
|
--- a/org.gnome.gnome-system-monitor.policy.in.in
|
||||||
|
+++ b/org.gnome.gnome-system-monitor.policy.in.in
|
||||||
|
@@ -5,7 +5,7 @@
|
||||||
|
<policyconfig>
|
||||||
|
<vendor>The GNOME Project</vendor>
|
||||||
|
<vendor_url>http://www.gnome.org/</vendor_url>
|
||||||
|
- <icon_name>utilities-system-monitor</icon_name>
|
||||||
|
+ <icon_name>org.gnome.SystemMonitor</icon_name>
|
||||||
|
|
||||||
|
<action id="org.gnome.gnome-system-monitor.kill">
|
||||||
|
<description>Kill process</description>
|
||||||
|
diff --git a/src/application.cpp b/src/application.cpp
|
||||||
|
index 9963f46f..5052a40a 100644
|
||||||
|
--- a/src/application.cpp
|
||||||
|
+++ b/src/application.cpp
|
||||||
|
@@ -400,7 +400,7 @@ void GsmApplication::on_startup()
|
||||||
|
add_accelerator("<Alt>Return", "win.process-properties", NULL);
|
||||||
|
add_accelerator("<Primary>f", "win.search", g_variant_new_boolean (TRUE));
|
||||||
|
|
||||||
|
- Gtk::Window::set_default_icon_name ("utilities-system-monitor");
|
||||||
|
+ Gtk::Window::set_default_icon_name ("org.gnome.SystemMonitor");
|
||||||
|
|
||||||
|
glibtop_init ();
|
||||||
|
|
||||||
|
diff --git a/src/interface.cpp b/src/interface.cpp
|
||||||
|
index 449b4d34..cb2f3f8a 100644
|
||||||
|
--- a/src/interface.cpp
|
||||||
|
+++ b/src/interface.cpp
|
||||||
|
@@ -390,7 +390,7 @@ on_activate_about (GSimpleAction *, GVariant *, gpointer data)
|
||||||
|
"copyright", "Copyright \xc2\xa9 2001-2004 Kevin Vandersloot\n"
|
||||||
|
"Copyright \xc2\xa9 2005-2007 Benoît Dejean\n"
|
||||||
|
"Copyright \xc2\xa9 2011 Chris Kühl",
|
||||||
|
- "logo-icon-name", "utilities-system-monitor",
|
||||||
|
+ "logo-icon-name", "org.gnome.SystemMonitor",
|
||||||
|
"authors", authors,
|
||||||
|
"artists", artists,
|
||||||
|
"documenters", documenters,
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
@ -2,12 +2,14 @@
|
|||||||
|
|
||||||
Name: gnome-system-monitor
|
Name: gnome-system-monitor
|
||||||
Version: 3.32.0
|
Version: 3.32.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Process and resource monitor
|
Summary: Process and resource monitor
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.gnome.org/
|
URL: http://www.gnome.org/
|
||||||
Source0: http://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz
|
Source0: http://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz
|
||||||
|
# Backported from upstream
|
||||||
|
Patch0: 0001-Stop-using-old-icon-name.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -32,7 +34,7 @@ processes on your system. It also provides an overview of available resources
|
|||||||
such as CPU and memory.
|
such as CPU and memory.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson
|
%meson
|
||||||
@ -63,6 +65,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit
|
|||||||
%{_libexecdir}/gnome-system-monitor/
|
%{_libexecdir}/gnome-system-monitor/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 15 2019 Kalev Lember <klember@redhat.com> - 3.32.0-2
|
||||||
|
- Backport an upstream patch to use the new icon in various places
|
||||||
|
|
||||||
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
|
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
|
||||||
- Update to 3.32.0
|
- Update to 3.32.0
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user