rpm/mate-system-monitor
SHA256
1
0
Fork 0
forked from pool/mate-system-monitor
Code Pull Requests Activity

Accepting request 376953 from X11:MATE:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/376953
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mate-system-monitor?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2016-03-26 14:25:44 +00:00 committed by Git OBS Bridge
commit 4e5c3f68bf
5 changed files with 71 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mate-system-monitor-1.12.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7668ecba70b7f56f3bcfb143cb6b93a15daf8636fcf678491112afea1a49dea9
size 2113756

3
mate-system-monitor-1.12.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78b91ae43fd0f06e0577d71d3b92b9c03ff2dc8809ba2b06dc0c4dc9e93683f5
size 2114504

49
mate-system-monitor-xdgsu.patch Normal file
View File

@ -0,0 +1,49 @@
--- 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);
}

12
mate-system-monitor.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 21 19:25:19 UTC 2016 - sor.alexei@meowr.ru
- 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.
-------------------------------------------------------------------
Mon Jan 11 15:30:48 UTC 2016 - sor.alexei@meowr.ru

10
mate-system-monitor.spec
View File

@ -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(libgtop-2.0)
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 @@ resources such as CPU and memory.
%prep
%setup -q
%patch0 -p1
%build
NOCONFIGURE=1 mate-autogen
%configure \
--disable-static \
--disable-scrollkeeper \