packages/ukui-settings-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update version to 3.1.2

Browse Source
This commit is contained in:
peijiankang 2022-12-05 17:42:05 +08:00
parent 38d7124c6e
commit 71466c3c46
8 changed files with 86 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-fix-dependency-issue.patch
View File

@ -1,35 +0,0 @@
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;

24
0001-modify-compile-error-of-ukui-settings-daemon.patch Normal file
View File

@ -0,0 +1,24 @@
From c7a8d75f452b33af86290c0c906c7cd00b5fcc61 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Mon, 31 Oct 2022 17:39:28 +0800
Subject: [PATCH] modify compile error of ukui-settings-daemon
---
translate_generation.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/translate_generation.sh b/translate_generation.sh
index d24c183..7fcb6b7 100755
--- a/translate_generation.sh
+++ b/translate_generation.sh
@@ -10,6 +10,6 @@ do
if [ "$version" == "fedora" ] || [ "$version" == "opensuse-tumbleweed" ] || [ "$version" == "opensuse-leap" ];then
lrelease-qt5 "${ts}"
else
- lrelease "${ts}"
+ lrelease-qt5 "${ts}"
fi
done
--
2.36.1

41
0002-Modify-the-shortcut-key-prompt.patch
View File

@ -1,41 +0,0 @@
From c3c66c32b0fd14f1b565f94cc131667578f64bff Mon Sep 17 00:00:00 2001
From: root <huayadong@kylinos.cn>
Date: Thu, 16 Dec 2021 19:56:41 +0800
Subject: [PATCH] Modify the shortcut key prompt
---
.../org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in | 2 +-
po/zh_CN.po | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in b/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in
index ddc2a0f..ab947c6 100755
--- a/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in
+++ b/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in
@@ -47,7 +47,7 @@
</key>
<key name="logout" type="s">
<default>'&lt;Control&gt;&lt;Alt&gt;Delete'</default>
- <summary>Log out</summary>
+ <summary>Open the shutdown management interfac</summary>
<description>Binding to log out.</description>
</key>
<key name="eject" type="s">
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d94aa3d..1d01c69 100755
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -468,8 +468,8 @@ msgid "Binding to shut down."
msgstr "конец связи"
#: ../data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:19
-msgid "Log out"
-msgstr "注销"
+msgid "Open the shutdown management interfac"
+msgstr "打开关机管理界面"
#: ../data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:20
msgid "Binding to log out."
--
2.30.0

25
0003-remove-depend-xserver-xorg-input-synaptics-on-s390x.patch
View File

@ -1,25 +0,0 @@
From 1820a7ccc55b03c3629b446eb19f55e75962982c Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Thu, 4 Aug 2022 11:37:51 +0800
Subject: [PATCH] don't depend xserver-xorg-input-synaptics on s390x
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index c98dea1..85ea207 100755
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Depends: mate-desktop-common,
imwheel,
ukui-settings-daemon-common (= ${source:Version}),
x11-xserver-utils,
- xserver-xorg-input-synaptics,
+ xserver-xorg-input-synaptics [!s390x],
${misc:Depends},
${shlibs:Depends},
Description: daemon handling the UKUI session settings
--
2.33.0

25
0004-update-Copyright-and-Authors-information.patch
View File

@ -1,25 +0,0 @@
From b723b35f4fbb181b5c6bb7c2e861682d61153cd8 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Mon, 8 Aug 2022 10:52:50 +0800
Subject: [PATCH] update Copyright and Authors information
---
plugins/background/background.ukui-settings-plugin.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/background/background.ukui-settings-plugin.in b/plugins/background/background.ukui-settings-plugin.in
index 160044b..6ba2774 100755
--- a/plugins/background/background.ukui-settings-plugin.in
+++ b/plugins/background/background.ukui-settings-plugin.in
@@ -3,6 +3,6 @@ Module=background
IAge=0
_Name=Background
_Description=Background plugin
-Authors=
-Copyright=Copyright © 2007
+Authors= KylinSoft
+Copyright=Copyright © 2022
Website=
--
2.33.0

BIN
ukui-settings-daemon-3.0.1.tar.gz
View File

Binary file not shown.

BIN
ukui-settings-daemon-3.1.2.tar.gz Normal file
View File

Binary file not shown.

117
ukui-settings-daemon.spec
View File

@ -1,25 +1,52 @@
%define debug_package %{nil}
Name: ukui-settings-daemon
Version: 3.0.1
Release: 7
Version: 3.1.2
Release: 1
Summary: daemon handling the UKUI session settings
License: GPL-2.0-or-later and GPL-3.0-or-later and LGPL-2.0-or-later
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch1: 0001-modify-compile-error-of-ukui-settings-daemon.patch
patch0: 0001-fix-dependency-issue.patch
patch1: 0002-Modify-the-shortcut-key-prompt.patch
patch2: 0003-remove-depend-xserver-xorg-input-synaptics-on-s390x.patch
patch3: 0004-update-Copyright-and-Authors-information.patch
BuildRequires: pkgconf-pkg-config
BuildRequires: intltool
BuildRequires: qtchooser
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qttools-devel
BuildRequires: gsettings-qt-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtsensors-devel
BuildRequires: kf5-kconfig-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: libxklavier-devel
BuildRequires: libXtst-devel
BuildRequires: mate-desktop-devel
BuildRequires: gnome-desktop3-devel
BuildRequires: libmatemixer-devel
BuildRequires: libmatekbd-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libwnck3-devel
BuildRequires: libcanberra-devel
BuildRequires: libwayland-client
BuildRequires: libnotify-devel
BuildRequires: geoclue2-devel
BuildRequires: colord-devel
BuildRequires: lcms2-devel
BuildRequires: imlib2-devel
BuildRequires: xorg-x11-server-devel
BuildRequires: libgudev-devel
BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
BuildRequires: libX11-devel
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: libkscreen-qt5-devel
BuildRequires: libxkbcommon-devel
BuildRequires: kf5-kglobalaccel-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: ukui-interface
BuildRequires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-libs-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 imwheel xorg-x11-drv-synaptics-legacy
Requires: mate-desktop-libs ukui-settings-daemon-common colord imwheel ukui-polkit x11-xserver-utils xorg-x11-drv-synaptics-legacy glib2-devel
%description
This package contains the daemon which is responsible for setting the
various parameters of a UKUI session and the applications that run
@ -38,7 +65,6 @@ Requires: mate-desktop-libs ukui-polkit ukui-settings-daemon-common imwheel xorg
%package common
Summary: daemon handling the UKUI session settings (common files)
Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-libs-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils mate-desktop-devel libmatekbd-devel libmatemixer-devel mate-common
%description common
This package contains the daemon which is responsible for setting the
@ -58,44 +84,23 @@ Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-deve
.
This package contains the architecture independent files.
%package devel
Summary: daemon handling the UKUI session settings (development files)
Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-libs-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils mate-desktop-devel libmatekbd-devel libmatemixer-devel mate-common
Requires: ukui-settings-daemon
%description devel
This package contains the daemon which is responsible for setting the
various parameters of a UKUI session and the applications that run
under it. It handles the following kinds of settings:
.
* Keyboard: layout, accessibility options, shortcuts, media keys
* Clipboard management
* Theming: background, icons, GTK+ applications
* Cleanup of unused files
* Mouse: cursors, speed, accessibility options
* Startup of other daemons: screensaver, sound daemon
* Typing break
.
It also sets various application settings through X resources and
freedesktop.org XSETTINGS.
.
This package contains the development files for building
ukui-settings-daemon plugins.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --sysconfdir=/etc
make
qmake-qt5
make -j32
%install
make install DESTDIR=%{buildroot}
make INSTALL_ROOT=%{buildroot} install
mkdir -p %{buildroot}/usr/share/man/man1
mkdir -p %{buildroot}/usr/share/man/man2
gzip -c %{_builddir}/%{name}-%{version}/man/touchpad-state.1 > %{buildroot}/usr/share/man/man1/touchpad-state.1.gz
gzip -c %{_builddir}/%{name}-%{version}/man/ukui-settings-daemon.1 > %{buildroot}/usr/share/man/man1/ukui-settings-daemon.1.gz
gzip -c %{_builddir}/%{name}-%{version}/man/usd-locate-pointer.1 > %{buildroot}/usr/share/man/man1/usd-locate-pointer.1.gz
%clean
rm -rf $RPM_BUILD_ROOT
@ -105,29 +110,31 @@ set -e &> /dev/null || :
glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null || :
%files
%doc debian/changelog debian/copyright
%{_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/
/lib/udev/rules.d/01-touchpad-state-onmouse.rules
/usr/bin/authoritydbus
/usr/bin/touchpad-state
/usr/bin/ukui-settings-daemon
/usr/bin/ukydisplayswitch
/usr/bin/usd-locate-pointer
%files common
%doc debian/changelog debian/copyright
%{_datadir}/glib-2.0/
%{_datadir}/icons/
%{_datadir}/locale/
%{_datadir}/man/
%{_datadir}/ukui-settings-daemon/
%{_datadir}/man/*
%files devel
%{_prefix}/include/ukui-settings-daemon/
%{_prefix}/%{_lib}/pkgconfig/
%changelog
* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-1
- update version to 3.1.2
* Mon Aug 08 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-7
- update Copyright and Authors information