Update to 40.rc

This commit is contained in:
Kalev Lember 2021-03-15 22:11:26 +01:00
parent a39330b0bd
commit 27875aeed2
4 changed files with 9 additions and 41 deletions

1
.gitignore vendored
View File

@ -116,3 +116,4 @@ gnome-system-monitor-2.28.1.tar.bz2
/gnome-system-monitor-3.37.92.tar.xz /gnome-system-monitor-3.37.92.tar.xz
/gnome-system-monitor-3.38.0.tar.xz /gnome-system-monitor-3.38.0.tar.xz
/gnome-system-monitor-40.beta.tar.xz /gnome-system-monitor-40.beta.tar.xz
/gnome-system-monitor-40.rc.tar.xz

View File

@ -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

View File

@ -3,8 +3,8 @@
%global tarball_version %%(echo %{version} | tr '~' '.') %global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-system-monitor Name: gnome-system-monitor
Version: 40~beta Version: 40~rc
Release: 2%{?dist} Release: 1%{?dist}
Summary: Process and resource monitor Summary: Process and resource monitor
License: GPLv2+ License: GPLv2+
@ -17,6 +17,7 @@ BuildRequires: meson
BuildRequires: pkgconfig(libgtop-2.0) >= %{libgtop2_version} BuildRequires: pkgconfig(libgtop-2.0) >= %{libgtop2_version}
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gtkmm-3.0) BuildRequires: pkgconfig(gtkmm-3.0)
BuildRequires: pkgconfig(libhandy-1)
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
@ -28,8 +29,6 @@ BuildRequires: polkit-devel
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
Requires: libgtop2%{?_isa} >= %{libgtop2_version} Requires: libgtop2%{?_isa} >= %{libgtop2_version}
Patch0: 0001-load-graph-fix-out-of-bounds-error.patch
%description %description
gnome-system-monitor allows to graphically view and manipulate the running gnome-system-monitor allows to graphically view and manipulate the running
processes on your system. It also provides an overview of available resources processes on your system. It also provides an overview of available resources
@ -62,11 +61,15 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit
%{_datadir}/gnome-system-monitor/ %{_datadir}/gnome-system-monitor/
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.SystemMonitor*.svg %{_datadir}/icons/hicolor/scalable/apps/org.gnome.SystemMonitor*.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.SystemMonitor-symbolic.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}/metainfo/gnome-system-monitor.appdata.xml
%{_datadir}/polkit-1/actions/org.gnome.gnome-system-monitor.policy %{_datadir}/polkit-1/actions/org.gnome.gnome-system-monitor.policy
%{_libexecdir}/gnome-system-monitor/ %{_libexecdir}/gnome-system-monitor/
%changelog %changelog
* 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 * 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) - Backport an upstream patch to fix out-of-bounds error when opening resources tab (MR #38)

View File

@ -1 +1 @@
SHA512 (gnome-system-monitor-40.beta.tar.xz) = c88442d037a004d8d9c7476c33ebf8b306c76f8fb434711cc214342326816b00c736473ad02a8d39948bc8922eb1646bb2ab3c60874bf0ecb1eda7fbcdc968ec SHA512 (gnome-system-monitor-40.rc.tar.xz) = 7dd02b5042dfe5865dc6b1258c4ee1d8430f1bc2fb8fc424b2473ea728522b25fa0b16282a13d9b82ae446d2e0f49637c81b428ab4242de3e95f286b1f9b75b2