update upstream version 3.1.2
This commit is contained in:
tanyulong2021
parent
df139da2ef
commit
db8b9d35c2
@ -1,25 +0,0 @@
|
||||
From 76aca0ca60a0e304c97a7339b3b9541919174c75 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Fri, 15 Jul 2022 10:24:32 +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 a21f4af..43a281d 100644
|
||||
--- a/ukui-greeter/greeter/loginwindow.cpp
|
||||
+++ b/ukui-greeter/greeter/loginwindow.cpp
|
||||
@@ -477,7 +477,7 @@ void LoginWindow::onShowPrompt(QString text, QLightDM::Greeter::PromptType type)
|
||||
prompted = true;
|
||||
unacknowledged_messages = false;
|
||||
qDebug()<<"unacknowledged_messages = false";
|
||||
- if(text == "Password: ")
|
||||
+ if(text == "Password: " || text == "密码： ")
|
||||
text = tr("Password: ");
|
||||
if(text == "login:") {
|
||||
text = tr("Username");
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 832c95bbb71ccced2154f083235ea7603f3acd1e Mon Sep 17 00:00:00 2001
|
||||
From: tanyulong2021 <tanyulong@kylinos.cn>
|
||||
Date: Thu, 28 Jul 2022 17:26:01 +0800
|
||||
Subject: [PATCH] solve the incomplete display of pam authentication message
|
||||
|
||||
---
|
||||
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 642af59..dcae2b8 100644
|
||||
--- a/ukui-greeter/greeter/loginwindow.cpp
|
||||
+++ b/ukui-greeter/greeter/loginwindow.cpp
|
||||
@@ -204,7 +204,7 @@ void LoginWindow::setChildrenGeometry()
|
||||
m_passwordEdit->setGeometry((m_passwdWidget->width() - 300)/2, 0, 300, 34);
|
||||
m_messageLabel->setGeometry((m_passwdWidget->width() - 600)/2,
|
||||
m_passwordEdit->geometry().bottom() + 25,
|
||||
- 600, 20);
|
||||
+ 600, 25);
|
||||
|
||||
m_messageButton->setGeometry((m_passwdWidget->width() - 200)/2, 0, 200, 40);
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From ff8effd347fae295a7d1169048232c4828e59025 Mon Sep 17 00:00:00 2001
|
||||
From: tanyulong2021 <tanyulong@kylinos.cn>
|
||||
Date: Fri, 29 Jul 2022 09:43:36 +0800
|
||||
Subject: [PATCH] update translations text
|
||||
|
||||
---
|
||||
ukui-greeter/greeter/greeterwindow.cpp | 2 +-
|
||||
ukui-greeter/greeter/language.cpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp
|
||||
index 76e6953..15cbacc 100644
|
||||
--- a/ukui-greeter/greeter/greeterwindow.cpp
|
||||
+++ b/ukui-greeter/greeter/greeterwindow.cpp
|
||||
@@ -663,7 +663,7 @@ void GreeterWindow::onLanguageChanged(const Language &language)
|
||||
|
||||
m_greeter->setLang(language.code);
|
||||
|
||||
- m_languageLB->setText(language.name);
|
||||
+ m_languageLB->setText(getLanguage(language.code).name);
|
||||
|
||||
const QFont &font = m_languageLB->font();
|
||||
QFontMetrics fm(font);
|
||||
diff --git a/ukui-greeter/greeter/language.cpp b/ukui-greeter/greeter/language.cpp
|
||||
index 9d55b7f..13ff40f 100644
|
||||
--- a/ukui-greeter/greeter/language.cpp
|
||||
+++ b/ukui-greeter/greeter/language.cpp
|
||||
@@ -107,7 +107,7 @@ LanguagesVector& getLanguages()
|
||||
{
|
||||
static LanguagesVector languagesVector;
|
||||
if(!languagesVector.isEmpty())
|
||||
- return languagesVector;
|
||||
+ languagesVector.clear();
|
||||
|
||||
QProcess process;
|
||||
QString command = "/usr/share/language-tools/language-options";
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 5ff40cb8385571a4a34fb665f990c070feb082e6 Mon Sep 17 00:00:00 2001
|
||||
From: tanyulong2021 <tanyulong@kylinos.cn>
|
||||
Date: Fri, 29 Jul 2022 11:15:04 +0800
|
||||
Subject: [PATCH] fix Dual screen hot plug problem
|
||||
|
||||
---
|
||||
ukui-greeter/ukui-greeter.conf | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/ukui-greeter/ukui-greeter.conf b/ukui-greeter/ukui-greeter.conf
|
||||
index c8094ad..d7b8579 100644
|
||||
--- a/ukui-greeter/ukui-greeter.conf
|
||||
+++ b/ukui-greeter/ukui-greeter.conf
|
||||
@@ -9,3 +9,9 @@ background-color=#035290
|
||||
logo=/usr/share/ukui-greeter/images/logo.png
|
||||
# cof file to use
|
||||
cof=/usr/share/ukui-greeter/images/cof.png
|
||||
+#双屏时设置显示模式
|
||||
+# DISPLAY_MODE_ORI 1
|
||||
+# DISPLAY_MODE_CLONE 2
|
||||
+# DISPLAY_MODE_EXTEND 3
|
||||
+# DISPLAY_MODE_ONLY_OUT 4
|
||||
+display-mode = 3
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Binary file not shown.
BIN
ukui-greeter-3.1.2.tar.gz
Normal file
BIN
ukui-greeter-3.1.2.tar.gz
Normal file
Binary file not shown.
@ -1,17 +1,13 @@
|
||||
%define debug_package %{nil}
|
||||
Name: ukui-greeter
|
||||
Version: 3.0.1
|
||||
Release: 14
|
||||
Version: 3.1.2
|
||||
Release: 1
|
||||
Summary: Lightdm greeter for UKUI
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.ukui.org
|
||||
Source0: ukui-greeter-%{version}.tar.gz
|
||||
Patch1: 0001-Fix-the-display-error-of-mima.patch
|
||||
Patch2: 0002-solve-the-incomplete-display-of-pam-authentication-message.patch
|
||||
Patch3: 0003-update-translations-text.patch
|
||||
Patch4: 0004-fix-Dual-screen-hot-plug-problem.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
|
||||
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: gsettings-qt-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: lightdm
|
||||
Requires: xorg-x11-server-utils
|
||||
@ -30,10 +26,6 @@ A greeter for UKUI desktop environment written by Qt5.
|
||||
provided by biometric-authentication service.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
qmake-qt5
|
||||
@ -51,13 +43,19 @@ gzip -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
|
||||
%files
|
||||
%doc debian/copyright debian/changelog
|
||||
%{_sysconfdir}/lightdm/ukui-greeter.conf
|
||||
%{_sysconfdir}/dbus-1/system.d/org.ukui.Greeter.conf
|
||||
%{_datadir}/man/man8/ukui-greeter.8.gz
|
||||
%{_sbindir}/ukui-greeter
|
||||
%{_datadir}/lightdm/lightdm.conf.d/95-ukui-greeter.conf
|
||||
%{_datadir}/ukui-greeter/
|
||||
%{_datadir}/xgreeters/ukui-greeter.desktop
|
||||
/usr/lib/ukui-greeter/greeter-nm-helper
|
||||
/usr/lib/ukui-greeter/ukui-greeter-nm-start.sh
|
||||
|
||||
%changelog
|
||||
* Wed Nov 23 2022 tanyulong <tanyulong@kylinos.cn> - 3.1.2-1
|
||||
- update upstream version 3.1.2
|
||||
|
||||
* Fri Jul 29 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-14
|
||||
- fix Dual screen hot plug problem
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user