1
0
Alexei Sorokin 2020-02-29 11:56:51 +00:00 committed by Git OBS Bridge
parent 444a9cf553
commit 79d7253464
5 changed files with 44 additions and 67 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75b1dd52b1146568a59f187e08639144c5a3835d39510321dbf134ab0bd4017a
size 2202544

View File

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

View File

@ -1,43 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -28,11 +28,11 @@ LT_PREREQ([2.2])
LT_INIT
# Package dependencies
-GLIB_REQUIRED=2.50.0
+GLIB_REQUIRED=2.48.0
LIBGTOP_REQUIRED=2.23.1
GIOMM_REQUIRED=2.26.0
GLIBMM_REQUIRED=2.22
-GTK_REQUIRED=3.22.0
+GTK_REQUIRED=3.20.0
GTKMM_REQUIRED=3.8.1
LIBWNCK_REQUIRED=3.0.0
LIBXML_REQUIRED=2.0
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -758,7 +758,24 @@ create_main_window (ProcData *procdata)
void
do_popup_menu (ProcData *procdata, GdkEventButton *event)
{
+#if GTK_CHECK_VERSION (3, 22, 0)
gtk_menu_popup_at_pointer (GTK_MENU (procdata->popup_menu), NULL);
+#else
+ guint button;
+ guint32 event_time;
+
+ if (event != NULL) {
+ button = event->button;
+ event_time = event->time;
+ } else {
+ button = 0;
+ event_time = GDK_CURRENT_TIME;
+ }
+
+ gtk_menu_popup (GTK_MENU (procdata->popup_menu),
+ NULL, NULL, NULL, NULL,
+ button, event_time);
+#endif
}
void

View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Wed Feb 26 19:38:40 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
- 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.
-------------------------------------------------------------------
Sun May 12 18:13:56 UTC 2019 - Alexei Sorokin <sor.alexei@meowr.ru>

View File

@ -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,28 @@
#
%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 sor.alexei@meowr.ru -- 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
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 +65,7 @@ NOCONFIGURE=1 mate-autogen
--disable-scrollkeeper \
--libexecdir=%{_libexecdir}/%{name} \
--enable-systemd
make %{?_smp_mflags} V=1
%make_build
%install
%make_install
@ -76,16 +73,6 @@ make %{?_smp_mflags} V=1
%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