commit db0d0b0b943e989e543de923e27de8b5afc32a59
Author: Jakub Bogusz <[email protected]>
Date: Thu Oct 3 19:22:42 2024 +0200
- updated to 47.0
gnome-system-monitor-no-c2x.patch | 131 --------------------------------------
gnome-system-monitor.spec | 26 ++++----
2 files changed, 12 insertions(+), 145 deletions(-)
---
diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index e2a0e9d..115ba24 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -1,33 +1,32 @@
#
# Conditional build:
%bcond_without systemd # systemd support
-%bcond_with wnck # wnck support, "this will likely make system-monitor
segfault"
#
Summary: Simple process monitor
Summary(pl.UTF-8): Prosty monitor procesów
Name: gnome-system-monitor
-Version: 46.0
+Version: 47.0
Release: 1
License: GPL v2+
Group: X11/Applications
-Source0:
https://download.gnome.org/sources/gnome-system-monitor/46/%{name}-%{version}.tar.xz
-# Source0-md5: d2c121f58825bf5a441f16f13b0d3201
+Source0:
https://download.gnome.org/sources/gnome-system-monitor/47/%{name}-%{version}.tar.xz
+# Source0-md5: ce34d9af4a922843400cc8823deb1176
Patch0: %{name}-no-update.patch
-Patch1: %{name}-no-c2x.patch
-URL: https://wiki.gnome.org/Apps/SystemMonitor
+URL: https://apps.gnome.org/SystemMonitor/
BuildRequires: atkmm-devel >= 2.28
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-tools >= 0.19.8
-BuildRequires: gcc >= 6:4.7
+# -std=c2x
+BuildRequires: gcc >= 6:11
BuildRequires: glib2-devel >= 1:2.56.0
BuildRequires: glibmm2.68-devel >= 2.68
BuildRequires: gtk4-devel >= 4.12.0
BuildRequires: gtkmm4-devel >= 4.0.0
-BuildRequires: libadwaita-devel >= 1.4.0
+BuildRequires: libadwaita-devel >= 1.6
BuildRequires: libgtop-devel >= 1:2.41.2
BuildRequires: librsvg-devel >= 2.46
+# -std=gnu++20
BuildRequires: libstdc++-devel >= 6:8
-%{?with_wnck:BuildRequires: libwnck-devel >= 3.0.0}
BuildRequires: libxml2-devel >= 1:2.6.31
BuildRequires: libxml2-progs
BuildRequires: meson >= 0.57.0
@@ -46,7 +45,7 @@ Requires: glibmm2.68 >= 2.68
Requires: gtk4 >= 4.12.0
Requires: gtkmm4 >= 4.0.0
Requires: hicolor-icon-theme
-Requires: libadwaita >= 1.4.0
+Requires: libadwaita >= 1.6
Requires: libgtop >= 1:2.41.2
Requires: librsvg >= 2.46
Obsoletes: procman < 1.1
@@ -61,12 +60,10 @@ GNOME System Monitor to prosty monitor procesów i systemu.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%meson build \
- %{!?with_systemd:-Dsystemd=false} \
- %{?with_wnck:-Dwnck=true}
+ %{!?with_systemd:-Dsystemd=false}
%ninja_build -C build
@@ -107,4 +104,5 @@ rm -rf $RPM_BUILD_ROOT
%{_iconsdir}/hicolor/scalable/apps/org.gnome.SystemMonitor.svg
%{_iconsdir}/hicolor/scalable/apps/org.gnome.SystemMonitor.Devel.svg
%{_iconsdir}/hicolor/symbolic/apps/org.gnome.SystemMonitor-symbolic.svg
-%{_iconsdir}/hicolor/symbolic/apps/speedometer-symbolic.svg
+%{_iconsdir}/hicolor/symbolic/apps/processes-symbolic.svg
+%{_iconsdir}/hicolor/symbolic/apps/resources-symbolic.svg
diff --git a/gnome-system-monitor-no-c2x.patch
b/gnome-system-monitor-no-c2x.patch
deleted file mode 100644
index a3c0c85..0000000
--- a/gnome-system-monitor-no-c2x.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- gnome-system-monitor-46.0/src/legacy/gsm_color_button.c.orig
2024-03-16 20:12:56.000000000 +0100
-+++ gnome-system-monitor-46.0/src/legacy/gsm_color_button.c 2024-06-30
22:37:19.727819121 +0200
-@@ -348,13 +348,13 @@ gsm_color_button_snapshot (GtkWidget *
- }
-
- static void
--gsm_color_button_measure (GtkWidget*,
-+gsm_color_button_measure (GtkWidget* w_ __attribute__((unused)),
- GtkOrientation orientation,
-- int,
-+ int i_ __attribute__((unused)),
- int *minimum,
- int *natural,
-- int*,
-- int*)
-+ int* ip1_ __attribute__((unused)),
-+ int* ip2_ __attribute__((unused)))
- {
- if (orientation & GTK_ORIENTATION_HORIZONTAL)
- {
-@@ -375,7 +375,7 @@ gsm_color_button_state_flags_changed (Gt
- }
-
- static void
--dialog_response (GtkDialog*,
-+dialog_response (GtkDialog* d_ __attribute__((unused)),
- gint response,
- GsmColorButton *color_button)
- {
-@@ -398,7 +398,7 @@ dialog_response (GtkDialog*,
- }
-
- static void
--dialog_destroy (GtkWidget*,
-+dialog_destroy (GtkWidget* w_ __attribute__((unused)),
- GsmColorButton *color_button)
- {
- GsmColorButtonPrivate *priv = gsm_color_button_get_instance_private
(color_button);
-@@ -407,10 +407,10 @@ dialog_destroy (GtkWidget*,
- }
-
- static void
--gsm_color_button_released (GtkGestureClick*,
-- gint,
-- gdouble,
-- gdouble,
-+gsm_color_button_released (GtkGestureClick* c_ __attribute__((unused)),
-+ gint i_ __attribute__((unused)),
-+ gdouble d1_ __attribute__((unused)),
-+ gdouble d2_ __attribute__((unused)),
- GsmColorButton *color_button)
- {
- GsmColorButtonPrivate *priv = gsm_color_button_get_instance_private
(color_button);
-@@ -444,10 +444,10 @@ gsm_color_button_released (GtkGestureCli
- }
-
- static gboolean
--gsm_color_button_drag_data_drop (GtkDropTarget*,
-+gsm_color_button_drag_data_drop (GtkDropTarget* t_ __attribute__((unused)),
- const GValue *value,
-- gdouble,
-- gdouble,
-+ gdouble d1_ __attribute__((unused)),
-+ gdouble d2_ __attribute__((unused)),
- GsmColorButton *color_button)
- {
- if (G_VALUE_HOLDS (value, GDK_TYPE_RGBA))
-@@ -460,7 +460,7 @@ gsm_color_button_drag_data_drop (GtkDrop
-
- static void
- gsm_color_button_drag_begin (GtkDragSource *drag_source,
-- GdkDrag*,
-+ GdkDrag* d_ __attribute__((unused)),
- GsmColorButton *color_button)
- {
- GsmColorButtonPrivate *priv = gsm_color_button_get_instance_private
(color_button);
-@@ -469,9 +469,9 @@ gsm_color_button_drag_begin (GtkDragSour
- }
-
- static GdkContentProvider *
--gsm_color_button_prepare (GtkDragSource*,
-- gdouble,
-- gdouble,
-+gsm_color_button_prepare (GtkDragSource* s_ __attribute__((unused)),
-+ gdouble d1_ __attribute__((unused)),
-+ gdouble d2_ __attribute__((unused)),
- GsmColorButton *color_button)
- {
- GsmColorButtonPrivate *priv = gsm_color_button_get_instance_private
(color_button);
---- gnome-system-monitor-46.0/src/legacy/treeview.c.orig 2024-03-16
20:12:56.000000000 +0100
-+++ gnome-system-monitor-46.0/src/legacy/treeview.c 2024-06-30
22:38:23.324141257 +0200
-@@ -122,8 +122,8 @@ gsm_tree_view_get_column_from_id (GsmTre
- }
-
- static void
--cb_column_header_clicked (GtkGestureClick*,
-- gint,
-+cb_column_header_clicked (GtkGestureClick* c_ __attribute__((unused)),
-+ gint i_ __attribute__((unused)),
- gdouble x,
- gdouble y,
- gpointer data)
-@@ -267,7 +267,7 @@ save_column_state (gpointer data)
-
- static void
- cb_update_column_state (GObject *object,
-- GParamSpec*,
-+ GParamSpec* s_ __attribute__((unused)),
- gpointer data)
- {
- GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (object);
---- gnome-system-monitor-46.0/src/gsm-graph.c.orig 2024-03-16
20:12:56.000000000 +0100
-+++ gnome-system-monitor-46.0/src/gsm-graph.c 2024-07-01 06:20:21.094056073
+0200
-@@ -52,7 +52,7 @@ G_DEFINE_TYPE_WITH_CODE (GsmGraph, gsm_g
-
- static void
- gsm_graph_css_changed (GtkWidget *widget,
-- GtkCssStyleChange*)
-+ GtkCssStyleChange* c_ __attribute__((unused)))
- {
- g_signal_emit (G_OBJECT (widget), signals[CSS_CHANGED], 0);
- }
-@@ -203,7 +203,7 @@ gsm_graph_finalize (GObject *self)
-
- static void
- _gsm_graph_state_flags_changed (GtkWidget *widget,
-- GtkStateFlags*,
-+ GtkStateFlags* f_ __attribute__((unused)),
- gpointer self)
- {
- GsmGraph *graph = GSM_GRAPH (self);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-system-monitor.git/commitdiff/db0d0b0b943e989e543de923e27de8b5afc32a59
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
