!7 0002-fix-ukui-screensaver-dialog-lock.patch

From: @myshow2258
Reviewed-by: @dou33
Signed-off-by: @dou33

0001-fix-icon-misplaced.patch

@@ -0,0 +1,34 @@
+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
+

0002-fix-ukui-screensaver-dialog-lock.patch

@@ -0,0 +1,26 @@
+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
+

ukui-screensaver.spec

@@ -0,0 +1,80 @@
+Name:           ukui-screensaver
+Version:        3.0.1
+Release:        3
+Summary:        parallels toolbox for UKUI
+License:        GPL-3+ GPL-2+
+URL:            http://www.ukui.org
+Source0:        %{name}-%{version}.tar.gz
+
+BuildRequires: glib2-devel
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtsvg-devel
+BuildRequires: qt5-qtmultimedia-devel
+BuildRequires: qt5-qttools-devel
+BuildRequires: gsettings-qt-devel
+BuildRequires: dconf-devel
+BuildRequires: libXtst-devel
+BuildRequires: cmake
+BuildRequires: qt5-qtx11extras-devel
+BuildRequires: pam-devel
+
+Requires: glib2-devel
+Requires: qt5-qtbase-devel
+Requires: qt5-qtsvg-devel
+Requires: qt5-qtmultimedia-devel
+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,
+ displaying some application notification messages and some cutting
+ storage information.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+
+%build
+cmake .
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%doc debian/copyright debian/changelog
+%{_bindir}/ukui-screensaver-dialog
+%{_bindir}/ukui-screensaver-backend
+%{_bindir}/ukui-screensaver-command
+%{_datadir}/ukui-screensaver/*
+%{_datadir}/glib-2.0/schemas/org.ukui.screensaver.gschema.xml
+%{_sysconfdir}/xdg/autostart/ukui-screensaver.desktop
+%{_datadir}/desktop-directories/ukui-screensaver.directory
+%{_sysconfdir}/xdg/menus/ukui-screensavers.menu
+%{_sysconfdir}/pam.d/ukui-screensaver-qt
+%{_prefix}/lib/ukui-screensaver/ukui-screensaver-default
+#%%{_datadir}/ukui-screensaver/screensaver.ini
+#%%{_datadir}/ukui-screensaver/screensaver-en.ini
+
+%changelog
+* Wed Jan 13 2021 lvhan <lvhan@kylinos.cn> - 3.0.1-3
+- 0002-fix-ukui-screensaver-dialog-lock.patch
+
+* Wed Dec 9 2020 lvhan <lvhan@kylinos.cn> - 3.0.1-2
+- 0001-fix-icon-misplaced.patch
+
+* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.1-1
+- update to upstream version 3.0.0-1+1026
+
+* Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 2.1.1-1
+- Init package for openEuler