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 deleted file mode 100644 index 0b1e0efd2df1cc35ca960647f8b2c86957c7e6ab..0000000000000000000000000000000000000000 --- a/0001-fix-kiran-cpanel-greeter-Fix-invalid-reset-of-automa.patch +++ /dev/null @@ -1,37 +0,0 @@ -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.3.0.tar.gz b/kiran-session-guard-2.3.0.tar.gz deleted file mode 100644 index 1d3fe2c322341b24d5606875e8dd1c5a94484a4c..0000000000000000000000000000000000000000 Binary files a/kiran-session-guard-2.3.0.tar.gz and /dev/null differ diff --git a/kiran-session-guard-2.4.0.tar.gz b/kiran-session-guard-2.4.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f061aa41c68127cb115b4f7cd4b6c272bca5241b Binary files /dev/null and b/kiran-session-guard-2.4.0.tar.gz differ diff --git a/kiran-session-guard.spec b/kiran-session-guard.spec index 65f00b9c927d12ff057313c15b69169adc27e848..50adaedcd5e15983518b5a5b1f80c1a68ca0cefa 100644 --- a/kiran-session-guard.spec +++ b/kiran-session-guard.spec @@ -1,13 +1,12 @@ Name: kiran-session-guard -Version: 2.3.0 -Release: 2 +Version: 2.4.0 +Release: 1 Summary: Kiran desktop environment login and lock screen dialog Summary(zh_CN): Kiran桌面环境登录和解锁框 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 @@ -28,27 +27,27 @@ BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtsvg-devel BuildRequires: gsettings-qt-devel -BuildRequires: kiran-widgets-qt5-devel >= 2.3.0 +BuildRequires: kiran-widgets-qt5-devel >= 2.4 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 +BuildRequires: kiran-control-panel-devel >= 2.4 +BuildRequires: kiran-qt5-integration-devel >= 2.4 Requires: qt5-qtbase Requires: qt5-qtsvg Requires: qt5-qtx11extras Requires: gsettings-qt -Requires: kiran-widgets-qt5 >= 2.3.0 +Requires: kiran-widgets-qt5 >= 2.4 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: kiran-qt5-integration >= 2.4 Requires: lightdm-qt5 Requires: libX11 @@ -135,6 +134,9 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/ rm -rf %{buildroot} %changelog +* Fri Nov 04 2022 liuxinhao - 2.4.0-1 +- KYOS-F: release 2.4, kiran-control-panel greeter plugin support color block + * 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