Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/gnome-system-monitor.git#35ba0f61c3882a766ba0436990c9bb5a548350b2
This commit is contained in:
parent
d055b79426
commit
abc057a4f7
1
.gitignore
vendored
1
.gitignore
vendored
@ -116,3 +116,4 @@ gnome-system-monitor-2.28.1.tar.bz2
|
||||
/gnome-system-monitor-3.37.92.tar.xz
|
||||
/gnome-system-monitor-3.38.0.tar.xz
|
||||
/gnome-system-monitor-40.beta.tar.xz
|
||||
/gnome-system-monitor-40.rc.tar.xz
|
||||
|
@ -1,36 +0,0 @@
|
||||
From 5076dae1bfdc3e127b3da6e1556e0e6db5168375 Mon Sep 17 00:00:00 2001
|
||||
From: Abderrahim Kitouni <akitouni@gnome.org>
|
||||
Date: Sat, 13 Feb 2021 16:48:47 +0100
|
||||
Subject: [PATCH] load-graph: fix out-of-bounds error
|
||||
|
||||
---
|
||||
src/load-graph.cpp | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/load-graph.cpp b/src/load-graph.cpp
|
||||
index 3285d111..5282ce23 100644
|
||||
--- a/src/load-graph.cpp
|
||||
+++ b/src/load-graph.cpp
|
||||
@@ -628,7 +628,7 @@ net_scale (LoadGraph *graph, guint64 din, guint64 dout)
|
||||
new_max = dmax;
|
||||
else
|
||||
new_max = *std::max_element(&graph->net.values[0],
|
||||
- &graph->net.values[graph->num_points]);
|
||||
+ &graph->net.values[graph->num_points - 1]);
|
||||
|
||||
//
|
||||
// Round network maximum
|
||||
@@ -792,8 +792,8 @@ load_graph_update_data (LoadGraph *graph)
|
||||
{
|
||||
// Rotate data one element down.
|
||||
std::rotate(&graph->data[0],
|
||||
- &graph->data[graph->num_points - 1],
|
||||
- &graph->data[graph->num_points]);
|
||||
+ &graph->data[graph->num_points - 2],
|
||||
+ &graph->data[graph->num_points - 1]);
|
||||
|
||||
// Update rotation counter.
|
||||
graph->latest = (graph->latest + 1) % graph->num_points;
|
||||
--
|
||||
2.30.1
|
||||
|
@ -3,12 +3,12 @@
|
||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: gnome-system-monitor
|
||||
Version: 40~beta
|
||||
Version: 40~rc
|
||||
Release: 2%{?dist}
|
||||
Summary: Process and resource monitor
|
||||
|
||||
License: GPLv2+
|
||||
URL: http://www.gnome.org/
|
||||
URL: https://wiki.gnome.org/Apps/SystemMonitor
|
||||
Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
|
||||
|
||||
BuildRequires: gcc
|
||||
@ -17,19 +17,17 @@ BuildRequires: meson
|
||||
BuildRequires: pkgconfig(libgtop-2.0) >= %{libgtop2_version}
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(gtkmm-3.0)
|
||||
BuildRequires: pkgconfig(libhandy-1)
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
BuildRequires: itstool
|
||||
BuildRequires: polkit-devel
|
||||
|
||||
Requires: hicolor-icon-theme
|
||||
Requires: libgtop2%{?_isa} >= %{libgtop2_version}
|
||||
|
||||
Patch0: 0001-load-graph-fix-out-of-bounds-error.patch
|
||||
|
||||
%description
|
||||
gnome-system-monitor allows to graphically view and manipulate the running
|
||||
processes on your system. It also provides an overview of available resources
|
||||
@ -62,11 +60,18 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit
|
||||
%{_datadir}/gnome-system-monitor/
|
||||
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.SystemMonitor*.svg
|
||||
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.SystemMonitor-symbolic.svg
|
||||
%{_datadir}/icons/hicolor/symbolic/apps/speedometer-symbolic.svg
|
||||
%{_datadir}/metainfo/gnome-system-monitor.appdata.xml
|
||||
%{_datadir}/polkit-1/actions/org.gnome.gnome-system-monitor.policy
|
||||
%{_libexecdir}/gnome-system-monitor/
|
||||
|
||||
%changelog
|
||||
* Tue Mar 16 2021 David King <amigadave@amigadave.com> - 40~rc-2
|
||||
- Remove unused polkit BuildRequires, update URL
|
||||
|
||||
* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
|
||||
- Update to 40.rc
|
||||
|
||||
* Sun Feb 21 2021 Łukasz Patron <priv.luk@gmail.com> - 40~beta-2
|
||||
- Backport an upstream patch to fix out-of-bounds error when opening resources tab (MR #38)
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gnome-system-monitor-40.beta.tar.xz) = c88442d037a004d8d9c7476c33ebf8b306c76f8fb434711cc214342326816b00c736473ad02a8d39948bc8922eb1646bb2ab3c60874bf0ecb1eda7fbcdc968ec
|
||||
SHA512 (gnome-system-monitor-40.rc.tar.xz) = 7dd02b5042dfe5865dc6b1258c4ee1d8430f1bc2fb8fc424b2473ea728522b25fa0b16282a13d9b82ae446d2e0f49637c81b428ab4242de3e95f286b1f9b75b2
|
||||
|
Loading…
Reference in New Issue
Block a user