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

!37 更新到v2.4版本

Browse Source 
From: @tangjie02 
Reviewed-by: @liubuguiii 
Signed-off-by: @liubuguiii
This commit is contained in:
openeuler-ci-bot 2022-10-26 01:09:05 +00:00 committed by Gitee
commit 2ac293321d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 27 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
0000-feature-cmake-Fix-the-com.kylinsec.Kiran.SessionDaem-c0965636.patch
View File

@ -1,89 +0,0 @@
From c0965636333fde1ca7f2466ae810cb56669503af Mon Sep 17 00:00:00 2001
From: tangjie02 <tangjie02@kylinsec.com.cn>
Date: Tue, 22 Feb 2022 20:05:42 +0800
Subject: [PATCH] feature(cmake): Fix the
com.kylinsec.Kiran.SessionDaemon.Power.policy file generation error caused by
the logic error of CMakeLists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修复由于CMakeLists.txt的逻辑错误导致com.kylinsec.Kiran.SessionDaemon.Power.policy文件生成错误
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
---
data/CMakeLists.txt | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 818b04e..16a04a9 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -6,7 +6,7 @@ find_program(INTLTOOL-MERGE NAMES "intltool-merge" REQUIRED)
if(build-system-daemon)
# policy files
- file(GLOB POLICY_IN_FILES ./*SystemDaemon*.policy.in)
+ file(GLOB POLICY_IN_FILES ${PROJECT_SOURCE_DIR}/data/*SystemDaemon*.policy.in)
foreach(POLICY_IN_FILE IN LISTS POLICY_IN_FILES)
string(REGEX REPLACE ".+/(.+)\\..*" "\\1" POLICY_FILE ${POLICY_IN_FILE})
@@ -18,7 +18,7 @@ if(build-system-daemon)
# service files
- file(GLOB SERVICE_IN_FILES ./*SystemDaemon*service.in ./kiran-system-daemon.service.in)
+ file(GLOB SERVICE_IN_FILES ${PROJECT_SOURCE_DIR}/data/*SystemDaemon*service.in ${PROJECT_SOURCE_DIR}/data/kiran-system-daemon.service.in)
foreach(SERVICE_IN_FILE IN LISTS SERVICE_IN_FILES)
string(REGEX REPLACE ".+/(.+)\\..*" "\\1" SERVICE_FILE ${SERVICE_IN_FILE})
@@ -41,7 +41,7 @@ if(build-system-daemon)
DESTINATION ${KCC_INSTALL_DATADIR}/dbus-1/system-services)
# conf files
- file(GLOB CONF_FILES ./*.conf)
+ file(GLOB CONF_FILES ${PROJECT_SOURCE_DIR}/data/*.conf)
foreach(CONF_FILE IN LISTS CONF_FILES)
install(FILES ${CONF_FILE}
@@ -71,18 +71,8 @@ if(build-session-daemon)
install(FILES ${PROJECT_BINARY_DIR}/data/com.kylinsec.Kiran.SessionDaemon.Power.policy
DESTINATION ${KCC_INSTALL_DATADIR}/polkit-1/actions/)
- # policy.in files
- file(GLOB POLICY_IN_FILES ./*SessionDaemon*.policy.in)
- foreach(POLICY_IN_FILE IN LISTS POLICY_IN_FILES)
- string(REGEX REPLACE ".+/(.+)\\..*" "\\1" POLICY_FILE ${POLICY_IN_FILE})
- execute_process(COMMAND ${INTLTOOL-MERGE} -x ${PROJECT_SOURCE_DIR}/po/ ${POLICY_IN_FILE} ${PROJECT_BINARY_DIR}/data/${POLICY_FILE})
-
- install(FILES ${PROJECT_BINARY_DIR}/data/${POLICY_FILE}
- DESTINATION ${KCC_INSTALL_DATADIR}/polkit-1/actions/)
- endforeach()
-
# gschema.xml
- file(GLOB SCHEMA_IN_FILES ./*.gschema.xml.in)
+ file(GLOB SCHEMA_IN_FILES ${PROJECT_SOURCE_DIR}/data/*.gschema.xml.in)
foreach(SCHEMA_IN_FILE IN LISTS SCHEMA_IN_FILES)
string(REGEX REPLACE ".+/(.+)\\..*" "\\1" SCHEMA_FILE ${SCHEMA_IN_FILE})
@@ -101,7 +91,7 @@ if(build-session-daemon)
RENAME plugin_options)
# service files
- file(GLOB SERVICE_IN_FILES ./*SessionDaemon*service.in)
+ file(GLOB SERVICE_IN_FILES ${PROJECT_SOURCE_DIR}/data/*SessionDaemon*service.in)
foreach(SERVICE_IN_FILE IN LISTS SERVICE_IN_FILES)
string(REGEX REPLACE ".+/(.+)\\..*" "\\1" SERVICE_FILE ${SERVICE_IN_FILE})
@@ -147,7 +137,7 @@ install(FILES ${PROJECT_SOURCE_DIR}/include/error-i.h
DESTINATION ${KCC_INSTALL_INCLUDE})
# pc file
-file(GLOB PC_IN_FILES ./*.pc.in)
+file(GLOB PC_IN_FILES ${PROJECT_SOURCE_DIR}/data/*.pc.in)
foreach(PC_IN_FILE IN LISTS PC_IN_FILES)
string(REGEX REPLACE ".+/(.+)\\..*" "\\1" PC_FILE ${PC_IN_FILE})
--
2.27.0

BIN
kiran-cc-daemon-2.2.4.tar.gz
View File

Binary file not shown.

BIN
kiran-cc-daemon-2.4.0.tar.gz Normal file
View File

Binary file not shown.

226
kiran-cc-daemon.spec
View File

@ -1,13 +1,11 @@
Name: kiran-cc-daemon
Version: 2.2.4
Release: 3
Version: 2.4.0
Release: 1
Summary: DBus daemon for Kiran Desktop
License: Mulan PSL v2
License: MulanPSL-2.0
Source0: %{name}-%{version}.tar.gz
Patch1000: 0000-feature-cmake-Fix-the-com.kylinsec.Kiran.SessionDaem-c0965636.patch
BuildRequires: cmake >= 3.2
BuildRequires: pkgconfig(glibmm-2.4)
@ -34,6 +32,9 @@ BuildRequires: gdbus-codegen-glibmm
BuildRequires: gtest-devel
BuildRequires: libnotify-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libgtop2-devel
BuildRequires: libgudev-devel
BuildRequires: cryptopp-devel
%description
@ -48,6 +49,17 @@ Requires: polkit
Requires: kiran-cc-daemon-common
Requires: util-linux
Requires: pciutils
Requires: libgtop2
Requires: libgudev
Requires: lshw
Requires: passwd
%if 0%{?openEuler}
Requires: openeuler-lsb
%else
Requires: kylin-lsb
%endif
%description -n kiran-system-daemon
System DBus daemon for Kiran Desktop
@ -98,6 +110,7 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
%files -n kiran-system-daemon
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/lightdm/kiran-greeter.conf
%config(noreplace) %{_sysconfdir}/kiran-cc-daemon/system/timedate/timedate.conf
%{_bindir}/kiran-system-daemon
%{_usr}/lib/systemd/system/*.service
@ -106,11 +119,11 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
%{_datadir}/dbus-1/system-services/*.service
%{_datadir}/locale/zh_CN/LC_MESSAGES/kiran-cc-daemon-timezones.mo
%{_datadir}/polkit-1/actions/com.kylinsec.Kiran.SystemDaemon*.policy
%{_datadir}/lightdm/lightdm.conf.d/99-kiran-greeter-login.conf
%files -n kiran-session-daemon
%{_sysconfdir}/xdg/autostart/kiran-session-daemon.desktop
%{_sysconfdir}/xdg/autostart/kiran-power-status-icon.desktop
%{_sysconfdir}/lightdm/kiran-greeter.conf
%{_bindir}/kiran-session-daemon
%{_bindir}/kiran-power-backlight-helper
%{_bindir}/kiran-power-status-icon
@ -121,6 +134,8 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_datadir}/locale/zh_CN/LC_MESSAGES/kiran-power-status-icon.mo
%{_datadir}/polkit-1/actions/com.kylinsec.Kiran.SessionDaemon*.policy
%dir %{_datadir}/kiran-cc-daemon/keybindings
%{_datadir}/kiran-cc-daemon/keybindings/*.xml
%files common
%{_includedir}/kiran-cc-daemon/error-i.h
@ -130,206 +145,11 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/nulls || :
%dir %{_includedir}/kiran-cc-daemon
%dir %{_includedir}/kiran-cc-daemon/kiran-system-daemon
%dir %{_includedir}/kiran-cc-daemon/kiran-session-daemon
%{_includedir}/kiran-cc-daemon/kiran-system-daemon/*_i.h
%{_includedir}/kiran-cc-daemon/kiran-system-daemon/*-i.h
%{_includedir}/kiran-cc-daemon/kiran-session-daemon/*_i.h
%{_includedir}/kiran-cc-daemon/kiran-session-daemon/*-i.h
%{_libdir}/pkgconfig/kiran-cc-daemon.pc
%changelog
* Wed Mar 02 2022 longcheng <longcheng@kylinos.com.cn> - 2.2.4-3
- KYOS-F: Do not output the alarm information to the screen
* Thu Feb 24 2022 chendingjian <chendingjian@kylinos.com.cn> - 2.2.4-2
- rebuild for KY3.4-MATE-modules-dev
* Tue Feb 22 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.4-1.kb2
- KYOS-F: Fix the com.kylinsec.Kiran.SessionDaemon.Power.policy file generation error caused by the logic error of CMakeLists.
* Sat Feb 19 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.4-1.kb1
- KYOS-F: Fix compile error on KLOG_PROFILE.
* Fri Feb 18 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.3-2.kb6
- KYOS-B: Fix the function invalid problem when set the action of power button pressed.(#50020)
- KYOS-B: Show remaining electrictiy in power tray icon.(#48516)
* Thu Feb 17 2022 longcheng <longcheng@kylinsec.com.cn> - 2.2.3-2.kb5
- KYOS-B: Change the Requires mate-session-manager to kiran-session-manager for kiran-session-daemon (#49934)
* Wed Feb 16 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.3-2.kb4
- KYOS-F: Register client to session manager after the plugins is inited.
- KYOS-F: Modify the default gtk theme to kiran-dark.
* Wed Jan 19 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.3-2.kb3
- KYOS-B: Fix the disappear problem for power tray icon on laptop.(#48516)
* Tue Jan 18 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.3-2.kb2
- KYOS-F: Add audio-i.h header file to install directory.
- KYOS-B: Add reset dbus api for keybinding.(#48466)
- KYOS-B: Set cursor theme name to org.mate.peripherals-mouse.cursor-them for making marco to update cursor them.(#48458)
- KYOS-F: Append the configure_file command to generate com.kylinsec.Kiran.SessionDaemon.Power.policy file.
- KYOS-B: Forbit deleting logined user.(#49244)
- KYOS-F: Modify the log output level in DeleteUser when exception is throwed.
* Wed Dec 29 2021 kpkg <kpkg@kylinos.com.cn> - 2.2.3-2.kb1
- rebuild for KY3.4-MATE-modules-dev
* Wed Dec 29 2021 caoyuanji<caoyuanji@kylinos.com.cn> - 2.2.3-2
- Upgrade version number for easy upgrade
* Mon Dec 20 2021 caoyuanji <caoyuanji@kylinos.com.cn> - 2.2.3-1.kb1
- rebuild for KY3.4-4-KiranUI-2.2
* Wed Dec 15 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.2.3-1.ky3
- KYOS-F: Add more additional error information for accounts plugins
- KYOS-F: Doesn't reboot caja, kiran-panel and marco when the window scale is inited firstly.
* Tue Dec 07 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.2.2-1.ky3
- KYOS-F: Modify the default switch value of plugins.
- KYOS-B: Ignore the 'disabled' keycomb when look shotcut by keycomb.
- KYOS-B: The color of power status icon is changed with gtk theme.
* Mon Nov 22 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.2.1-4.ky3
- KYOS-B: Delete translation file in kiran-session-daemon.
* Mon Nov 22 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.2.1-3.ky3
- KYOS-B: Only allow to load kiran-session-daemon in KIRAN desktop environment.
- KYOS-B: Fix coredump when the program is exited.
* Wed Nov 17 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.2.1-2.ky3
- KYOS-B: Modify libinputdevices-common to static library.
* Mon Nov 15 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.2.1-1.ky3
- KYOS-B: Stop the conflicted plugins of mate-settings-daemon with kiran-session-daemon when the kiran-session-daemon is started and start the conflicted plugins when the kiran-session-daemon is stopped.
* Fri Nov 05 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.2.0-1.ky3
- KYOS-B: Enable Display, Keybinding, keyboard, mouse, power, touchpad, xsettigns plugins.
* Fri Sep 10 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.1.0-3.ky3
- KYOS-B: Fix the compile error in KY3.3-9.
* Thu Sep 09 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.1.0-2.ky3
- KYOS-F: Rebuild for 2.1.0-1
* Wed Sep 08 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.1.0-1.ky3
- KYOS-B: Accounts plugin doesn't create cached file default when a user is added. (#43305)
- KYOS-F: Modify the display.xml saved directory.
- KYOS-F: Modify the default value for gtk-font-name in gsettings.
- KYOS-F: Change license to MulanPSL2.
* Mon Aug 09 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.7-1.ky3
- KYOS-F: Add account password expiration policy.
- KYOS-F: Delete upower library dependency.
* Thu Jun 24 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.6-3.ky3
- KYOS-B: Add -f option in userdel command to fix the problem that user cannot be deleted when the user login and then logout.
* Wed Jun 16 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.6-2.ky3
- KYOS-F: Add translation for dbus authoriation failed.
* Wed Jun 09 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.6-1.ky3
- KYOS-F: Add cmake variables for enable/disable plugins.
* Fri Jun 04 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.5-1.ky3
- KYOS-B: Fix the name error in greeter service file.
* Thu May 27 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.4-1.ky3
- KYOS-B: Fix the compile error in KY3.3-6.
- KYOS-F: Rename these header files which suffix is _i.h to xxx-i.h
* Thu May 13 2021 tangjei02 <tangjie02@kylinos.com.cn> 2.0.3-1.ky3
- KYOS-F: The first parameter of function SetAutologinUser is changed to user name instead of user uid.
- KYOS-F: Rename dbus, file, class and variable and provide kiran-greeter.conf.
- KYOS-F: Cache user infomation for root.
* Wed Apr 14 2021 yangxiaoqing <yangxiaoqing@kylinos.com.cn> 2.0.2+alpha2-2.ky3.kb1
- KYOS-C: Set plugin of greeter-settings available.
- KYOS-B: Fix the segment error of GreeterSettingsManager::get_background_file().
* Thu Apr 01 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.2+alpha2-2.ky3
- Delete third party and replace by pkg_search_module.
* Sat Mar 27 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.2+alpha2-1.ky3
- KYOS-B: Fix the display errors of disks and eths in ft machine.
* Thu Mar 25 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.2+alpha1-2.ky3.kb3
- KYOS-B: Fix the display error of the hardware info in sw machine.
* Tue Mar 23 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.2+alpha1-2.ky3.kb2
- KYOS-B: Fix the problem that disk info cannot be displayed in KY3.3-9.
* Mon Mar 22 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.2+alpha1-2.ky3.kb1
- KYOS-F: The hostname set by SetHostName function is restored when system reboot.
* Fri Mar 19 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.2+alpha1-2.ky3
- KYOS-B: Fix the UnicodeEncodeError when generate source files by gdbus-codegen-glibmm.
* Thu Mar 18 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.2+alpha1-1.ky3
- KYOS-B: Fix the compile error in KY3.3-9.
- KYOS-F: Add authentication manager for fingerprint and face datas.
* Wed Mar 17 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alpha6-1.ky3.kb2
- KYOS-F: Disable greeter and display plugins.
* Mon Mar 15 2021 yangxiaoqing <yangxiaoqing@kylinos.com.cn> 2.0.1+alpha6-1.ky3.kb1
- KYOS-C: Remove unused dependent library.
- KYOS-P: Modify the file name of dbus xml.
* Thu Mar 04 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alpha6-1.ky3
- KYOS-F: Add systeminfo and greeter-settings plugins.
- KYOS-F: Add timedate display format settings.
* Mon Feb 01 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alpha5-2.ky3
- KYOS-F: Replace the logs output function with zlog.
- KYOS-F: Enable account and display setting plugins.
* Mon Dec 07 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alpha5-1.ky3.kb1
- KYOS-B: Disable account setting plugin.
* Mon Nov 30 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alpha5-1.ky3
- KYOS-B: Add kiran-session-daemon which contain display setting plugin.
* Tue Nov 17 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alpha4-3.ky3
- KYOS-B: Fix the return value error when create user failed.
- KYOS-F: Remove -f option when delete user.
- KYOS-B: Modify /usr/bin/usermod to /usr/sbin/usermod
* Tue Nov 03 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alpha4-2.ky3
- KYOS-F: Update icon path when icon path is not found.
- KYOS-F: Don't need to verify to change self account password.
- KYOS-F: Separate header file to development package.
- KYOS-F: Add translation for dbus return value.
- KYOS-F: Modify unikylin to kylinsec.
* Mon Oct 12 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alpha4-1.ky3
- KYOS-F: Support to set user uid when create user.
* Tue Sep 29 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alhpa3-3.ky3
- KYOS-F: Move to tag KY3.4-MATE-modules-dev.
* Tue Sep 29 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alhpa3-2.ky3
- KYOS-B: Fix the compile error that cannot find macro ADJ_SETOFFSET in KY3.3-9
- KYOS-F: Add files monitor for /etc/adjtime, /etc/localtime and ntp service path
* Sun Sep 27 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alhpa3-1.ky3.kb2
- KYOS-F: Apply the Patch1001 file.
* Sun Sep 27 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alhpa3-1.ky3.kb1
- KYOS-B: Fix the installing path error.
* Tue Sep 22 2020 tangjie02 <tangjie02@kylinos.com.cn> 2.0.1+alpha3-1.ky3
- KYOS-B: Fix plugins loading error due to KCC_PLUGIN_DIR variable no found.
* Fri Sep 18 2020 songchuanfei <songchuanfei@kylinos.com.cn> 2.0.1~alpha2-1.ky3
- New upstream source 2.0.1~alpha2
* Thu Sep 17 2020 songchuanfei <songchuanfei@kylinos.com.cn> 2.0.1~alpha1-3.ky3
- KYOS-F: Fix build error for lack of dependencies
* Thu Sep 17 2020 songchuanfei <songchuanfei@kylinos.com.cn> 2.0.1~alpha1-2.ky3
- KYOS-F: Enable system daemon in post section
- KYOS-F: Stop system daemon service before uninstall
* Thu Sep 17 2020 songchuanfei <songchuanfei@kylinos.com.cn> 2.0.1~alpha1-1.ky3
- New upstream source
* Tue Oct 25 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.4.0-1
- KYOS-F: init commit for v2.4 version.

4
kiran-cc-daemon.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: gitee
src_repo: https://gitee.com/openeuler/kiran-cc-daemon.git
tag_prefix: "v"
seperator: "."