Hello community,
here is the log from the commit of package mate-system-monitor for
openSUSE:Factory checked in at 2020-03-03 10:17:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.mate-system-monitor.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-system-monitor"
Tue Mar 3 10:17:01 2020 rev:20 rq:780540 version:1.24.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-system-monitor/mate-system-monitor.changes
2019-05-24 11:30:03.869426874 +0200
+++
/work/SRC/openSUSE:Factory/.mate-system-monitor.new.26092/mate-system-monitor.changes
2020-03-03 10:18:08.990887411 +0100
@@ -1,0 +2,35 @@
+Wed Feb 26 19:38:40 UTC 2020 - Alexei Sorokin <[email protected]>
+
+- Update to version 1.24.0 (changes since 1.22.1):
+ * Network History: Fix labels.
+ * Show GPU info on the System tab.
+ * Use g_format_size or g_format_size_full.
+ * Update some instructions after review.
+ * Update help with more information and some corrections.
+ * gsm_color_button: Avoid redundant redeclarations.
+ * Add translator notes for desktop file.
+ * Migrate from intltool to gettext.
+ * Use MATE_DEBUG_CHECK for setting compiler debug flags.
+ * Use MATE_COMPILE_WARNINGS and MATE_CXX_WARNINGS macros.
+ * Require GLib >= 2.56.0.
+ * Render icons as cairo surfaces for HiDPI support.
+ * Change url project's website.
+ * proctable: cppcheck: Local variable "column" shadows outer
+ variable.
+ * Add drive I/O info on usage and prefs section.
+ * Make SysInfo::get_os_type a static function.
+ * msm_execute_helper: Fix memory leak.
+ * sysinfo: Condition "markup" is always false.
+ * procman: Use G_VARIANT_TYPE ("ai") instead of
+ G_VARIANT_TYPE_ARRAY.
+ * smooth_refresh: Assigned value is garbage or undefined.
+ * Add drive IO on process info.
+ * filter-out conflictive c-format comments.
+ * Fix "msgstr" is not a valid C format string, unlike "msgid".
+ * Update translations.
+- Drop support for old openSUSE versions.
+- Remove mate-system-monitor-gtk-3.20.patch.
+- Add mate-system-monitor-glib-2.54.patch: Restore GLib 2.54
+ support.
+
+-------------------------------------------------------------------
Old:
----
mate-system-monitor-1.22.1.tar.xz
mate-system-monitor-gtk-3.20.patch
New:
----
mate-system-monitor-1.24.0.tar.xz
mate-system-monitor-glib-2.54.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-system-monitor.spec ++++++
--- /var/tmp/diff_new_pack.lzFW4s/_old 2020-03-03 10:18:09.806889100 +0100
+++ /var/tmp/diff_new_pack.lzFW4s/_new 2020-03-03 10:18:09.806889100 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mate-system-monitor
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,31 +16,30 @@
#
-%define _version 1.22
+%define _version 1.24
Name: mate-system-monitor
-Version: 1.22.1
+Version: 1.24.0
Release: 0
Summary: MATE Desktop system monitor
License: GPL-2.0-or-later
-Group: System/GUI/Other
URL: https://mate-desktop.org/
Source:
https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE mate-system-monitor-xdgsu.patch [email protected] --
Use xdg-su instead of gksu.
-Patch0: mate-system-monitor-xdgsu.patch
-# PATCH-FEATURE-OPENSUSE mate-system-monitor-gtk-3.20.patch -- Restore GLib
2.48 and GTK+ 3.20 support.
-Patch1: mate-system-monitor-gtk-3.20.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: gcc-c++
BuildRequires: mate-common >= %{_version}
BuildRequires: pkgconfig
-BuildRequires: polkit
+BuildRequires: polkit-devel
BuildRequires: update-desktop-files
BuildRequires: yelp-tools
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(dconf)
-BuildRequires: pkgconfig(glib-2.0) >= 2.48
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.20
-BuildRequires: pkgconfig(gtkmm-3.0) >= 3.20
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gtkmm-3.0)
BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libsystemd)
@@ -68,7 +67,7 @@
--disable-scrollkeeper \
--libexecdir=%{_libexecdir}/%{name} \
--enable-systemd
-make %{?_smp_mflags} V=1
+%make_build
%install
%make_install
@@ -76,16 +75,6 @@
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop
%fdupes %{buildroot}%{_datadir}/
-%if 0%{?suse_version} < 1500
-%post
-%desktop_database_post
-%glib2_gsettings_schema_post
-
-%postun
-%desktop_database_postun
-%glib2_gsettings_schema_postun
-%endif
-
%files
%license COPYING
%doc AUTHORS NEWS
++++++ mate-system-monitor-1.22.1.tar.xz -> mate-system-monitor-1.24.0.tar.xz
++++++
++++ 532044 lines of diff (skipped)
++++++ mate-system-monitor-glib-2.54.patch ++++++
--- 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);
