!27 update to version 3.0.3

From: @dou33 
Reviewed-by: @ 
Signed-off-by: @pei-jiankang
This commit is contained in:
openeuler-ci-bot 2022-02-23 04:29:56 +00:00 committed by Gitee
commit 4cc12a73e5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 53 additions and 67 deletions

View File

@ -1,34 +0,0 @@
From 92214058d11321cfc55613d588e47b8e33b942cc Mon Sep 17 00:00:00 2001
From: myshow <296570182@qq.com>
Date: Wed, 9 Dec 2020 10:53:02 +0800
Subject: [PATCH] fix-icon-misplaced
---
src/lockwidget.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
index d6a66c0..9a62ef7 100644
--- a/src/lockwidget.cpp
+++ b/src/lockwidget.cpp
@@ -187,7 +187,7 @@ void LockWidget::showPowerManager()
authDialog->show();
powermanager->hide();
}
- else{
+ else{
authDialog->hide();
powermanager->show();
powermanager->setGeometry((width()-ITEM_WIDTH*5)/2,
@@ -227,7 +227,7 @@ void LockWidget::initUserMenu()
* qt5.6上qmenu文字以图标左方为起点20.04上文字以图标右方为起点,所以
* qt5.6时,左边距要设置大一点,避免与图标重合
*/
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
usersMenu->setStyleSheet("QMenu::item{padding: 2px 10px 2px 10px;}");
#else
usersMenu->setStyleSheet("QMenu::item{padding: 2px 10px 2px 30px;}");
--
2.29.2.windows.2

View File

@ -1,26 +0,0 @@
From 39459bf543d45644426885ae98641fa26ea0ab55 Mon Sep 17 00:00:00 2001
From: lvhan <lvhan@kylinos.cn>
Date: Wed, 13 Jan 2021 14:31:46 +0800
Subject: [PATCH] fix-ukui-screensaver-dialog--lock
---
src/ukui-screensaver-dialog.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/ukui-screensaver-dialog.cpp b/src/ukui-screensaver-dialog.cpp
index 2baad4b..237b377 100644
--- a/src/ukui-screensaver-dialog.cpp
+++ b/src/ukui-screensaver-dialog.cpp
@@ -174,7 +174,8 @@ int main(int argc, char *argv[])
if(parser.isSet(lockOption))
{
- window->lock();
+ // window->lock();
+ window->onScreensaver();
}
if(parser.isSet(sessionIdleOption))
--
2.29.2.windows.2

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: ukui-screensaver
Version: 3.0.1
Release: 3
Version: 3.0.3
Release: 1
Summary: parallels toolbox for UKUI
License: GPL-3+ GPL-2+
URL: http://www.ukui.org
@ -17,6 +17,9 @@ BuildRequires: libXtst-devel
BuildRequires: cmake
BuildRequires: qt5-qtx11extras-devel
BuildRequires: pam-devel
BuildRequires: opencv
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: libmatemixer-devel
Requires: glib2-devel
Requires: qt5-qtbase-devel
@ -26,9 +29,6 @@ Requires: qt5-qttools-devel
Requires: gsettings-qt-devel
Requires: dconf-devel
patch0: 0001-fix-icon-misplaced.patch
patch1: 0002-fix-ukui-screensaver-dialog-lock.patch
%description
The ukui-sidebar is mainly used in the desktop operating system.
It pops up from the right side of the desktop in the form of a tray,
@ -37,8 +37,6 @@ patch1: 0002-fix-ukui-screensaver-dialog-lock.patch
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
cmake .
@ -56,6 +54,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/ukui-screensaver-dialog
%{_bindir}/ukui-screensaver-backend
%{_bindir}/ukui-screensaver-command
%{_bindir}/screensaver-startup.sh
%{_bindir}/ukui-screensaver-checkpass
%{_datadir}/ukui-screensaver/*
%{_datadir}/glib-2.0/schemas/org.ukui.screensaver.gschema.xml
%{_sysconfdir}/xdg/autostart/ukui-screensaver.desktop
@ -63,10 +63,56 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/xdg/menus/ukui-screensavers.menu
%{_sysconfdir}/pam.d/ukui-screensaver-qt
%{_prefix}/lib/ukui-screensaver/ukui-screensaver-default
%{_prefix}/lib/ukui-screensaver/screensaver-focus-helper
#%%{_datadir}/ukui-screensaver/screensaver.ini
#%%{_datadir}/ukui-screensaver/screensaver-en.ini
%changelog
* Wed Feb 23 2022 douyan <douyan@kylinos.cn> - 3.0.3-1
- update to upstream version 3.0.3-1
* Fri Dec 10 2021 huayadong <huayadong@kylinos.cn> - 3.0.1-17
- add patch15: 0001-insert-the-monitor-after-placement-and-the-screensav.patch
* Thu Dec 09 2021 huayadong <huayadong@kylinos.cn> - 3.0.1-16
- add patch14: fix-root-can-not-input-passwd-bug.patch
* Thu Dec 09 2021 huayadong <huayadong@kylinos.cn> - 3.0.1-15
- add patch13:fix-root-user-had-not-face-icon.patch
* Tue Dec 07 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-14
- Update changelog package version
* Fri Dec 03 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-13
- add build requires packages
* Thu Dec 02 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-12
- Add .gitattriutes files
* Wed Nov 10 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-11
- Add opencv compilation dependency
* Fri Nov 05 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-10
- there is only one user, the switch user button is not displayed
* Tue Nov 02 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-9
- Screen saver add x11bypasswindowmanager attribute
* Mon Nov 1 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-8
- When the screen saver mode is set to single, but the screen saver is empty, the problem of segfault
* Sat Oct 30 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-7
- Add fractional scaling parameters
* Sat Oct 30 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-6
- Add sentence author info
* Fri Oct 29 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-5
- No the file .gitmodules,so remove in debian/copyright file
* Thu Oct 28 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-4
- Fix a return type error
* Wed Jan 13 2021 lvhan <lvhan@kylinos.cn> - 3.0.1-3
- 0002-fix-ukui-screensaver-dialog-lock.patch