!37 发布v2.5.1: 支持虹膜，UKey, 人脸认证，修复一些进入桌面未勾选默认应用的问题，认证失败后进入重新认证环节.

From: @liubuguiii 
Reviewed-by: @stonefly128 
Signed-off-by: @stonefly128

0002-fix-Compatible-for-versions-below-5.14.patch

@@ -1,56 +0,0 @@
-From f648b9a5d07492dccc5f52e59dada653c4878bee Mon Sep 17 00:00:00 2001
-From: wangyucheng <wangyucheng@kylinsec.com.cn>
-Date: Sun, 23 Apr 2023 20:06:14 +0800
-Subject: [PATCH] fix(*):Compatible for versions below 5.14
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- 兼容5.14以下版本
-  去掉对 QPixmap pixmap(Qt::ReturnByValueConstant) 接口的使用
----
- src/lightdm-greeter/main.cpp | 3 +--
- src/polkit-agent/main.cpp    | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/lightdm-greeter/main.cpp b/src/lightdm-greeter/main.cpp
-index 59ac360..cec93b0 100644
---- a/src/lightdm-greeter/main.cpp
-+++ b/src/lightdm-greeter/main.cpp
-@@ -82,7 +82,6 @@ bool loadTranslator()
-     {
-         QApplication::installTranslator(translator);
-         bRes = true;
--        KLOG_INFO() << "loaded translator" << translator->filePath();
-     }
-     else
-     {
-@@ -148,4 +147,4 @@ int main(int argc, char* argv[])
-     Prefs::globalDeinit();
- 
-     return ret;
--}
-\ No newline at end of file
-+}
-diff --git a/src/polkit-agent/main.cpp b/src/polkit-agent/main.cpp
-index 7fff663..3aa86c5 100644
---- a/src/polkit-agent/main.cpp
-+++ b/src/polkit-agent/main.cpp
-@@ -44,7 +44,6 @@ int main(int argc, char* argv[])
-     else
-     {
-         app.installTranslator(translatorPointer.data());
--        KLOG_DEBUG() << "load translator:" << translatorPointer->filePath();
-     }
- 
-     PolkitQt1::UnixSessionSubject session(app.applicationPid());
-@@ -56,4 +55,4 @@ int main(int argc, char* argv[])
-     }
- 
-     return app.exec();
--}
-\ No newline at end of file
-+}
--- 
-2.33.0
-

0003-fix-greeter-Background-anti-aliasing.patch

@@ -1,28 +0,0 @@
-From 2366f79318014f6ec569ea61f78b53a3b80efa3d Mon Sep 17 00:00:00 2001
-From: liuxinhao <liuxinhao@kylinsec.com.cn>
-Date: Tue, 25 Apr 2023 10:45:47 +0800
-Subject: [PATCH 1/2] fix(greeter): Background anti-aliasing
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- 背景抗锯齿
----
- src/lightdm-greeter/background.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lightdm-greeter/background.cpp b/src/lightdm-greeter/background.cpp
-index c9e6394..0b6e8f3 100644
---- a/src/lightdm-greeter/background.cpp
-+++ b/src/lightdm-greeter/background.cpp
-@@ -122,6 +122,7 @@ void Background::resizeEvent(QResizeEvent *event)
- void Background::paintEvent(QPaintEvent *event)
- {
-     QPainter painter(this);
-+    painter.setRenderHint(QPainter::Antialiasing);
-     if (!m_scaledBackground.isNull())
-     {
-         painter.drawPixmap(this->rect(), m_scaledBackground, m_scaledBackground.rect());
--- 
-2.33.0
-

0004-fix-greeter-user-has-not-logged-in-to-a-desktop-envi.patch

@@ -1,48 +0,0 @@
-From c2cc47184ca2013c0f3f6f429190e271ebbf5147 Mon Sep 17 00:00:00 2001
-From: liuxinhao <liuxinhao@kylinsec.com.cn>
-Date: Tue, 25 Apr 2023 16:22:48 +0800
-Subject: [PATCH 2/2] fix(greeter): user has not logged in to a desktop
- environment,  selects a desktop environment by default
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- 用户未登录过桌面环境默认选择一个桌面环境
----
- src/lightdm-greeter/frame.cpp | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/lightdm-greeter/frame.cpp b/src/lightdm-greeter/frame.cpp
-index 10f1510..6b83247 100644
---- a/src/lightdm-greeter/frame.cpp
-+++ b/src/lightdm-greeter/frame.cpp
-@@ -408,11 +408,26 @@ void Frame::onUserSelected(const QString& name)
- 
-     QString userSession = UserManager::getUserLastSession(name);
-     KLOG_DEBUG() << "user session:" << name << userSession;
-+
-     if (!userSession.isEmpty() && m_sessionItemMap.contains(userSession))
-     {
-+        // 默认选择用户上次进入的桌面环境
-         auto sessionItem = m_sessionItemMap[userSession];
-         sessionItem->setChecked(true);
-     }
-+    else if (!m_sessionItemMap.isEmpty())
-+    {
-+        // 该用户未登录过桌面环境
-+        auto kiranSession = m_sessionItemMap.find("kiran");
-+        if (kiranSession != m_sessionItemMap.end())
-+        {
-+            (*kiranSession)->setChecked(true);
-+        }
-+        else
-+        {
-+            m_sessionItemMap.first()->setChecked(true);
-+        }
-+    }
- 
-     if (name == m_greeter->autologinUserHint())
-     {
--- 
-2.33.0
-

kiran-session-guard.spec

@@ -1,15 +1,11 @@
 Name: kiran-session-guard
-Version: 2.5.0
+Version: 2.5.1
-Release: 6
+Release: 1
 Summary: Kiran desktop environment login and lock screen dialog
 Summary(zh_CN): Kiran桌面环境登录和解锁框
 
 License: MulanPSL-2.0
 Source0: %{name}-%{version}.tar.gz
-Patch0:  0001-fix-translate-add-some-translation.patch
-Patch1:  0002-fix-Compatible-for-versions-below-5.14.patch
-Patch3:  0003-fix-greeter-Background-anti-aliasing.patch
-Patch4:  0004-fix-greeter-user-has-not-logged-in-to-a-desktop-envi.patch 
 
 %define SHOW_VIRTUAL_KEYBOARD 0
 
@@ -33,10 +29,9 @@ BuildRequires: gsettings-qt-devel
 
 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 >= 2.4
+BuildRequires: kiran-control-panel-devel >= 2.5
 BuildRequires: kiran-qt5-integration-devel >= 2.4
 BuildRequires: kiran-qdbusxml2cpp
 
@@ -48,7 +43,6 @@ Requires: gsettings-qt
 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
@@ -149,6 +143,11 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/
 rm -rf %{buildroot}
 
 %changelog
+* Wed May 24 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.1-1
+- KYOS-F: If the authentication fails, the re-authentication button is displayed.(#69229) 
+- KYOS-B: Fixed an issue caused by selecting default desktop session(#69204,#69220)
+- KYOS-F: Supports UKey, Iris, and face authentication
+
 * Tue Apr 25 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.0-6
 - KYOS-F: Greeter background anti-aliasing
 - KYOS-F: user has not logged in to a desktop environment,  selects a desktop environment by default