packages/ukui-control-center
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!49 add fix_user_passwd_valid_time_setting_failed_issue.patch

Browse Source 
From: @dou33
Reviewed-by: @tanyulong2021
Signed-off-by: @tanyulong2021
This commit is contained in:
openeuler-ci-bot 2021-09-07 09:23:40 +00:00 committed by Gitee
commit 1238cec26a
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fix_user_passwd_valid_time_setting_failed_issue.patch Normal file
View File

@ -0,0 +1,23 @@
diff -Naur ukui-control-center-3.0.1/plugins/account/userinfo/changevaliddialog.cpp ukui-control-center-3.0.1~/plugins/account/userinfo/changevaliddialog.cpp
--- ukui-control-center-3.0.1/plugins/account/userinfo/changevaliddialog.cpp 2019-05-27 15:48:18.000000000 +0800
+++ ukui-control-center-3.0.1~/plugins/account/userinfo/changevaliddialog.cpp 2021-09-03 18:48:22.196993408 +0800
@@ -155,8 +155,8 @@
if (valid.startsWith(_name)){
QStringList validList = valid.split(" ");
QString lastChangeStr = validList.at(2);
- QStringList lastChangeList = lastChangeStr.split("/");
- lastChangeDate = QDate(QString(lastChangeList.at(2)).toInt(), QString(lastChangeList.at(0)).toInt(), QString(lastChangeList.at(1)).toInt());
+ QStringList lastChangeList = lastChangeStr.split("-");
+ lastChangeDate = QDate(QString(lastChangeList.at(0)).toInt(), QString(lastChangeList.at(1)).toInt(), QString(lastChangeList.at(2)).toInt());
delayDays = QString(validList.at(4)).toInt();
} else {
delayDays = -1;
@@ -201,7 +201,7 @@
ui->yearCombox->clear();
QDate begin = QDate::currentDate().addDays(1);
- QDate canSelect = lastChangeDate.addYears(26);
+ QDate canSelect = lastChangeDate.addYears(70);
ui->yearCombox->addItem(QObject::tr("Never"), 0);
for (int year = begin.year(); year <= canSelect.year(); year++){

8
ukui-control-center.spec
View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: ukui-control-center Name: ukui-control-center
Version: 3.0.1 Version: 3.0.1
Release: 16 Release: 17
Summary: utilities to configure the UKUI desktop Summary: utilities to configure the UKUI desktop
License: GPL-2+ License: GPL-2+
URL: http://www.ukui.org URL: http://www.ukui.org
@ -85,6 +85,7 @@ patch12: 0012-window-add-title-icon.patch
patch13: 0001-fix-compile-extern-C-error.patch patch13: 0001-fix-compile-extern-C-error.patch
patch14: fix_arm_root_user_crash.patch patch14: fix_arm_root_user_crash.patch
patch15: fix_add_group_failed_issue.patch patch15: fix_add_group_failed_issue.patch
patch16: fix_user_passwd_valid_time_setting_failed_issue.patch
Recommends: qt5-qtquickcontrols Recommends: qt5-qtquickcontrols
@ -120,6 +121,8 @@ Suggests: ukui-settings-daemon
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%patch16 -p1
%build %build
qmake-qt5 qmake-qt5
@ -165,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy %{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy
%changelog %changelog
* Mon Sep 6 2021 douyan <douyan@kylinos.cn> - 3.0.1-17
- add fix_user_passwd_valid_time_setting_failed_issue.patch
* Thu Sep 2 2021 douyan <douyan@kylinos.cn> - 3.0.1-16 * Thu Sep 2 2021 douyan <douyan@kylinos.cn> - 3.0.1-16
- fix add group failed issue - fix add group failed issue