diff --git a/0001-fix-kiran-cpanel-greeter-Fix-invalid-reset-of-automa.patch b/0001-fix-kiran-cpanel-greeter-Fix-invalid-reset-of-automa.patch new file mode 100644 index 0000000..0b1e0ef --- /dev/null +++ b/0001-fix-kiran-cpanel-greeter-Fix-invalid-reset-of-automa.patch @@ -0,0 +1,37 @@ +From a83821b50d7c900e059f5950ba93df40eb32c6c2 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Wed, 27 Jul 2022 14:47:10 +0800 +Subject: [PATCH] fix(kiran-cpanel-greeter): Fix invalid reset of automatic + login option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修复自动登录选项重置无效的问题 + +Closes #I5HBZO +--- + .../kiran-cpanel-greeter/src/greeter-setting-window.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/lightdm-greeter/kiran-cpanel-greeter/src/greeter-setting-window.cpp b/lightdm-greeter/kiran-cpanel-greeter/src/greeter-setting-window.cpp +index 8e27e7d..816322a 100644 +--- a/lightdm-greeter/kiran-cpanel-greeter/src/greeter-setting-window.cpp ++++ b/lightdm-greeter/kiran-cpanel-greeter/src/greeter-setting-window.cpp +@@ -664,7 +664,13 @@ void GreeterSettingWindow::resetAutoLoginSettings() + { + GreeterSettingInfo::AutoLoginSetting autoLoginSetting = getAutologinSettingInfoFromBackend(); + m_autologinSwitch->setChecked(autoLoginSetting.autoLoginUser.size()); ++ + m_autologinComboWidget->setVisible(autoLoginSetting.autoLoginUser.size()); ++ if( !autoLoginSetting.autoLoginUser.isEmpty() ) ++ { ++ m_comboAutoLoginUser->setCurrentText(autoLoginSetting.autoLoginUser); ++ } ++ + m_editAutoLoginDelay->setText(QString::number(autoLoginSetting.autoLoginTimeout)); + m_origSettingInfo.autoLoginInfo = autoLoginSetting; + } +-- +2.33.0 + diff --git a/kiran-session-guard-2.2.3.tar.gz b/kiran-session-guard-2.2.3.tar.gz deleted file mode 100644 index c808405..0000000 Binary files a/kiran-session-guard-2.2.3.tar.gz and /dev/null differ diff --git a/kiran-session-guard-2.3.0.tar.gz b/kiran-session-guard-2.3.0.tar.gz new file mode 100644 index 0000000..1d3fe2c Binary files /dev/null and b/kiran-session-guard-2.3.0.tar.gz differ diff --git a/kiran-session-guard.spec b/kiran-session-guard.spec index 6966e14..65f00b9 100644 --- a/kiran-session-guard.spec +++ b/kiran-session-guard.spec @@ -1,12 +1,14 @@ Name: kiran-session-guard -Version: 2.2.3 -Release: 1 +Version: 2.3.0 +Release: 2 Summary: Kiran desktop environment login and lock screen dialog Summary(zh_CN): Kiran桌面环境登录和解锁框 -License: Mulan PSL v2 +License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz +Patch0001: 0001-fix-kiran-cpanel-greeter-Fix-invalid-reset-of-automa.patch + %define SHOW_VIRTUAL_KEYBOARD 0 BuildRequires: cmake @@ -26,25 +28,27 @@ BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtsvg-devel BuildRequires: gsettings-qt-devel -BuildRequires: kiran-widgets-qt5-devel +BuildRequires: kiran-widgets-qt5-devel >= 2.3.0 BuildRequires: kiran-log-qt5-devel BuildRequires: kiran-biometrics-devel BuildRequires: kiran-authentication-service-devel BuildRequires: kiran-cc-daemon-devel BuildRequires: kiran-control-panel-devel +BuildRequires: kiran-qt5-integration-devel Requires: qt5-qtbase Requires: qt5-qtsvg Requires: qt5-qtx11extras Requires: gsettings-qt -Requires: kiran-widgets-qt5 +Requires: kiran-widgets-qt5 >= 2.3.0 Requires: kiran-log-qt5 Requires: kiran-authentication-service Requires: kiran-biometrics Requires: kiran-system-daemon Requires: kiran-session-daemon Requires: kiran-cpanel-launcher +Requires: kiran-qt5-integration Requires: lightdm-qt5 Requires: libX11 @@ -131,6 +135,12 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/ rm -rf %{buildroot} %changelog +* Tue Aug 30 2022 liuxinhao - 2.3.0-2 +- KYOS-F: apply the last submitted patch:Fix invalid reset of automatic login option,update License,update yaml + +* Thu Jul 07 2022 liuxinhao - 2.3.0-1 +- KYOS-F: update login settings interface style, support dark and light color theme + * Wed Mar 02 2022 longcheng - 2.2.3-1 - KYOS-B: fix compilation errors on OpenEuler diff --git a/kiran-session-guard.yaml b/kiran-session-guard.yaml new file mode 100644 index 0000000..222af7e --- /dev/null +++ b/kiran-session-guard.yaml @@ -0,0 +1,4 @@ +version_control: gitee +src_repo: https://gitee.com/openeuler/kiran-session-guard.git +tag_prefix: "v" +seperator: "."