forked from pool/mate-system-monitor
Accepting request 913067 from X11:MATE:Next
- Update version to 1.26.0 * update translations * travis-Ci: use libera.chat as notification server * update copyright to 2021 * add wayland support * port to GtkApplication * Use GtkBuilder for preferences dialog * openfiles: g_memdup is dreprecated from glib 2.68 * smooth_refresh: comparison of unsigned expression in '< 0' is always false * gsm_color_button: macro "__GSM_COLOR_BUTTON_C__" is not used * proctable: Function 'proctable_free_table' used prior to declaration * i18n: use _() macro instead of gettext * i18n: Do not collect the translation for Icon * build: display package name and version in configure summary * build: Use PACKAGE_URL variable * procdialogs: Do not use deprecated gtk_image_new_from_stock * Show subvol mount option on GNU/Linux * sysinfo: avoid adding a device more than once such as for brtfs * pretty-table: prefer GIO to get application icons - Drop mate-system-monitor-glib-2.54.patch, no longer support glib 2.54 OBS-URL: https://build.opensuse.org/request/show/913067 OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/mate-system-monitor?expand=0&rev=47
This commit is contained in:
Hillwood Yang
Git OBS Bridge
parent
ddbdaf796f
commit
fde6811bf2
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:f7c39075f4c21ea3a3cd3e32d7924ad8432743dc9aed3c511a05a0a261f176d5
|
|
||||||
size 2429196
|
|
||||||
@ -1 +0,0 @@
|
|||||||
f7c39075f4c21ea3a3cd3e32d7924ad8432743dc9aed3c511a05a0a261f176d5 mate-system-monitor-1.24.2.tar.xz
|
|
||||||
3
mate-system-monitor-1.26.0.tar.xz
Normal file
3
mate-system-monitor-1.26.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:83472c3add79e52b2fb3c1bc55f33f968c71a2b90e2b62027ad688c1cecc338f
|
||||||
|
size 2472116
|
||||||
1
mate-system-monitor-1.26.0.tar.xz.sha256sum
Normal file
1
mate-system-monitor-1.26.0.tar.xz.sha256sum
Normal file
@ -0,0 +1 @@
|
|||||||
|
83472c3add79e52b2fb3c1bc55f33f968c71a2b90e2b62027ad688c1cecc338f mate-system-monitor-1.26.0.tar.xz
|
||||||
@ -1,126 +0,0 @@
|
|||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -29,7 +29,7 @@ LT_PREREQ([2.2])
|
|
||||||
LT_INIT
|
|
||||||
|
|
||||||
# Package dependencies
|
|
||||||
-GLIB_REQUIRED=2.56.0
|
|
||||||
+GLIB_REQUIRED=2.54.0
|
|
||||||
LIBGTOP_REQUIRED=2.37.2
|
|
||||||
GIOMM_REQUIRED=2.26.0
|
|
||||||
GLIBMM_REQUIRED=2.22
|
|
||||||
--- a/src/load-graph.cpp
|
|
||||||
+++ b/src/load-graph.cpp
|
|
||||||
@@ -136,7 +136,11 @@ static void draw_background(LoadGraph *g
|
|
||||||
if (graph->type == LOAD_GRAPH_NET) {
|
|
||||||
// operation orders matters so it's 0 if i == num_bars
|
|
||||||
guint64 rate = graph->net.max - (i * graph->net.max / num_bars);
|
|
||||||
+#if GLIB_CHECK_VERSION(2, 56, 0)
|
|
||||||
caption = g_format_size_full (network_in_bits ? rate*8 : rate, network_in_bits ? G_FORMAT_SIZE_BITS : G_FORMAT_SIZE_DEFAULT);
|
|
||||||
+#else
|
|
||||||
+ caption = g_format_size (rate);
|
|
||||||
+#endif
|
|
||||||
pango_layout_set_text (layout, caption, -1);
|
|
||||||
pango_layout_get_extents (layout, NULL, &extents);
|
|
||||||
cairo_move_to (cr, graph->indent - 1.0 * extents.width / PANGO_SCALE + 20, y - 1.0 * extents.height / PANGO_SCALE / 2);
|
|
||||||
@@ -588,18 +592,34 @@ get_net (LoadGraph *graph)
|
|
||||||
bool network_in_bits = ProcData::get_instance()->config.network_in_bits;
|
|
||||||
g_autofree gchar *str=NULL, *formatted_str=NULL;
|
|
||||||
|
|
||||||
+#if GLIB_CHECK_VERSION(2, 56, 0)
|
|
||||||
str = g_format_size_full (network_in_bits ? din*8 : din, network_in_bits ? G_FORMAT_SIZE_BITS : G_FORMAT_SIZE_DEFAULT);
|
|
||||||
+#else
|
|
||||||
+ str = g_format_size (din);
|
|
||||||
+#endif
|
|
||||||
formatted_str = g_strdup_printf(_("%s/s"), str);
|
|
||||||
gtk_label_set_text (GTK_LABEL (graph->labels.net_in), formatted_str);
|
|
||||||
|
|
||||||
+#if GLIB_CHECK_VERSION(2, 56, 0)
|
|
||||||
str = g_format_size_full (network_in_bits ? in*8 : in, network_in_bits ? G_FORMAT_SIZE_BITS : G_FORMAT_SIZE_DEFAULT);
|
|
||||||
+#else
|
|
||||||
+ str = g_format_size (in);
|
|
||||||
+#endif
|
|
||||||
gtk_label_set_text (GTK_LABEL (graph->labels.net_in_total), str);
|
|
||||||
|
|
||||||
+#if GLIB_CHECK_VERSION(2, 56, 0)
|
|
||||||
str = g_format_size_full (network_in_bits ? dout*8 : dout, network_in_bits ? G_FORMAT_SIZE_BITS : G_FORMAT_SIZE_DEFAULT);
|
|
||||||
+#else
|
|
||||||
+ str = g_format_size (dout);
|
|
||||||
+#endif
|
|
||||||
formatted_str = g_strdup_printf(_("%s/s"), str);
|
|
||||||
gtk_label_set_text (GTK_LABEL (graph->labels.net_out), formatted_str);
|
|
||||||
|
|
||||||
+#if GLIB_CHECK_VERSION(2, 56, 0)
|
|
||||||
str = g_format_size_full (network_in_bits ? out*8 : out, network_in_bits ? G_FORMAT_SIZE_BITS : G_FORMAT_SIZE_DEFAULT);
|
|
||||||
+#else
|
|
||||||
+ str = g_format_size (out);
|
|
||||||
+#endif
|
|
||||||
gtk_label_set_text (GTK_LABEL (graph->labels.net_out_total), str);
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/src/procdialogs.cpp
|
|
||||||
+++ b/src/procdialogs.cpp
|
|
||||||
@@ -283,6 +283,7 @@ solaris_mode_toggled(GtkToggleButton *bu
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+#if GLIB_CHECK_VERSION(2, 56, 0)
|
|
||||||
static void
|
|
||||||
network_in_bits_toggled(GtkToggleButton *button, gpointer data)
|
|
||||||
{
|
|
||||||
@@ -292,6 +293,7 @@ network_in_bits_toggled(GtkToggleButton
|
|
||||||
toggled = gtk_toggle_button_get_active(button);
|
|
||||||
g_settings_set_boolean(settings, procman::settings::network_in_bits.c_str(), toggled);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -709,6 +711,7 @@ procdialog_create_preferences_dialog (Pr
|
|
||||||
gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin_button);
|
|
||||||
|
|
||||||
|
|
||||||
+#if GLIB_CHECK_VERSION(2, 56, 0)
|
|
||||||
GtkWidget *bits_button;
|
|
||||||
bits_button = gtk_check_button_new_with_mnemonic(_("Show network speed in bits"));
|
|
||||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bits_button),
|
|
||||||
@@ -718,6 +721,7 @@ procdialog_create_preferences_dialog (Pr
|
|
||||||
g_signal_connect(G_OBJECT(bits_button), "toggled",
|
|
||||||
G_CALLBACK(network_in_bits_toggled), procdata);
|
|
||||||
gtk_box_pack_start(GTK_BOX(vbox2), bits_button, TRUE, TRUE, 0);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
--- a/src/procman.cpp
|
|
||||||
+++ b/src/procman.cpp
|
|
||||||
@@ -106,6 +106,7 @@ solaris_mode_changed_cb(GSettings *setti
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+#if GLIB_CHECK_VERSION(2, 56, 0)
|
|
||||||
static void
|
|
||||||
network_in_bits_changed_cb(GSettings *settings, const gchar *key, gpointer data)
|
|
||||||
{
|
|
||||||
@@ -114,6 +115,7 @@ network_in_bits_changed_cb(GSettings *se
|
|
||||||
procdata->config.network_in_bits = g_settings_get_boolean(settings, key);
|
|
||||||
procdata->net_graph->clear_background();
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -263,9 +265,13 @@ procman_data_new (GSettings *settings)
|
|
||||||
std::string detail_string("changed::" + procman::settings::solaris_mode);
|
|
||||||
g_signal_connect(G_OBJECT(settings), detail_string.c_str(), G_CALLBACK(solaris_mode_changed_cb), pd);
|
|
||||||
|
|
||||||
+#if GLIB_CHECK_VERSION(2, 56, 0)
|
|
||||||
pd->config.network_in_bits = g_settings_get_boolean(settings, procman::settings::network_in_bits.c_str());
|
|
||||||
detail_string = "changed::" + procman::settings::network_in_bits;
|
|
||||||
g_signal_connect(G_OBJECT(settings), detail_string.c_str(), G_CALLBACK(network_in_bits_changed_cb), pd);
|
|
||||||
+#else
|
|
||||||
+ pd->config.network_in_bits = FALSE;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
pd->config.show_kill_warning = g_settings_get_boolean (settings, "kill-dialog");
|
|
||||||
g_signal_connect (G_OBJECT(settings), "changed::kill-dialog", G_CALLBACK(warning_changed_cb), pd);
|
|
||||||
@ -1,3 +1,27 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Aug 12 08:28:50 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||||
|
|
||||||
|
- Update version to 1.26.0
|
||||||
|
* update translations
|
||||||
|
* travis-Ci: use libera.chat as notification server
|
||||||
|
* update copyright to 2021
|
||||||
|
* add wayland support
|
||||||
|
* port to GtkApplication
|
||||||
|
* Use GtkBuilder for preferences dialog
|
||||||
|
* openfiles: g_memdup is dreprecated from glib 2.68
|
||||||
|
* smooth_refresh: comparison of unsigned expression in '< 0' is always false
|
||||||
|
* gsm_color_button: macro "__GSM_COLOR_BUTTON_C__" is not used
|
||||||
|
* proctable: Function 'proctable_free_table' used prior to declaration
|
||||||
|
* i18n: use _() macro instead of gettext
|
||||||
|
* i18n: Do not collect the translation for Icon
|
||||||
|
* build: display package name and version in configure summary
|
||||||
|
* build: Use PACKAGE_URL variable
|
||||||
|
* procdialogs: Do not use deprecated gtk_image_new_from_stock
|
||||||
|
* Show subvol mount option on GNU/Linux
|
||||||
|
* sysinfo: avoid adding a device more than once such as for brtfs
|
||||||
|
* pretty-table: prefer GIO to get application icons
|
||||||
|
- Drop mate-system-monitor-glib-2.54.patch, no longer support glib 2.54
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 26 20:32:52 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
|
Mon Apr 26 20:32:52 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
|
||||||
|
|
||||||
|
|||||||
@ -16,19 +16,19 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define _version 1.24
|
%define _version 1.26
|
||||||
|
|
||||||
Name: mate-system-monitor
|
Name: mate-system-monitor
|
||||||
Version: 1.24.2
|
Version: 1.26.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: MATE Desktop system monitor
|
Summary: MATE Desktop system monitor
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
Group: System/Monitoring
|
||||||
URL: https://mate-desktop.org/
|
URL: https://mate-desktop.org/
|
||||||
Source0: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
|
Source0: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
|
||||||
Source99: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz.sha256sum
|
Source99: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz.sha256sum
|
||||||
# PATCH-FIX-OPENSUSE mate-system-monitor-xdgsu.patch sor.alexei@meowr.ru -- Use xdg-su instead of gksu.
|
# PATCH-FIX-OPENSUSE mate-system-monitor-xdgsu.patch sor.alexei@meowr.ru -- Use xdg-su instead of gksu.
|
||||||
Patch0: %{name}-xdgsu.patch
|
Patch0: %{name}-xdgsu.patch
|
||||||
# PATCH-FEATURE-OPENSUSE mate-system-monitor-glib-2.54.patch -- Restore GLib 2.54 support.
|
|
||||||
Patch1: %{name}-glib-2.54.patch
|
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: mate-common >= %{_version}
|
BuildRequires: mate-common >= %{_version}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user