From: @myshow2258
Reviewed-by: @dou33
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2021-01-26 09:55:39 +08:00 committed by Gitee
commit 5d9131054c
4 changed files with 49 additions and 5 deletions

View File

@ -0,0 +1,35 @@
diff -ur ukui-settings-daemon-3.0.1/plugins/media-keys/usd-media-keys-manager.c ukui-settings-daemon-3.0.1~/plugins/media-keys/usd-media-keys-manager.c
--- ukui-settings-daemon-3.0.1/plugins/media-keys/usd-media-keys-manager.c 2019-05-27 15:48:18.000000000 +0800
+++ ukui-settings-daemon-3.0.1~/plugins/media-keys/usd-media-keys-manager.c 2020-10-30 14:36:42.336523345 +0800
@@ -995,19 +994,19 @@
static void
do_screenshot_action (UsdMediaKeysManager *manager)
{
- execute (manager, "mate-screenshot",FALSE,FALSE);
+ //execute (manager, "mate-screenshot",FALSE,FALSE);
}
static void
do_area_screenshot_action (UsdMediaKeysManager *manager)
{
- execute (manager, "mate-screenshot -a",FALSE,FALSE);
+ //execute (manager, "mate-screenshot -a",FALSE,FALSE);
}
static void
do_window_screenshot_action (UsdMediaKeysManager *manager)
{
- execute (manager, "mate-screenshot -w",FALSE,FALSE);
+ //execute (manager, "mate-screenshot -w",FALSE,FALSE);
}
@@ -1052,7 +1051,7 @@
} else if ((cmd = g_find_program_in_path ("tracker-search-tool"))) {
execute (manager, "tracker-search-tool", FALSE, FALSE);
} else {
- execute (manager, "mate-search-tool", FALSE, FALSE);
+ //execute (manager, "mate-search-tool", FALSE, FALSE);
}
g_free (cmd);
break;

Binary file not shown.

Binary file not shown.

View File

@ -1,19 +1,21 @@
%define debug_package %{nil}
Name: ukui-settings-daemon
Version: 1.2.1
Version: 3.0.1
Release: 1
Summary: daemon handling the UKUI session settings
License: GPL-2.0, GPL-2+, GPL-2.1, LGPL-2.1+, GPL-3+, LGPL-2+, MIT~OldStyleWithDisclaimer+RedHat, MIT~OldStyle+RedHat
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
BuildRequires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils
patch0: 0001-fix-dependency-issue.patch
BuildRequires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils libusb-devel
#x11proto-kb-devel
BuildRequires:mate-desktop-devel >= 1.18
BuildRequires:libmatekbd-devel >= 1.18
BuildRequires:libmatemixer-devel >= 1.18
BuildRequires:mate-common >= 1.18
Requires: mate-desktop-libs ukui-polkit ukui-settings-daemon-common
Requires: mate-desktop-libs ukui-polkit ukui-settings-daemon-common imwheel xorg-x11-drv-synaptics-legacy
%description
This package contains the daemon which is responsible for setting the
@ -80,8 +82,7 @@ Requires: ukui-settings-daemon
%prep
%setup -q
echo $RPM_BUILD_ROOT
echo %{buildroot}
%patch0 -p1
%build
./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --sysconfdir=/etc
@ -93,12 +94,17 @@ make install DESTDIR=%{buildroot}
%clean
rm -rf $RPM_BUILD_ROOT
%post
set -e
glib-compile-schemas /usr/share/glib-2.0/schemas/
%files
%{_sysconfdir}/*
%{_prefix}/%{_lib}/ukui-settings-daemon/
%{_libexecdir}/ukui-settings-daemon
%{_libexecdir}/usd-datetime-mechanism
%{_libexecdir}/usd-locate-pointer
%{_libexecdir}/usd-usb-monitor
%{_datadir}/dbus-1/*
%{_datadir}/polkit-1/
@ -116,5 +122,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.1-1
- update to upstream version 3.0.0-1+1026
* Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 1.2.1-1
- Init package for openEuler