From ac130efcae951d9a7c24d20afa742eff1498128c Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 22 Jan 2024 18:24:35 +0000 Subject: [PATCH] Update to 46.alpha --- .gitignore | 1 + ...-monitor-46.alpha-pointer-type-error.patch | 36 +++++++++++++++++++ gnome-system-monitor.spec | 28 +++++++++------ sources | 2 +- 4 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 gnome-system-monitor-46.alpha-pointer-type-error.patch diff --git a/.gitignore b/.gitignore index 28b7796..6ee17e5 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,4 @@ gnome-system-monitor-2.28.1.tar.bz2 /gnome-system-monitor-45.0.tar.xz /gnome-system-monitor-45.0.1.tar.xz /gnome-system-monitor-45.0.2.tar.xz +/gnome-system-monitor-46.alpha.tar.xz diff --git a/gnome-system-monitor-46.alpha-pointer-type-error.patch b/gnome-system-monitor-46.alpha-pointer-type-error.patch new file mode 100644 index 0000000..83abffa --- /dev/null +++ b/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 +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 + diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index 5ba6e34..3c0fe3b 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -1,24 +1,28 @@ +%global gtk4_version 4.12 +%global libadwaita_version 1.4.0 %global libgtop2_version 2.37.2 -%global libhandy_version 1.5.0 %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-system-monitor -Version: 45.0.2 -Release: 2%{?dist} +Version: 46~alpha +Release: 1%{?dist} Summary: Process and resource monitor License: GPL-2.0-or-later URL: https://wiki.gnome.org/Apps/SystemMonitor -Source0: https://download.gnome.org/sources/%{name}/45/%{name}-%{tarball_version}.tar.xz +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) @@ -27,8 +31,9 @@ BuildRequires: gettext BuildRequires: itstool Requires: hicolor-icon-theme +Requires: gtk4%{?_isa} >= %{gtk4_version} +Requires: libadwaita%{?_isa} >= %{libhandy_version} Requires: libgtop2%{?_isa} >= %{libgtop2_version} -Requires: libhandy%{?_isa} >= %{libhandy_version} %description gnome-system-monitor allows to graphically view and manipulate the running @@ -48,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 @@ -68,6 +73,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit %{_libexecdir}/gnome-system-monitor/ %changelog +* Mon Jan 22 2024 David King - 46~alpha-1 +- Update to 46.alpha + * Fri Jan 19 2024 Fedora Release Engineering - 45.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 2d903b8..6ce2a58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-system-monitor-45.0.2.tar.xz) = 60c65a4e035d82bdae98622ed113ba26b45491c7e31358a138a6e4029a08448671190bf8eaf9bb1d30468a4cc00de7565ac25f0b93ac9c3ecee2fcb0515c62f7 +SHA512 (gnome-system-monitor-46.alpha.tar.xz) = 0011af1bfa4912f29b4415d85791e0d32a35ec6e91b17d6d78378676420232e230b8bf51ad9d768ac20875e78c08c4f30da40275a78580d47abf99b332f35064