forked from pool/mate-system-monitor
- Update to version 1.14.0.
OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/mate-system-monitor?expand=0&rev=21
This commit is contained in:
Alexei Sorokin
Git OBS Bridge
parent
a494d840f5
commit
ee76da53af
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:78b91ae43fd0f06e0577d71d3b92b9c03ff2dc8809ba2b06dc0c4dc9e93683f5
|
||||
size 2114504
|
||||
3
mate-system-monitor-1.14.0.tar.xz
Normal file
3
mate-system-monitor-1.14.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ccd7f52836af22d18138e516335ee259448749b6618327feb908ad396d0c650a
|
||||
size 2135464
|
||||
28
mate-system-monitor-gtk3.10.patch
Normal file
28
mate-system-monitor-gtk3.10.patch
Normal file
@ -0,0 +1,28 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -32,7 +32,7 @@ GLIB_REQUIRED=2.36.0
|
||||
LIBGTOP_REQUIRED=2.23.1
|
||||
GIOMM_REQUIRED=2.26.0
|
||||
GLIBMM_REQUIRED=2.22
|
||||
-GTK_REQUIRED=3.14.0
|
||||
+GTK_REQUIRED=3.10.0
|
||||
GTKMM_REQUIRED=3.8.1
|
||||
LIBWNCK_REQUIRED=3.0.0
|
||||
LIBXML_REQUIRED=2.0
|
||||
--- a/src/sysinfo.cpp
|
||||
+++ b/src/sysinfo.cpp
|
||||
@@ -767,10 +767,14 @@ procman_create_sysinfo_view(void)
|
||||
logo = gtk_image_new_from_file(DATADIR "/pixmaps/mate-system-monitor/side.png");
|
||||
}
|
||||
gtk_widget_set_valign (logo, GTK_ALIGN_START);
|
||||
+#if GTK_CHECK_VERSION (3, 12, 0)
|
||||
gtk_widget_set_margin_start (logo, 5);
|
||||
gtk_widget_set_margin_end (logo, 5);
|
||||
gtk_widget_set_margin_top (logo, 12);
|
||||
gtk_widget_set_margin_bottom (logo, 12);
|
||||
+#else
|
||||
+ gtk_misc_set_padding (GTK_MISC(logo), 5, 12);
|
||||
+#endif
|
||||
gtk_box_pack_start(GTK_BOX(hbox), logo, FALSE, FALSE, 0);
|
||||
|
||||
g_signal_connect(G_OBJECT(logo), "draw", G_CALLBACK(sysinfo_logo_draw), NULL);
|
||||
@ -1,49 +1,24 @@
|
||||
--- 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;
|
||||
@@ -10,18 +10,18 @@ procman_gksu_create_root_password_dialog
|
||||
gboolean success;
|
||||
GError *error = NULL;
|
||||
|
||||
- /* 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);
|
||||
- command_line = g_strdup_printf ("gksu '%s'", command);
|
||||
+ command_line = g_strdup_printf ("xdg-su -c '%s'", command);
|
||||
success = g_spawn_command_line_sync (command_line, NULL, NULL, NULL, &error);
|
||||
g_free (command_line);
|
||||
|
||||
if (e) {
|
||||
- g_critical("Could not run gksu_run(\"%s\") : %s\n",
|
||||
if (!success) {
|
||||
- g_critical ("Could not run gksu '%s' : %s\n",
|
||||
+ g_critical ("Could not run xdg-su -c '%s') : %s\n",
|
||||
command, e->message);
|
||||
g_error_free(e);
|
||||
command, error->message);
|
||||
g_error_free (error);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- g_message("gksu_run did fine\n");
|
||||
+ g_message("xdg-su did fine\n");
|
||||
- g_debug ("gksu did fine\n");
|
||||
+ g_debug ("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);
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,31 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 9 11:24:53 UTC 2016 - sor.alexei@meowr.ru
|
||||
|
||||
- Update to version 1.14.0 (changes since 1.12.2):
|
||||
* Move to GTK+3, drop GTK+2 code and --with-gtk build option.
|
||||
* Set minimum required GTK+ version to 3.14, drop some deprecated
|
||||
code.
|
||||
* Run gksu binary instead of loading libgksu2.so (which is GTK+2
|
||||
only).
|
||||
* Drop MateConf migration script.
|
||||
* Main window: Save maximised state in gsettings on exit and load
|
||||
it on startup.
|
||||
* Disks: Add saving and loading width and visibility of columns.
|
||||
* Process properties: Show cgroups.
|
||||
* Process properties: Show N/A when cgroups or selinux isn't set.
|
||||
* Process table: Show running state when CPU time changes.
|
||||
* Change graph grid line colours and pattern.
|
||||
* Draw the background of graphs explicitly to avoid issues with
|
||||
GTK+ 3.20.
|
||||
* Fix incorrect icons for some known applications like marco or
|
||||
vino.
|
||||
* Some more fixes and cleanups.
|
||||
* Update translations.
|
||||
* Fix Changelog generation.
|
||||
- Rebase mate-system-monitor-xdgsu.patch.
|
||||
- Add mate-system-monitor-gtk3.10.patch: add support for Gtk 3.10
|
||||
(SLE 12 and openSUSE 13.1).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 21 19:25:19 UTC 2016 - sor.alexei@meowr.ru
|
||||
|
||||
|
||||
@ -16,17 +16,19 @@
|
||||
#
|
||||
|
||||
|
||||
%define _version 1.12
|
||||
%define _version 1.14
|
||||
Name: mate-system-monitor
|
||||
Version: 1.12.2
|
||||
Version: 1.14.0
|
||||
Release: 0
|
||||
Summary: MATE Desktop system monitor
|
||||
License: GPL-2.0+
|
||||
Group: System/GUI/Other
|
||||
Url: http://mate-desktop.org/
|
||||
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.
|
||||
# PATCH-FIX-OPENSUSE mate-system-monitor-xdgsu.patch sor.alexei@meowr.ru -- Use xdg-su instead of gksu.
|
||||
Patch0: %{name}-xdgsu.patch
|
||||
# PATCH-FIX-OPENSUSE mate-system-monitor-gtk3.10.patch sor.alexei@meowr.ru
|
||||
Patch1: %{name}-gtk3.10.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libxml2-python
|
||||
@ -36,11 +38,11 @@ BuildRequires: yelp-tools
|
||||
BuildRequires: pkgconfig(dbus-glib-1)
|
||||
BuildRequires: pkgconfig(dconf)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(gtkmm-2.4)
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.10
|
||||
BuildRequires: pkgconfig(gtkmm-3.0)
|
||||
BuildRequires: pkgconfig(libgtop-2.0)
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
BuildRequires: pkgconfig(libwnck-1.0)
|
||||
BuildRequires: pkgconfig(libwnck-3.0)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
Requires: xdg-utils
|
||||
Recommends: %{name}-lang
|
||||
@ -62,6 +64,7 @@ resources such as CPU and memory.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
NOCONFIGURE=1 mate-autogen
|
||||
@ -78,10 +81,6 @@ make %{?_smp_mflags}
|
||||
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
%fdupes %{buildroot}%{_datadir}/
|
||||
|
||||
if [ -d %{buildroot}%{_datadir}/MateConf/ ]; then
|
||||
rm -rf %{buildroot}%{_datadir}/MateConf/
|
||||
fi
|
||||
|
||||
%post
|
||||
%desktop_database_post
|
||||
%glib2_gsettings_schema_post
|
||||
|
||||
Loading…
Reference in New Issue
Block a user