Hello community,
here is the log from the commit of package mate-system-monitor for
openSUSE:Factory checked in at 2016-03-26 15:25:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.mate-system-monitor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-system-monitor"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-system-monitor/mate-system-monitor.changes
2016-01-12 16:14:02.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.mate-system-monitor.new/mate-system-monitor.changes
2016-03-26 15:25:48.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Mar 21 19:25:19 UTC 2016 - [email protected]
+
+- Update to version 1.12.2:
+ * Process table: Avoid expanding collapsed nodes on every refresh.
+ * Prefs dialog: Fix refresh rate not saving in some cases.
+ * Memmaps dialog: Fix unwanted autoscrolling to the top of list.
+ * Fix segfault on view mode change with process properties open.
+ * Some more fixes.
+- Add mate-system-monitor-xdgsu.patch: use xdg-su instead of gksu.
+- Require xdg-utils for privileging.
+
+-------------------------------------------------------------------
Old:
----
mate-system-monitor-1.12.1.tar.xz
New:
----
mate-system-monitor-1.12.2.tar.xz
mate-system-monitor-xdgsu.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-system-monitor.spec ++++++
--- /var/tmp/diff_new_pack.pLUlK5/_old 2016-03-26 15:25:49.000000000 +0100
+++ /var/tmp/diff_new_pack.pLUlK5/_new 2016-03-26 15:25:49.000000000 +0100
@@ -18,16 +18,17 @@
%define _version 1.12
Name: mate-system-monitor
-Version: 1.12.1
+Version: 1.12.2
Release: 0
Summary: MATE Desktop system monitor
License: GPL-2.0+
Group: System/GUI/Other
Url: http://mate-desktop.org/
-Source0:
http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
+Source:
http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE mate-system-monitor-xdgsu.patch -- Use xdg-su instead of
gksu.
+Patch0: %{name}-xdgsu.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
-BuildRequires: libgnomesu-devel
BuildRequires: libxml2-python
BuildRequires: mate-common >= %{_version}
BuildRequires: update-desktop-files
@@ -41,6 +42,7 @@
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libwnck-1.0)
BuildRequires: pkgconfig(libxml-2.0)
+Requires: xdg-utils
Recommends: %{name}-lang
%glib2_gsettings_schema_requires
%if 0%{?suse_version} > 1310
@@ -59,8 +61,10 @@
%prep
%setup -q
+%patch0 -p1
%build
+NOCONFIGURE=1 mate-autogen
%configure \
--disable-static \
--disable-scrollkeeper \
++++++ mate-system-monitor-1.12.1.tar.xz -> mate-system-monitor-1.12.2.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/ChangeLog
new/mate-system-monitor-1.12.2/ChangeLog
--- old/mate-system-monitor-1.12.1/ChangeLog 2015-11-30 10:37:23.000000000
+0100
+++ new/mate-system-monitor-1.12.2/ChangeLog 2016-03-21 14:47:19.000000000
+0100
@@ -1,6 +1,96 @@
+commit b13d0cfc7cc064ffc340431a829a3a415ad56845
+Author: monsta <[email protected]>
+Date: 2016-03-21
+
+ Release 1.12.2
+
+M NEWS
+M configure.ac
+
+commit dffd8927a2aed0cc1fe491aea2c7162abad0ae2d
+Author: monsta <[email protected]>
+Date: 2016-03-01
+
+ fix segfault on view mode change with process properties open
+
+ from
+
https://git.gnome.org/browse/gnome-system-monitor/commit/?id=76545e553c620d9b3437456bb4dbffa355c59816
+
+M src/openfiles.cpp
+M src/procproperties.cpp
+
+commit 359dade1fb01ca371eee6f5302cfa0704aa0ad2b
+Author: monsta <[email protected]>
+Date: 2016-02-29
+
+ fix copy-paste error, use proper type, keep it simple
+
+ - wrong function name introduced in
+
https://github.com/mate-desktop/mate-system-monitor/commit/9ae0be5ccf7df2f35c13653da97771b06cf6603f
+ - format_rate function already returns a string, no need to convert
+
+M src/util.cpp
+
+commit a4e189cf879812e66d08fd7dd3cf9544eda01fcc
+Author: monsta <[email protected]>
+Date: 2016-02-29
+
+ sysinfo: fix forgotten memleak
+
+M src/sysinfo.cpp
+
+commit 0094fb1aa5b80bf4e91a95f42d1cdf01302dc690
+Author: monsta <[email protected]>
+Date: 2016-02-29
+
+ process table: avoid expanding collapsed nodes on every refresh
+
+ from
+
https://git.gnome.org/browse/gnome-system-monitor/commit/?id=f7f4c5506bc47f7cd340ce02404029a0ca6185e0
+
+M src/proctable.cpp
+
+commit e6ebc74fdb77fff1db6af96cfae471fc26122800
+Author: monsta <[email protected]>
+Date: 2016-02-29
+
+ prefs dialog: fix refresh rate not saving in some cases
+
+ from
+
https://git.gnome.org/browse/gnome-system-monitor/commit/?id=abc1f5b47efa2dcd5f0e9c378283e9d9e6ac9fdf
+
+ cases are described in
+ https://bugzilla.gnome.org/show_bug.cgi?id=543315
+
+M src/procdialogs.cpp
+
+commit 9dd791b9bf46d155727cf07dddb25571a9a2cf75
+Author: monsta <[email protected]>
+Date: 2015-12-17
+
+ remove unneeded assert
+
+ we don't need to crash here, thanks.
+ the code below is able to handle excessive column ids just fine.
+
+ fixes https://github.com/mate-desktop/mate-system-monitor/issues/76
+
+M src/proctable.cpp
+
+commit d0d440c0524c358571b7cd260a3e4d39820504b1
+Author: monsta <[email protected]>
+Date: 2015-12-01
+
+ memmaps: kill stupid periodic autoscrolling to the top of list
+
+ from
+
https://git.gnome.org/browse/gnome-system-monitor/commit?id=ed696eba1438231e797774510a3449140f31fc9c
+
+M src/memmaps.cpp
+
commit fa98785c18186c91f99047e24e38f8843a73e673
Author: monsta <[email protected]>
-Date: 2015-11-30
+Date: 2015-11-30
Bump version to 1.12.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/NEWS
new/mate-system-monitor-1.12.2/NEWS
--- old/mate-system-monitor-1.12.1/NEWS 2015-11-30 10:35:20.000000000 +0100
+++ new/mate-system-monitor-1.12.2/NEWS 2016-03-21 14:07:46.000000000 +0100
@@ -1,3 +1,11 @@
+1.12.2
+
+ * Process table: avoid expanding collapsed nodes on every refresh
+ * Prefs dialog: fix refresh rate not saving in some cases
+ * Memmaps dialog: fix unwanted autoscrolling to the top of list
+ * Fix segfault on view mode change with process properties open
+ * Some more fixes
+
1.12.1
* Process table: delay saving column widths (avoids eating CPU
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/aclocal.m4
new/mate-system-monitor-1.12.2/aclocal.m4
--- old/mate-system-monitor-1.12.1/aclocal.m4 2015-11-30 10:36:34.000000000
+0100
+++ new/mate-system-monitor-1.12.2/aclocal.m4 2016-03-21 14:47:06.000000000
+0100
@@ -160,7 +160,7 @@
DISABLE_DEPRECATED=""
if test $USE_MAINTAINER_MODE = yes; then
- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATECONF MATECOMPONENT
MATECOMPONENT_UI MATE LIBGLADE VTE MATE_VFS WNCK LIBSOUP"
+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATE LIBGLADE VTE WNCK
LIBSOUP"
for DOMAIN in $DOMAINS; do
DISABLE_DEPRECATED="$DISABLE_DEPRECATED
-D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/configure
new/mate-system-monitor-1.12.2/configure
--- old/mate-system-monitor-1.12.1/configure 2015-11-30 10:36:35.000000000
+0100
+++ new/mate-system-monitor-1.12.2/configure 2016-03-21 14:47:07.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mate-system-monitor 1.12.1.
+# Generated by GNU Autoconf 2.69 for mate-system-monitor 1.12.2.
#
# Report bugs to <http://www.mate-desktop.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='mate-system-monitor'
PACKAGE_TARNAME='mate-system-monitor'
-PACKAGE_VERSION='1.12.1'
-PACKAGE_STRING='mate-system-monitor 1.12.1'
+PACKAGE_VERSION='1.12.2'
+PACKAGE_STRING='mate-system-monitor 1.12.2'
PACKAGE_BUGREPORT='http://www.mate-desktop.org/'
PACKAGE_URL=''
@@ -1405,7 +1405,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mate-system-monitor 1.12.1 to adapt to many kinds of
systems.
+\`configure' configures mate-system-monitor 1.12.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1476,7 +1476,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mate-system-monitor 1.12.1:";;
+ short | recursive ) echo "Configuration of mate-system-monitor 1.12.2:";;
esac
cat <<\_ACEOF
@@ -1616,7 +1616,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mate-system-monitor configure 1.12.1
+mate-system-monitor configure 1.12.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2082,7 +2082,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mate-system-monitor $as_me 1.12.1, which was
+It was created by mate-system-monitor $as_me 1.12.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2950,7 +2950,7 @@
# Define the identity of the package.
PACKAGE='mate-system-monitor'
- VERSION='1.12.1'
+ VERSION='1.12.2'
cat >>confdefs.h <<_ACEOF
@@ -3111,7 +3111,7 @@
DISABLE_DEPRECATED=""
if test $USE_MAINTAINER_MODE = yes; then
- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATECONF MATECOMPONENT
MATECOMPONENT_UI MATE LIBGLADE VTE MATE_VFS WNCK LIBSOUP"
+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATE LIBGLADE VTE WNCK
LIBSOUP"
for DOMAIN in $DOMAINS; do
DISABLE_DEPRECATED="$DISABLE_DEPRECATED
-D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
done
@@ -18020,7 +18020,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mate-system-monitor $as_me 1.12.1, which was
+This file was extended by mate-system-monitor $as_me 1.12.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18086,7 +18086,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mate-system-monitor config.status 1.12.1
+mate-system-monitor config.status 1.12.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/configure.ac
new/mate-system-monitor-1.12.2/configure.ac
--- old/mate-system-monitor-1.12.1/configure.ac 2015-11-30 10:27:15.000000000
+0100
+++ new/mate-system-monitor-1.12.2/configure.ac 2016-03-21 14:05:23.000000000
+0100
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
AC_INIT([mate-system-monitor],
- [1.12.1],
+ [1.12.2],
[http://www.mate-desktop.org/])
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_HEADERS(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-system-monitor-1.12.1/mate-system-monitor.desktop.in
new/mate-system-monitor-1.12.2/mate-system-monitor.desktop.in
--- old/mate-system-monitor-1.12.1/mate-system-monitor.desktop.in
2015-11-30 10:36:40.000000000 +0100
+++ new/mate-system-monitor-1.12.2/mate-system-monitor.desktop.in
2016-03-21 14:47:12.000000000 +0100
@@ -14,5 +14,5 @@
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=system-monitor
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.12.1
+X-MATE-Bugzilla-Version=1.12.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/src/memmaps.cpp
new/mate-system-monitor-1.12.2/src/memmaps.cpp
--- old/mate-system-monitor-1.12.1/src/memmaps.cpp 2015-09-25
13:36:19.000000000 +0200
+++ new/mate-system-monitor-1.12.2/src/memmaps.cpp 2016-03-21
14:05:12.000000000 +0100
@@ -187,7 +187,7 @@
bool operator()(const guint64 &start, const glibtop_map_entry &a) const
{
- return not (*this)(a, start);
+ return start < a.start;
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/src/openfiles.cpp
new/mate-system-monitor-1.12.2/src/openfiles.cpp
--- old/mate-system-monitor-1.12.1/src/openfiles.cpp 2015-11-30
10:24:07.000000000 +0100
+++ new/mate-system-monitor-1.12.2/src/openfiles.cpp 2016-03-21
14:05:12.000000000 +0100
@@ -174,7 +174,8 @@
GHashTable *new_maps;
guint i;
- info = static_cast<ProcInfo*>(g_object_get_data (G_OBJECT (tree),
"selected_info"));
+ pid_t pid = GPOINTER_TO_UINT(static_cast<pid_t*>(g_object_get_data
(G_OBJECT (tree), "selected_info")));
+ info = ProcInfo::find(pid);
if (!info)
return;
@@ -371,7 +372,7 @@
tree = create_openfiles_tree (procdata);
gtk_container_add (GTK_CONTAINER (scrolled), tree);
- g_object_set_data (G_OBJECT (tree), "selected_info", info);
+ g_object_set_data (G_OBJECT (tree), "selected_info", GUINT_TO_POINTER
(info->pid));
g_object_set_data (G_OBJECT (tree), "settings", procdata->settings);
gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolled, TRUE, TRUE, 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/src/procdialogs.cpp
new/mate-system-monitor-1.12.2/src/procdialogs.cpp
--- old/mate-system-monitor-1.12.1/src/procdialogs.cpp 2015-09-25
13:36:19.000000000 +0200
+++ new/mate-system-monitor-1.12.2/src/procdialogs.cpp 2016-03-21
14:05:12.000000000 +0100
@@ -343,6 +343,7 @@
static gboolean callback(GtkWidget *widget, GdkEventFocus *event, gpointer
data)
{
SpinButtonUpdater* updater = static_cast<SpinButtonUpdater*>(data);
+ gtk_spin_button_update(GTK_SPIN_BUTTON(widget));
updater->update(GTK_SPIN_BUTTON(widget));
return FALSE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/src/procproperties.cpp
new/mate-system-monitor-1.12.2/src/procproperties.cpp
--- old/mate-system-monitor-1.12.1/src/procproperties.cpp 2015-09-25
13:36:19.000000000 +0200
+++ new/mate-system-monitor-1.12.2/src/procproperties.cpp 2016-03-21
14:05:12.000000000 +0100
@@ -112,6 +112,9 @@
guint i;
GtkListStore *store;
+ if (!info)
+ return;
+
get_process_memory_info(info);
#if defined (__NetBSD__) || defined (__OpenBSD__)
@@ -167,10 +170,8 @@
{
ProcInfo *info;
- info = static_cast<ProcInfo*>(g_object_get_data (G_OBJECT (tree),
"selected_info"));
-
- if (!info)
- return;
+ pid_t pid = GPOINTER_TO_UINT(static_cast<pid_t*>(g_object_get_data
(G_OBJECT (tree), "selected_info")));
+ info = ProcInfo::find(pid);
fill_proc_properties(tree, info);
}
@@ -290,7 +291,7 @@
tree = create_procproperties_tree (procdata);
gtk_container_add (GTK_CONTAINER (scrolled), tree);
- g_object_set_data (G_OBJECT (tree), "selected_info", info);
+ g_object_set_data (G_OBJECT (tree), "selected_info", GUINT_TO_POINTER
(info->pid));
gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolled, TRUE, TRUE, 0);
gtk_widget_show_all (scrolled);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/src/proctable.cpp
new/mate-system-monitor-1.12.2/src/proctable.cpp
--- old/mate-system-monitor-1.12.1/src/proctable.cpp 2015-11-30
10:27:05.000000000 +0100
+++ new/mate-system-monitor-1.12.2/src/proctable.cpp 2016-03-21
14:05:12.000000000 +0100
@@ -146,8 +146,6 @@
id = GPOINTER_TO_INT(it->data);
- g_assert(id >= 0 && id < NUM_COLUMNS);
-
cur = my_gtk_tree_view_get_column_with_sort_column_id(treeview, id);
if(cur && cur != last)
@@ -1028,7 +1026,6 @@
if (procdata->config.show_tree)
{
selection.save(procdata->tree);
- proctable_clear_tree(procdata);
}
break;
@@ -1038,7 +1035,6 @@
if (procdata->config.show_tree)
{
selection.save(procdata->tree);
- proctable_clear_tree(procdata);
}
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/src/sysinfo.cpp
new/mate-system-monitor-1.12.2/src/sysinfo.cpp
--- old/mate-system-monitor-1.12.1/src/sysinfo.cpp 2015-10-06
15:30:05.000000000 +0200
+++ new/mate-system-monitor-1.12.2/src/sysinfo.cpp 2016-03-21
14:05:12.000000000 +0100
@@ -112,7 +112,10 @@
/* translators: This is the type of architecture, for example:
* "64-bit" or "32-bit" */
- return string(g_strdup_printf (_("%d-bit"), bits));
+ char* bytes = g_strdup_printf (_("%d-bit"), bits);
+ string retval(bytes);
+ g_free(bytes);
+ return retval;
}
typedef struct
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-system-monitor-1.12.1/src/util.cpp
new/mate-system-monitor-1.12.2/src/util.cpp
--- old/mate-system-monitor-1.12.1/src/util.cpp 2015-09-25 13:36:19.000000000
+0200
+++ new/mate-system-monitor-1.12.2/src/util.cpp 2016-03-21 14:05:12.000000000
+0100
@@ -597,10 +597,7 @@
std::string format_network_rate(guint64 rate, guint64 max_rate)
{
- char* bytes = procman::format_size(rate, max_rate,
ProcData::get_instance()->config.network_in_bits);
- std::string formatted(bytes);
- g_free(bytes);
- return formatted;
+ return procman::format_rate(rate, max_rate,
ProcData::get_instance()->config.network_in_bits);
}
}
++++++ mate-system-monitor-xdgsu.patch ++++++
--- a/src/procman_gksu.cpp
+++ b/src/procman_gksu.cpp
@@ -28,18 +28,20 @@ static void load_gksu(void)
gboolean procman_gksu_create_root_password_dialog(const char *command)
{
GError *e = NULL;
+ gchar *cmd;
- /* Returns FALSE or TRUE on success, depends on version ... */
- gksu_run(command, &e);
+ cmd = g_strdup_printf("xdg-su -c '%s'", command);
+ g_spawn_command_line_sync(cmd, NULL, NULL, NULL, &e);
+ g_free(cmd);
if (e) {
- g_critical("Could not run gksu_run(\"%s\") : %s\n",
+ g_critical("Could not run xdg-su -c '%s') : %s\n",
command, e->message);
g_error_free(e);
return FALSE;
}
- g_message("gksu_run did fine\n");
+ g_message("xdg-su did fine\n");
return TRUE;
}
@@ -48,7 +50,6 @@ gboolean procman_gksu_create_root_passwo
gboolean
procman_has_gksu(void)
{
- load_gksu();
- return gksu_run != NULL;
+ return g_file_test("/usr/bin/gksu", G_FILE_TEST_EXISTS);
}
--- a/src/procman_matesu.cpp
+++ b/src/procman_matesu.cpp
@@ -19,8 +19,8 @@ load_matesu(void)
init = TRUE;
- load_symbols("libmatesu.so.0",
- "matesu_exec", &matesu_exec,
+ load_symbols("libgnomesu.so.0",
+ "gnomesu_exec", &matesu_exec,
NULL);
}
