!35 Fix the display error of mima
From: @peijiankang Reviewed-by: @tanyulong2021 Signed-off-by: @tanyulong2021
This commit is contained in:
commit
1ce1e15dc0
25
0001-Fix-the-display-error-of-mima.patch
Normal file
25
0001-Fix-the-display-error-of-mima.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From e9e938f5ebf4779615110332d598060cdf37339c Mon Sep 17 00:00:00 2001
|
||||||
|
From: peijiankang <peijiankang@kylinos.cn>
|
||||||
|
Date: Fri, 15 Jul 2022 10:13:25 +0800
|
||||||
|
Subject: [PATCH] Fix the display error of mima
|
||||||
|
|
||||||
|
---
|
||||||
|
ukui-greeter/greeter/loginwindow.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/ukui-greeter/greeter/loginwindow.cpp b/ukui-greeter/greeter/loginwindow.cpp
|
||||||
|
index 0028478..ede06fa 100644
|
||||||
|
--- a/ukui-greeter/greeter/loginwindow.cpp
|
||||||
|
+++ b/ukui-greeter/greeter/loginwindow.cpp
|
||||||
|
@@ -535,7 +535,7 @@ void LoginWindow::onShowPrompt(QString text, QLightDM::Greeter::PromptType type)
|
||||||
|
unacknowledged_messages = false;
|
||||||
|
m_preStrMessage = "";
|
||||||
|
qDebug()<<"unacknowledged_messages = false";
|
||||||
|
- if(text == "Password: "||text == "密码:"){
|
||||||
|
+ if(text == "Password: "||text == "密码: "){
|
||||||
|
if(useDoubleAuth){
|
||||||
|
if(!m_failMap.contains(m_uid) || m_failMap[m_uid] < maxFailedTimes)
|
||||||
|
onShowMessage(tr("Please enter your password or enroll your fingerprint "), QLightDM::Greeter::MessageTypeInfo);
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,12 +1,13 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
Name: ukui-greeter
|
Name: ukui-greeter
|
||||||
Version: 3.0.3
|
Version: 3.0.3
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Lightdm greeter for UKUI
|
Summary: Lightdm greeter for UKUI
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: ukui-greeter-%{version}.tar.gz
|
Source0: ukui-greeter-%{version}.tar.gz
|
||||||
Patch0: fix-greeter-translation.patch
|
Patch0: fix-greeter-translation.patch
|
||||||
|
Patch1: 0001-Fix-the-display-error-of-mima.patch
|
||||||
|
|
||||||
BuildRequires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers opencv glib2-devel
|
BuildRequires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers opencv glib2-devel
|
||||||
Requires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers
|
Requires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers
|
||||||
@ -29,6 +30,7 @@ A greeter for UKUI desktop environment written by Qt5.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
qmake-qt5
|
qmake-qt5
|
||||||
@ -53,6 +55,9 @@ gzip -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
|
|||||||
%{_datadir}/xgreeters/ukui-greeter.desktop
|
%{_datadir}/xgreeters/ukui-greeter.desktop
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 15 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.3-3
|
||||||
|
- Fix the display error of mima
|
||||||
|
|
||||||
* Wed Mar 9 2022 douyan <douyan@kylinos.cn> - 3.0.3-2
|
* Wed Mar 9 2022 douyan <douyan@kylinos.cn> - 3.0.3-2
|
||||||
- add fix-greeter-translation.patch
|
- add fix-greeter-translation.patch
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user