6 changed files with 122 additions and 129 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/gnome-system-monitor-40.1.tar.xz
+SOURCES/gnome-system-monitor-46.alpha.tar.xz
--- a/.gnome-system-monitor.metadata
+++ b/.gnome-system-monitor.metadata
@ -1 +1 @@
-f4044d61b0372f0441cd8c837ed5f9df9307b8a1 SOURCES/gnome-system-monitor-40.1.tar.xz
+f32781fb369abc642150e3174326aa919ae06153 SOURCES/gnome-system-monitor-46.alpha.tar.xz
--- a/SOURCES/gnome-system-monitor-40.1-changing-points-crash.patch
+++ b/SOURCES/gnome-system-monitor-40.1-changing-points-crash.patch
@ -1,78 +0,0 @@
-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
-
--- a/SOURCES/gnome-system-monitor-40.1-help-shortcut.patch
+++ b/SOURCES/gnome-system-monitor-40.1-help-shortcut.patch
@ -1,26 +0,0 @@
-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
-
--- a/SOURCES/gnome-system-monitor-46.alpha-pointer-type-error.patch
+++ b/SOURCES/gnome-system-monitor-46.alpha-pointer-type-error.patch
@ -0,0 +1,36 @@
+From 07654d6c5f77631b3d77eafc8eafc9c4238a9ba3 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Mon, 22 Jan 2024 17:57:00 +0000
+Subject: [PATCH] Fix incompatible pointer type warnings
+
+Verified against GTK documentation.
+---
+ src/legacy/gsm_color_button.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/legacy/gsm_color_button.c b/src/legacy/gsm_color_button.c
+index 367a29ac..1bee747f 100644
+--- a/src/legacy/gsm_color_button.c
+++ b/src/legacy/gsm_color_button.c
+@@ -369,7 +369,8 @@ gsm_color_button_measure (GtkWidget*,
+ }
+ 
+ static void
+-gsm_color_button_state_flags_changed (GtkWidget *self)
+gsm_color_button_state_flags_changed (GtkWidget *self,
+                                      GtkStateFlags)
+ {
+   gtk_widget_queue_draw (self);
+ }
+@@ -422,7 +423,7 @@ gsm_color_button_released (GtkGestureClick*,
+       GtkColorChooserDialog *cc_dialog;
+       GtkWidget *parent;
+ 
+-      parent = gtk_widget_get_root (GTK_WIDGET (color_button));
+      parent = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (color_button)));
+ 
+       cc_dialog = GTK_COLOR_CHOOSER_DIALOG (gtk_color_chooser_dialog_new (priv->title, GTK_WINDOW (parent)));
+ 
+-- 
+2.43.0
+
--- a/SPECS/gnome-system-monitor.spec
+++ b/SPECS/gnome-system-monitor.spec
@ -1,27 +1,28 @@
+%global gtk4_version 4.12
+%global libadwaita_version 1.4.0
 %global libgtop2_version 2.37.2

 %global tarball_version %%(echo %{version} | tr '~' '.')

 Name:           gnome-system-monitor
-Version:        40.1
-Release:        3%{?dist}
+Version:        46~alpha
+Release:        2%{?dist}
 Summary:        Process and resource monitor

-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            https://wiki.gnome.org/Apps/SystemMonitor
-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
+Source0:        https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz
+# https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/merge_requests/121
+Patch:          gnome-system-monitor-46.alpha-pointer-type-error.patch

 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  meson
+BuildRequires:  pkgconfig(giomm-2.68)
+BuildRequires:  pkgconfig(gtk4) >= %{gtk4_version}
+BuildRequires:  pkgconfig(gtkmm-4.0)
+BuildRequires:  pkgconfig(libadwaita-1) >= %{libadwaita_version}
 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)
@ -30,6 +31,8 @@ BuildRequires:  gettext
 BuildRequires:  itstool

 Requires:       hicolor-icon-theme
+Requires:       gtk4%{?_isa} >= %{gtk4_version}
+Requires:       libadwaita%{?_isa} >= %{libadwaita_version}
 Requires:       libgtop2%{?_isa} >= %{libgtop2_version}

 %description
@ -50,14 +53,14 @@ such as CPU and memory.
 %find_lang %{name} --with-gnome

 %check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monitor.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.SystemMonitor.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monitor-kde.desktop

 %files -f %{name}.lang
 %license COPYING
 %doc AUTHORS NEWS README.md
 %{_bindir}/gnome-system-monitor
-%{_datadir}/applications/gnome-system-monitor.desktop
+%{_datadir}/applications/org.gnome.SystemMonitor.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
@ -65,25 +68,83 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit
 %{_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
+%{_metainfodir}/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)
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 46~alpha-2
+- Rebuilt for MSVSphere 10

-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.1-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 46~alpha-2
+- Bump release for June 2024 mass rebuild
+
+* Mon Jan 22 2024 David King <amigadave@amigadave.com> - 46~alpha-1
+- Update to 46.alpha
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Sep 19 2023 Kalev Lember <klember@redhat.com> - 45.0.2-1
+- Update to 45.0.2
+
+* Tue Sep 05 2023 Kalev Lember <klember@redhat.com> - 45.0.1-1
+- Update to 45.0.1
+
+* Thu Aug 17 2023 Kalev Lember <klember@redhat.com> - 45.0-1
+- Update to 45.0
+
+* Thu Aug 03 2023 Kalev Lember <klember@redhat.com> - 45~beta-1
+- Update to 45.beta
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 45~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 03 2023 Kalev Lember <klember@redhat.com> - 45~alpha-1
+- Update to 45.alpha
+
+* Sat Mar 18 2023 David King <amigadave@amigadave.com> - 44.0-1
+- Update to 44.0
+
+* Sat Mar 04 2023 David King <amigadave@amigadave.com> - 44~rc-1
+- Update to 44.rc
+
+* Thu Feb 16 2023 David King <amigadave@amigadave.com> - 44~beta-1
+- Update to 44.beta
+
+* Mon Feb 06 2023 Florian Weimer <fweimer@redhat.com> - 42.0-4
+- Fix C99 compatibility issue
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 42.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Mar 20 2022 David King <amigadave@amigadave.com> - 42.0-1
+- Update to 42.0
+
+* Tue Mar 08 2022 David King <amigadave@amigadave.com> - 42~rc-1
+- Update to 42.rc
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42~alpha-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sun Jan 09 2022 David King <amigadave@amigadave.com> - 42~alpha-1
+- Update to 42.alpha
+
+* Sat Sep 18 2021 Kalev Lember <klember@redhat.com> - 41.0-1
+- Update to 41.0
+
+* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 41~rc-1
+- Update to 41.rc
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * 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