diff --git a/0001-Fix-the-display-error-of-mima.patch b/0001-Fix-the-display-error-of-mima.patch deleted file mode 100644 index 9204cd4..0000000 --- a/0001-Fix-the-display-error-of-mima.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e9e938f5ebf4779615110332d598060cdf37339c Mon Sep 17 00:00:00 2001 -From: peijiankang -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 - diff --git a/0001-fix-greeter-translation.patch b/0001-fix-greeter-translation.patch new file mode 100644 index 0000000..40900fc --- /dev/null +++ b/0001-fix-greeter-translation.patch @@ -0,0 +1,57 @@ +From 364c3060d2961ae2e5b9ecb6c49f698d59c2b71b Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Fri, 6 Jan 2023 16:23:32 +0800 +Subject: [PATCH] fix greeter translation + +--- + ukui-greeter/greeter/greeterwindow.cpp | 6 +++--- + ukui-greeter/greeter/loginwindow.cpp | 2 +- + ukui-greeter/ukui-greeter.pro | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp +index 39b192f..2fefa9f 100644 +--- a/ukui-greeter/greeter/greeterwindow.cpp ++++ b/ukui-greeter/greeter/greeterwindow.cpp +@@ -783,9 +783,9 @@ void GreeterWindow::updateLanguage(QString userName) + qWarning() << "Get User's language error" << languageReply.error(); + else { + language = languageReply.value().variant().toString(); +- if(!language.isEmpty()){ +- onLanguageChanged(language); +- } ++ if(language.isEmpty()) ++ language = QLocale::system().name(); ++ onLanguageChanged(language); + } + + QDBusReply fomatsLocalReply = userIface.call("Get", "org.freedesktop.Accounts.User", "FormatsLocale"); +diff --git a/ukui-greeter/greeter/loginwindow.cpp b/ukui-greeter/greeter/loginwindow.cpp +index 5c40442..616b081 100644 +--- a/ukui-greeter/greeter/loginwindow.cpp ++++ b/ukui-greeter/greeter/loginwindow.cpp +@@ -708,7 +708,7 @@ void LoginWindow::onShowPrompt(QString text, QLightDM::Greeter::PromptType type) + if (!m_deviceInfo) { + switchLoginOptType(LOGINOPT_TYPE_PASSWORD); + } +- if(text == "Password: "||text == "密码："){ ++ if(text == "Password: "||text == "密码： "){ + text = tr("Password: "); + m_isPassWdInput = true; + } +diff --git a/ukui-greeter/ukui-greeter.pro b/ukui-greeter/ukui-greeter.pro +index b6c8814..fc12b32 100644 +--- a/ukui-greeter/ukui-greeter.pro ++++ b/ukui-greeter/ukui-greeter.pro +@@ -101,7 +101,7 @@ TRANSLATIONS += translations/zh_CN.ts \ + translations/tr.ts \ + translations/es.ts + +-system("lrelease translations/*.ts") ++system("lrelease-qt5 translations/*.ts") + + qm_file.files = translations/*.qm + qm_file.path = $${PREFIX}/translations/ +-- +2.33.0 + diff --git a/0002-fix-login-translation.patch b/0002-fix-login-translation.patch deleted file mode 100644 index fb3764b..0000000 --- a/0002-fix-login-translation.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fac3ce84dbfa94bf9656dce9a95dac65dd99e0bc Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Fri, 14 Oct 2022 13:49:20 +0800 -Subject: [PATCH] fix login translation - ---- - ukui-greeter/greeter/greeterwindow.cpp | 6 +++--- - ukui-greeter/greeter/loginwindow.cpp | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp -index c22fca2..64683d2 100644 ---- a/ukui-greeter/greeter/greeterwindow.cpp -+++ b/ukui-greeter/greeter/greeterwindow.cpp -@@ -571,9 +571,9 @@ void GreeterWindow::updateLanguage(QString userName) - qWarning() << "Get User's language error" << languageReply.error(); - else { - language = languageReply.value().variant().toString(); -- if(!language.isEmpty()){ -- onLanguageChanged(language); -- } -+ if(language.isEmpty()) -+ language = QLocale::system().name(); -+ onLanguageChanged(language); - } - - QDBusReply fomatsLocalReply = userIface.call("Get", "org.freedesktop.Accounts.User", "FormatsLocale"); -diff --git a/ukui-greeter/greeter/loginwindow.cpp b/ukui-greeter/greeter/loginwindow.cpp -index ede06fa..b857bf9 100644 ---- a/ukui-greeter/greeter/loginwindow.cpp -+++ b/ukui-greeter/greeter/loginwindow.cpp -@@ -542,7 +542,7 @@ void LoginWindow::onShowPrompt(QString text, QLightDM::Greeter::PromptType type) - } - text = tr("Password: "); - } -- if(text == "login:") { -+ if(text == "login:" || text == "登录：") { - text = tr("Username"); - m_name = "*login"; - //m_nameLabel->setText(tr("login")); --- -2.36.1 - diff --git a/0002-fix-version-upgraded-the-default-background-is-blank.patch b/0002-fix-version-upgraded-the-default-background-is-blank.patch new file mode 100644 index 0000000..baf6cbf --- /dev/null +++ b/0002-fix-version-upgraded-the-default-background-is-blank.patch @@ -0,0 +1,37 @@ +From e47a9111feb25026cc53373dda67a5e184db19d4 Mon Sep 17 00:00:00 2001 +From: tanyulong2021 +Date: Mon, 6 Feb 2023 09:44:55 +0800 +Subject: [PATCH] fix version upgraded the default background is blank + +--- + ukui-greeter/common/configuration.cpp | 2 +- + ukui-greeter/greeter/greeterwindow.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ukui-greeter/common/configuration.cpp b/ukui-greeter/common/configuration.cpp +index 822b2d9..48e2e4c 100644 +--- a/ukui-greeter/common/configuration.cpp ++++ b/ukui-greeter/common/configuration.cpp +@@ -219,5 +219,5 @@ QPixmap Configuration::getLogo() + + QString Configuration::getDefaultBackgroundName() + { +- return "/usr/share/backgrounds/1-warty-final-ubuntukylin.jpg"; ++ return "/usr/share/backgrounds/warty-final-ubuntukylin.jpg"; + } +diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp +index 2fefa9f..0fe4080 100644 +--- a/ukui-greeter/greeter/greeterwindow.cpp ++++ b/ukui-greeter/greeter/greeterwindow.cpp +@@ -742,7 +742,7 @@ void GreeterWindow::setBackground(const QModelIndex &index) + //如果配置文件不存在，就创建一个 + QSettings settingsbak(userConfigurePath,QSettings::IniFormat); + settingsbak.beginGroup("greeter"); +- settingsbak.setValue("backgroundPath","/usr/share/backgrounds/1-warty-final-ubuntukylin.jpg"); ++ settingsbak.setValue("backgroundPath","/usr/share/backgrounds/warty-final-ubuntukylin.jpg"); + settingsbak.endGroup(); + settingsbak.sync(); + QFile file(userConfigurePath); +-- +2.33.0 + diff --git a/0003-fix-build-compile-error.patch b/0003-fix-build-compile-error.patch new file mode 100644 index 0000000..f43e908 --- /dev/null +++ b/0003-fix-build-compile-error.patch @@ -0,0 +1,25 @@ +From 68a9ba68bd66485bd35a55bb4e7895f941b34658 Mon Sep 17 00:00:00 2001 +From: tanyulong2021 +Date: Wed, 8 Feb 2023 09:19:00 +0800 +Subject: [PATCH] fix build compile error + +--- + ukui-greeter/BiometricAuth/giodbus.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ukui-greeter/BiometricAuth/giodbus.cpp b/ukui-greeter/BiometricAuth/giodbus.cpp +index 8406b29..5d3ae79 100644 +--- a/ukui-greeter/BiometricAuth/giodbus.cpp ++++ b/ukui-greeter/BiometricAuth/giodbus.cpp +@@ -19,7 +19,7 @@ + + #include "giodbus.h" + #include +-#include ++#include + #include + + int get_server_gvariant_stdout (int drvid) +-- +2.33.0 + diff --git a/0004-Fix-the-problem-that-the-login-interface-will-flash-back.patch b/0004-Fix-the-problem-that-the-login-interface-will-flash-back.patch new file mode 100644 index 0000000..ba0238e --- /dev/null +++ b/0004-Fix-the-problem-that-the-login-interface-will-flash-back.patch @@ -0,0 +1,24 @@ +From bd1cc7c4fd0812f498413fbeb54f7dd792508501 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Fri, 10 Mar 2023 10:25:34 +0800 +Subject: [PATCH] Fix the problem that the login interface will flash back + +--- + ukui-greeter/greeter/main.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ukui-greeter/greeter/main.cpp b/ukui-greeter/greeter/main.cpp +index 102b41b..fa1bd13 100644 +--- a/ukui-greeter/greeter/main.cpp ++++ b/ukui-greeter/greeter/main.cpp +@@ -193,6 +193,7 @@ void XsettingsHidpi() + + int main(int argc, char *argv[]) + { ++ system("xhost +"); + qputenv("QT_QPA_PLATFORMTHEME",QByteArray("ukui")); + + QDateTime dateTime = QDateTime::currentDateTime(); +-- +2.39.1 + diff --git a/fix-greeter-translation.patch b/fix-greeter-translation.patch deleted file mode 100644 index 36c1501..0000000 --- a/fix-greeter-translation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ukui-greeter-3.0.3/ukui-greeter/ukui-greeter.pro ukui-greeter-3.0.3~/ukui-greeter/ukui-greeter.pro ---- ukui-greeter-3.0.3/ukui-greeter/ukui-greeter.pro 2021-11-04 16:30:48.000000000 +0800 -+++ ukui-greeter-3.0.3~/ukui-greeter/ukui-greeter.pro 2022-03-09 11:08:08.466207441 +0800 -@@ -86,7 +86,7 @@ - translations/tr.ts \ - translations/es.ts - --system("lrelease translations/*.ts") -+system("lrelease-qt5 translations/*.ts") - - qm_file.files = translations/*.qm - qm_file.path = $${PREFIX}/translations/ diff --git a/ukui-greeter-3.0.3.tar.gz b/ukui-greeter-3.0.3.tar.gz deleted file mode 100644 index 0d0c159..0000000 Binary files a/ukui-greeter-3.0.3.tar.gz and /dev/null differ diff --git a/ukui-greeter-3.1.2.tar.gz b/ukui-greeter-3.1.2.tar.gz new file mode 100644 index 0000000..ac676d6 Binary files /dev/null and b/ukui-greeter-3.1.2.tar.gz differ diff --git a/ukui-greeter.spec b/ukui-greeter.spec index c8ecdaa..34e79f8 100644 --- a/ukui-greeter.spec +++ b/ukui-greeter.spec @@ -1,17 +1,22 @@ -%define debug_package %{nil} Name: ukui-greeter -Version: 3.0.3 -Release: 4 +Version: 3.1.2 +Release: 7 Summary: Lightdm greeter for UKUI License: GPL-2.0-or-later URL: http://www.ukui.org Source0: ukui-greeter-%{version}.tar.gz -Patch0: fix-greeter-translation.patch -Patch1: 0001-Fix-the-display-error-of-mima.patch -Patch2: 0002-fix-login-translation.patch +Patch01: 0001-fix-greeter-translation.patch +Patch02: 0002-fix-version-upgraded-the-default-background-is-blank.patch +#Patch03: 0003-fix-build-compile-error.patch +Patch04: 0004-Fix-the-problem-that-the-login-interface-will-flash-back.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 -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 +BuildRequires: gsettings-qt-devel +Requires: pkgconf +Requires: xorg-x11-drivers Requires: lightdm +Requires: opencv +Requires: ethtool Requires: xorg-x11-server-utils Requires: xorg-x11-server Requires: xorg-x11-xauth @@ -22,20 +27,20 @@ Requires: xorg-x11-xkb-utils Provides: lightdm-greeter - %description A greeter for UKUI desktop environment written by Qt5. The greeter supports biometric authentication which is provided by biometric-authentication service. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch01 -p1 +%patch02 -p1 +#%%patch03 -p1 +%patch04 -p1 %build qmake-qt5 -make +make -j4 %install make INSTALL_ROOT=%{buildroot} install @@ -44,29 +49,58 @@ mkdir -p %{buildroot}/usr/share/man/man8/ gzip -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-greeter.8.gz %clean -##[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %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 -* Fri Oct 14 2022 peijiankang - 3.0.3-4 -- fix login translation +* Tue Mar 14 2023 douyan - 3.1.2-7 +- remove unnecessary requires -* Fri Jul 15 2022 peijiankang - 3.0.3-3 -- Fix the display error of mima +* Fri Mar 10 2023 peijiankang - 3.1.2-6 +- Fix the problem that the login interface will flash back -* Wed Mar 9 2022 douyan - 3.0.3-2 -- add fix-greeter-translation.patch +* Wed Feb 08 2023 tanyulong - 3.1.2-5 +- Enable debuginfo for fix strip -* Tue Jan 25 2022 douyan - 3.0.3-1 -- update to upstream version 3.0.3-1 +* Wed Feb 08 2023 tanyulong - 3.1.2-4 +- fix build compile error + +* Mon Feb 06 2023 tanyulong - 3.1.2-3 +- fix version upgraded the default background is blank + +* Fri Jan 6 2023 peijiankang - 3.1.2-2 +- fix greeter translation + +* Wed Nov 23 2022 tanyulong - 3.1.2-1 +- update upstream version 3.1.2 + +* Fri Jul 29 2022 tanyulong - 3.0.1-14 +- fix Dual screen hot plug problem + +* Fri Jul 29 2022 tanyulong - 3.0.1-13 +- update translations text + +* Thu Jul 28 2022 tanyulong - 3.0.1-12 +- solve the incomplete display of pam authentication message + +* Fri Jul 15 2022 peijiankang - 3.0.1-11 +- Fix the display error of mima + +* Fri May 20 2022 tanyulong - 3.0.1-10 +- Improve the project according to the requirements of compliance improvement + +* Tue Mar 29 2022 huayadong - 3.0.1-9 +- 当用户名显示较长时，完整用户名通过tooltip显示 * Fri Dec 10 2021 huayadong - 3.0.1-8 - add patch6:0001-add-pending-sleep-1126.patch diff --git a/ukui-greeter.yaml b/ukui-greeter.yaml new file mode 100644 index 0000000..dd5a919 --- /dev/null +++ b/ukui-greeter.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: ukui/ukui-greeter +tag_prefix: "^v" +separator: "." +