.gitignore

@@ -1 +1 @@
-SOURCES/gnome-system-monitor-3.28.2.tar.xz
+SOURCES/gnome-system-monitor-40.1.tar.xz

.gnome-system-monitor.metadata

@@ -1 +1 @@
-61205a533bbf6adade65da0f6b900d9c7b548b6c SOURCES/gnome-system-monitor-3.28.2.tar.xz
+f4044d61b0372f0441cd8c837ed5f9df9307b8a1 SOURCES/gnome-system-monitor-40.1.tar.xz

SOURCES/gnome-system-monitor-40.1-changing-points-crash.patch

@@ -0,0 +1,78 @@
+From cc5200c00aa82894a97ac0a89efe19fcb9db5260 Mon Sep 17 00:00:00 2001
+From: Sergey Bugaev <bugaevc@gmail.com>
+Date: Sat, 1 May 2021 14:23:33 +0300
+Subject: [PATCH] Fix crash when changing the number of points
+
+std::rotate accepts an "end" iterator that points one after the last
+item. In plain C, it's possible to create a "one past end" pointer by
+using the following idiom: &arr[size], which is equivalent to arr + size.
+No actual pointer dereference happens in this case. In C++, vector[index]
+always causes a vector.operator[](index) invocation; it is undefined
+behavior to use this method with out-of-bounds indexes. Therefore, this
+idiom cannot be used in C++ to get a "one past end" iterator. Instead,
+C++ provides .begin() and .end() methods. Use those instead.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/issues/197
+Fixes https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/issues/181
+---
+ src/load-graph.cpp | 23 +++++++++--------------
+ 1 file changed, 9 insertions(+), 14 deletions(-)
+
+diff --git a/src/load-graph.cpp b/src/load-graph.cpp
+index b18bc61c..aa28589f 100644
+--- a/src/load-graph.cpp
++++ b/src/load-graph.cpp
+@@ -792,9 +792,9 @@ void
+ load_graph_update_data (LoadGraph *graph)
+ {
+     // Rotate data one element down.
+-    std::rotate(&graph->data[0],
+-                &graph->data[graph->num_points - 2],
+-                &graph->data[graph->num_points - 1]);
++    std::rotate(graph->data.begin(),
++                graph->data.end() - 1,
++                graph->data.end());
+ 
+     // Update rotation counter.
+     graph->latest = (graph->latest + 1) % graph->num_points;
+@@ -1061,31 +1061,26 @@ void
+ load_graph_change_num_points(LoadGraph *graph,
+                              guint new_num_points)
+ {
+-    //Don't do anything if the value didn't change.
++    // Don't do anything if the value didn't change.
+     if (graph->num_points == new_num_points)
+         return;
+ 
+     // Sort the values in the data_block vector in the order they were accessed in by the pointers in data.
+-    std::rotate(&graph->data_block[0],
+-                &graph->data_block[(graph->num_points - graph->latest) * graph->n],
+-                &graph->data_block[graph->num_points * graph->n]);
++    std::rotate(graph->data_block.begin(),
++                graph->data_block.begin() + (graph->num_points - graph->latest) * graph->n,
++                graph->data_block.end());
+ 
+     // Reset rotation counter.
+     graph->latest = 0;
+ 
+     // Resize the vectors to the new amount of data points.
++    // Fill the new values with -1.
+     graph->data.resize(new_num_points);
+-    graph->data_block.resize(graph->n * new_num_points);
++    graph->data_block.resize(graph->n * new_num_points, -1.0);
+     if (graph->type == LOAD_GRAPH_NET) {
+         graph->net.values.resize(new_num_points);
+     }
+ 
+-    // Fill the new values with -1 instead of 0 if the vectors got bigger.
+-    if (new_num_points > graph->num_points) {
+-        std::fill(&graph->data_block[graph->n * graph->num_points],
+-                  &graph->data_block[graph->n * new_num_points], -1.0);
+-    }
+-
+     // Replace the pointers in data, to match the new data_block values.
+     for (guint i = 0; i < new_num_points; ++i) {
+         graph->data[i] = &graph->data_block[0] + i * graph->n;
+-- 
+2.36.1
+

SOURCES/gnome-system-monitor-40.1-help-shortcut.patch

@@ -0,0 +1,26 @@
+From f3866651321e0bc4ba79dc62a44ef7caea785e70 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Mon, 25 Apr 2022 14:17:43 +0100
+Subject: [PATCH] application: Fix help overlay shortcut
+
+https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/issues/202
+https://bugzilla.redhat.com/show_bug.cgi?id=2073741
+---
+ src/application.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/application.cpp b/src/application.cpp
+index e66408a1..196b87ee 100644
+--- a/src/application.cpp
++++ b/src/application.cpp
+@@ -511,6 +511,7 @@ void GsmApplication::on_startup()
+     add_accelerator("<Alt>Return", "win.process-properties", NULL);
+     add_accelerator("<Primary>f", "win.search", g_variant_new_boolean (TRUE));
+     add_accelerator("F1", "app.help", NULL);
++    add_accelerator("<Primary>question", "win.show-help-overlay", NULL);
+ 
+     Gtk::Window::set_default_icon_name ("org.gnome.SystemMonitor");
+ 
+-- 
+2.36.1
+

SPECS/gnome-system-monitor.spec

@@ -1,25 +1,35 @@
 %global libgtop2_version 2.37.2
 
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name:           gnome-system-monitor
-Version:        3.28.2
+Version:        40.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Process and resource monitor
 
 License:        GPLv2+
-URL:            http://www.gnome.org/
+URL:            https://wiki.gnome.org/Apps/SystemMonitor
-Source0:        http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
+# https://bugzilla.redhat.com/show_bug.cgi?id=2073741
+Patch0:         gnome-system-monitor-40.1-help-shortcut.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=2062802
+Patch1:         gnome-system-monitor-40.1-changing-points-crash.patch
 
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+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}
 
 %description
@@ -28,14 +38,14 @@ processes on your system. It also provides an overview of available resources
 such as CPU and memory.
 
 %prep
-%setup -q
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
-%configure --enable-systemd
+%meson
-make %{?_smp_mflags}
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 %find_lang %{name} --with-gnome
 
@@ -45,18 +55,121 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit
 
 %files -f %{name}.lang
 %license COPYING
-%doc AUTHORS NEWS README
+%doc AUTHORS NEWS README.md
 %{_bindir}/gnome-system-monitor
 %{_datadir}/applications/gnome-system-monitor.desktop
 %{_datadir}/applications/gnome-system-monitor-kde.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.gschema.xml
 %{_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
+* Wed May 11 2022 David King <amigadave@amigadave.com> - 40.1-3
+- Fix help overlay shortcut (#2073741)
+- Fix crash when changing data points (#2062802)
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.1-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed May 05 2021 Kalev Lember <klember@redhat.com> - 40.1-1
+- Update to 40.1
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
+- Update to 40.0
+
+* 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)
+
+* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
+- Update to 40.beta
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
+- Update to 3.38.0
+
+* Fri Sep 04 2020 Kalev Lember <klember@redhat.com> - 3.37.92-1
+- Update to 3.37.92
+
+* Fri Aug 21 2020 Kalev Lember <klember@redhat.com> - 3.37.91-1
+- Update to 3.37.91
+
+* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 3.37.90-1
+- Update to 3.37.90
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.1-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri May 29 2020 Kalev Lember <klember@redhat.com> - 3.36.1-1
+- Update to 3.36.1
+
+* Sun Mar 08 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
+- Update to 3.36.0
+
+* Mon Mar 02 2020 Kalev Lember <klember@redhat.com> - 3.35.92-1
+- Update to 3.35.92
+
+* Tue Feb 04 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
+- Update to 3.35.90
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 3.32.1-2
+- Rebuild with Meson fix for #1699099
+
+* Tue Apr 09 2019 Kalev Lember <klember@redhat.com> - 3.32.1-1
+- Update to 3.32.1
+
+* 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
+- Update to 3.32.0
+
+* Tue Mar 05 2019 Kalev Lember <klember@redhat.com> - 3.31.92-1
+- Update to 3.31.92
+
+* Mon Feb 18 2019 Kalev Lember <klember@redhat.com> - 3.31.91-1
+- Update to 3.31.91
+
+* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
+- Update to 3.31.90
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 23 2019 Kalev Lember <klember@redhat.com> - 3.31.3-1
+- Update to 3.31.3
+
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 3.30.0-1
+- Update to 3.30.0
+- Switch to the meson build system
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed May 09 2018 Kalev Lember <klember@redhat.com> - 3.28.2-1
 - Update to 3.28.2