diff --git a/0001-fix-greeter-translation.patch b/0001-fix-greeter-translation.patch deleted file mode 100644 index 40900fcb73b65e554b247cde12ce6e8aa3f0fb50..0000000000000000000000000000000000000000 --- a/0001-fix-greeter-translation.patch +++ /dev/null @@ -1,57 +0,0 @@ -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-version-upgraded-the-default-background-is-blank.patch b/0002-fix-version-upgraded-the-default-background-is-blank.patch deleted file mode 100644 index baf6cbff688f904ef3a7669718fe6058c8e1bb58..0000000000000000000000000000000000000000 --- a/0002-fix-version-upgraded-the-default-background-is-blank.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index f43e908bbe0296058e164eb3c0a08a8eecd37017..0000000000000000000000000000000000000000 --- a/0003-fix-build-compile-error.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index ba0238eacf959afb8b5749a93f473fb7bbc22b23..0000000000000000000000000000000000000000 --- a/0004-Fix-the-problem-that-the-login-interface-will-flash-back.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/disable-Suspend-and-Sleep-of-ukui-greeter.patch b/disable-Suspend-and-Sleep-of-ukui-greeter.patch deleted file mode 100644 index c04f261ebf2a0caeb432287264b5b92fb5aef37e..0000000000000000000000000000000000000000 --- a/disable-Suspend-and-Sleep-of-ukui-greeter.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 53a0dcf9936e23aba31e85e232ddb3a00ee8160c Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Wed, 14 Jun 2023 15:27:22 +0800 -Subject: [PATCH] disable Suspend and Sleep of ukui-greeter - ---- - ukui-greeter/greeter/powerwindow.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/ukui-greeter/greeter/powerwindow.cpp b/ukui-greeter/greeter/powerwindow.cpp -index 81fa29f..d11e350 100644 ---- a/ukui-greeter/greeter/powerwindow.cpp -+++ b/ukui-greeter/greeter/powerwindow.cpp -@@ -237,7 +237,7 @@ void PowerManager::initUI() - QVBoxLayout *shutdownlayout = new QVBoxLayout(shutdownWidget); - shutdownlayout->addWidget(shutdownFace); - shutdownlayout->addWidget(shutdownLabel); -- -+/* - if(m_power->canHibernate()) { - hibernateWidget = new QWidget(this); - hibernateWidget->setObjectName("hibernateWidget"); -@@ -271,7 +271,7 @@ void PowerManager::initUI() - suspendlayout->addWidget(suspendFace); - suspendlayout->addWidget(suspendLabel); - } -- -+*/ - - // if(userCount>1){ - // QListWidgetItem *item0 = new QListWidgetItem(); -@@ -279,6 +279,7 @@ void PowerManager::initUI() - // insertItem(this->count(), item0); - // setItemWidget(item0, switchWidget); - // } -+/* - if(m_power->canHibernate()){ - QListWidgetItem *item1 = new QListWidgetItem(); - item1->setSizeHint(QSize(ITEM_WIDTH, ITEM_HEIGHT)); -@@ -292,7 +293,7 @@ void PowerManager::initUI() - insertItem(this->count(), item0); - setItemWidget(item0, suspendWidget); - } -- -+*/ - QListWidgetItem *item2 = new QListWidgetItem(); - item2->setSizeHint(QSize(ITEM_WIDTH, ITEM_HEIGHT)); - insertItem(this->count(), item2); --- -2.33.0 - diff --git a/fix-date-and-nm-of-greeter.patch b/fix-date-and-nm-of-greeter.patch deleted file mode 100644 index 49669800ebb9bdcd8cbd86d341561423b43e89a5..0000000000000000000000000000000000000000 --- a/fix-date-and-nm-of-greeter.patch +++ /dev/null @@ -1,111 +0,0 @@ -From a156505e911a65c3933d58707ff39ada1476e08c Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Thu, 6 Jul 2023 17:45:41 +0800 -Subject: [PATCH] fix date and nm of greeter - ---- - ukui-greeter/greeter/greeterwindow.cpp | 36 ++++++++++++++++---------- - ukui-greeter/kylin-nm/src/kylinnm.cpp | 7 +++++ - ukui-greeter/kylin-nm/src/kylinnm.h | 2 +- - 3 files changed, 31 insertions(+), 14 deletions(-) - -diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp -index 0fe4080..54e81d9 100644 ---- a/ukui-greeter/greeter/greeterwindow.cpp -+++ b/ukui-greeter/greeter/greeterwindow.cpp -@@ -793,16 +793,13 @@ void GreeterWindow::updateLanguage(QString userName) - qWarning() << "Get User's language error" << languageReply.error(); - else { - formatsLocale = fomatsLocalReply.value().variant().toString(); -- if(!formatsLocale.isEmpty()){ -- if(formatsLocale.startsWith("zh")){ -- local = QLocale::Chinese; -- } -- else{ -- local = QLocale::English; -+ if(formatsLocale.isEmpty()) -+ formatsLocale = QLocale::system().name(); -+ if(formatsLocale.startsWith("zh")) -+ local = QLocale::Chinese; -+ else -+ local = QLocale::English; - } -- } -- } -- - } - } - -@@ -866,9 +863,17 @@ void GreeterWindow::onCurrentUserChanged(const QModelIndex &index) - } - } - -- if(realName == "*guest" || realName == "*login") -- return; -- -+ if(realName == "*guest" || realName == "*login"){ -+ QString language = QLocale::system().name(); -+ onLanguageChanged(language); -+ if(language.startsWith("zh")) -+ local = QLocale::Chinese; -+ else -+ local = QLocale::English; -+ timeType=24; -+ dataType = "cn"; -+ return; -+ } - updateLanguage(realName); - Q_EMIT currentUserChange(realName); - if(!m_sessionHasChanged && m_sessionsModel->rowCount() > 1) -@@ -879,6 +884,10 @@ void GreeterWindow::onCurrentUserChanged(const QModelIndex &index) - m_configuration->getCurrentUser(realName); - timeType = m_configuration->getTimetp("timeType").toInt(); - dataType = m_configuration->getTimetp("dateType").toString(); -+ if(timeType == 0) -+ timeType = 24; -+ if(dataType == "") -+ dataType = "cn"; - timer = new QTimer(this); - connect(timer, &QTimer::timeout, this, [&]{ - if(timeType == 12){ -@@ -1065,7 +1074,8 @@ void GreeterWindow::onLanguageChanged(QString languageCode) - qApp->installTranslator(m_configuration->m_trans); - - m_greeter->setLang(languageCode); -- -+ if(m_kylinNM) -+ m_kylinNM->updatetext(); - } - - void GreeterWindow::showSessionWnd() -diff --git a/ukui-greeter/kylin-nm/src/kylinnm.cpp b/ukui-greeter/kylin-nm/src/kylinnm.cpp -index ee3e29e..1ede7aa 100644 ---- a/ukui-greeter/kylin-nm/src/kylinnm.cpp -+++ b/ukui-greeter/kylin-nm/src/kylinnm.cpp -@@ -2676,3 +2676,10 @@ void KylinNM::showEvent(QShowEvent *event) - { - on_btnWifiList_clicked(); - } -+ -+void KylinNM::updatetext() -+{ -+ lbNetListText->setText(tr("LAN")); -+ -+ lbWifiListText->setText(tr("WLAN")); -+} -diff --git a/ukui-greeter/kylin-nm/src/kylinnm.h b/ukui-greeter/kylin-nm/src/kylinnm.h -index 28803f7..c459ee9 100644 ---- a/ukui-greeter/kylin-nm/src/kylinnm.h -+++ b/ukui-greeter/kylin-nm/src/kylinnm.h -@@ -182,7 +182,7 @@ public: - void updateNetList(); - - int getConnectStatus();//获取网络连接状态，返回值 -1 无连接； 0 有线连接； 1无线连接； 2有线和无线都已连接 -- -+ void updatetext(); - QIcon iconLanOnline, iconLanOffline; - QIcon iconWifiFull, iconWifiHigh, iconWifiMedium, iconWifiLow; - QIcon iconConnecting; --- -2.33.0 - diff --git a/translation-error-about-Login.patch b/translation-error-about-Login.patch deleted file mode 100644 index 2d073128b06f5976a4232274ad39caff7c60178c..0000000000000000000000000000000000000000 --- a/translation-error-about-Login.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 447b041f473a590a92b900e6a63e5365ba7783ca Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Thu, 15 Jun 2023 20:37:40 +0800 -Subject: [PATCH] fix translation error about Login - ---- - 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 616b081..4ab27b7 100644 ---- a/ukui-greeter/greeter/loginwindow.cpp -+++ b/ukui-greeter/greeter/loginwindow.cpp -@@ -712,7 +712,7 @@ void LoginWindow::onShowPrompt(QString text, QLightDM::Greeter::PromptType type) - text = tr("Password: "); - m_isPassWdInput = true; - } -- if(text == "login:") { -+ if(text == "login:" || text == "登录：") { - text = tr("Username"); - m_name = "*login"; - //m_nameLabel->setText(tr("login")); --- -2.33.0 - diff --git a/ukui-greeter-3.1.2.tar.gz b/ukui-greeter-4.0.0.0.tar.gz similarity index 31% rename from ukui-greeter-3.1.2.tar.gz rename to ukui-greeter-4.0.0.0.tar.gz index ac676d64be6f9944ccff3a51418aaca1693ba952..e0988f542b539a9c789433cec4ca33f2647c213b 100644 Binary files a/ukui-greeter-3.1.2.tar.gz and b/ukui-greeter-4.0.0.0.tar.gz differ diff --git a/ukui-greeter.spec b/ukui-greeter.spec index c0564f3b9e87c8de5d7869dba5433f0bc2da6dba..dc6e8241b80f641383edcd2ff409bd6a903d6799 100644 --- a/ukui-greeter.spec +++ b/ukui-greeter.spec @@ -1,34 +1,39 @@ Name: ukui-greeter -Version: 3.1.2 -Release: 11 +Version: 4.0.0.0 +Release: 1 Summary: Lightdm greeter for UKUI License: GPL-2.0-or-later URL: http://www.ukui.org Source0: ukui-greeter-%{version}.tar.gz -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 -%if 0%{?kylin} -Patch05: disable-Suspend-and-Sleep-of-ukui-greeter.patch -%endif -Patch06: translation-error-about-Login.patch -Patch07: fix-date-and-nm-of-greeter.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: glib2-devel 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 -Requires: xorg-x11-xinit -Requires: xorg-x11-proto-devel -Requires: xorg-x11-drv-libinput -Requires: xorg-x11-xkb-utils +BuildRequires: imlib2-devel +BuildRequires: lightdm-qt5-devel +BuildRequires: opencv +BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: libX11-devel +BuildRequires: libXi-devel +BuildRequires: libXrandr-devel +BuildRequires: libXtst-devel +BuildRequires: pkg-config +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: libkylin-nm-base +BuildRequires: NetworkManager-libnm-devel +BuildRequires: kf5-networkmanager-qt-devel +BuildRequires: kylin-nm-plugin +BuildRequires: ukui-input-gather +BuildRequires: libinput-devel +BuildRequires: libkysdk-sysinfo-devel +BuildRequires: libukuiinputgatherclient-devel +BuildRequires: qt5-linguist +BuildRequires: qt5-qtsensors-devel +Requires: ethtool +Requires: libpam-biometric >= 3.20.0.10 +Requires: ukui-input-gather Provides: lightdm-greeter %description @@ -37,23 +42,11 @@ A greeter for UKUI desktop environment written by Qt5. provided by biometric-authentication service. %prep %setup -q -%patch01 -p1 -%patch02 -p1 -if [ -e "/usr/include/glib-2.0/gio/gunixfdlist.h" ]; then -%patch03 -p1 -fi -%patch04 -p1 -%if 0%{?kylin} -%patch05 -p1 -%endif -%patch06 -p1 -%patch07 -p1 %build %{qmake_qt5} %{make_build} - %install make INSTALL_ROOT=%{buildroot} install @@ -65,16 +58,17 @@ 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 +%{_prefix}/lib/lightdm/lightdm-session-setup.sh %changelog +* Tue Apr 02 2024 huayadong - 4.0.0.0-1 +- update version to 4.0.0.0 + * Mon Jul 10 2023 peijiankang - 3.1.2-11 - Type:Bugfix - ID:NA