diff --git a/0001-fix-icon-misplaced.patch b/0001-fix-icon-misplaced.patch new file mode 100644 index 0000000..e68cfed --- /dev/null +++ b/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 + diff --git a/ukui-screensaver-2.1.1.tar.gz b/ukui-screensaver-2.1.1.tar.gz deleted file mode 100644 index c493200..0000000 Binary files a/ukui-screensaver-2.1.1.tar.gz and /dev/null differ diff --git a/ukui-screensaver-3.0.1.tar.gz b/ukui-screensaver-3.0.1.tar.gz new file mode 100644 index 0000000..6dca62d Binary files /dev/null and b/ukui-screensaver-3.0.1.tar.gz differ diff --git a/ukui-screensaver.spec b/ukui-screensaver.spec index cfaab5e..569258a 100644 --- a/ukui-screensaver.spec +++ b/ukui-screensaver.spec @@ -1,6 +1,6 @@ Name: ukui-screensaver -Version: 2.1.1 -Release: 1 +Version: 3.0.1 +Release: 2 Summary: parallels toolbox for UKUI License: GPL-3+ GPL-2+ URL: http://www.ukui.org @@ -26,6 +26,8 @@ Requires: qt5-qttools-devel Requires: gsettings-qt-devel Requires: dconf-devel +patch0: 0001-fix-icon-misplaced.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, @@ -34,6 +36,7 @@ Requires: dconf-devel %prep %setup -q +%patch0 -p1 %build cmake . @@ -46,7 +49,7 @@ make install DESTDIR=%{buildroot} %clean rm -rf $RPM_BUILD_ROOT -%files +%files %doc debian/copyright debian/changelog %{_bindir}/ukui-screensaver-dialog %{_bindir}/ukui-screensaver-backend @@ -58,9 +61,15 @@ rm -rf $RPM_BUILD_ROOT %{_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 +#%%{_datadir}/ukui-screensaver/screensaver.ini +#%%{_datadir}/ukui-screensaver/screensaver-en.ini %changelog +* Wed Dec 9 2020 lvhan - 3.0.1-2 +- 0001-fix-icon-misplaced.patch + +* Mon Oct 26 2020 douyan - 3.0.1-1 +- update to upstream version 3.0.0-1+1026 + * Thu Jul 9 2020 douyan - 2.1.1-1 - Init package for openEuler