diff --git a/0001-add-and-use-attribute-of-UseHighDpiPixmaps.patch b/0001-add-and-use-attribute-of-UseHighDpiPixmaps.patch deleted file mode 100644 index 74fa97d..0000000 --- a/0001-add-and-use-attribute-of-UseHighDpiPixmaps.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 746dea55c9b8465944430ecb8544d2c68b4fd3ab Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Thu, 4 Aug 2022 11:51:36 +0800 -Subject: [PATCH] add and use attribute of UseHighDpiPixmaps - ---- - src/ukui-screensaver-dialog.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/ukui-screensaver-dialog.cpp b/src/ukui-screensaver-dialog.cpp -index cd69513..ad49e1b 100644 ---- a/src/ukui-screensaver-dialog.cpp -+++ b/src/ukui-screensaver-dialog.cpp -@@ -116,6 +116,11 @@ int main(int argc, char *argv[]) - { - checkIsRunning(); - checkIslivecd(); -+ #if(QT_VERSION >= QT_VERSION_CHECK(5,6,0)) -+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -+ QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -+ #endif -+ - QApplication a(argc, argv); - QApplication::setSetuidAllowed(true); - --- -2.33.0 - diff --git a/0002-modify-username-size.patch b/0002-modify-username-size.patch deleted file mode 100644 index 92ad9b2..0000000 --- a/0002-modify-username-size.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d1247bc1d54ad5190a3c977280df84b7e9099012 Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Mon, 8 Aug 2022 11:05:51 +0800 -Subject: [PATCH] increase username size - ---- - src/assets/authdialog.qss | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/assets/authdialog.qss b/src/assets/authdialog.qss -index c01b035..b8a72ae 100644 ---- a/src/assets/authdialog.qss -+++ b/src/assets/authdialog.qss -@@ -22,7 +22,7 @@ QLabel { - - /* 用户名 */ - #login_nameLabel{ -- font-size: 30px; -+ font-size: 24px; - } - - /* 密码输入框 */ --- -2.33.0 - diff --git a/ukui-screensaver-3.0.1.tar.gz b/ukui-screensaver-3.0.1.tar.gz deleted file mode 100644 index 863ea21..0000000 Binary files a/ukui-screensaver-3.0.1.tar.gz and /dev/null differ diff --git a/ukui-screensaver-3.1.1.tar.gz b/ukui-screensaver-3.1.1.tar.gz new file mode 100644 index 0000000..a8da2a1 Binary files /dev/null and b/ukui-screensaver-3.1.1.tar.gz differ diff --git a/ukui-screensaver.spec b/ukui-screensaver.spec index 34afe9e..c386c44 100644 --- a/ukui-screensaver.spec +++ b/ukui-screensaver.spec @@ -1,48 +1,44 @@ Name: ukui-screensaver -Version: 3.0.1 -Release: 22 -Summary: parallels toolbox for UKUI -License: GPL-2.0-or-later and GPL-3.0-or-later +Version: 3.1.1 +Release: 1 +Summary: Screensaver for UKUI desktop environment +License: GPL-3+ and 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 +BuildRequires: cmake +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: pam-devel +BuildRequires: qt5-qttools-devel +BuildRequires: glib2-devel +BuildRequires: opencv +BuildRequires: libX11-devel +BuildRequires: libXtst-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: gsettings-qt-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: libmatemixer-devel +BuildRequires: ukui-interface -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-add-and-use-attribute-of-UseHighDpiPixmaps.patch -patch1: 0002-modify-username-size.patch +Requires: ukui-session-manager +Requires: glib2-devel +Requires: ethtool +Requires: mate-common + %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. - +A simple and lightweight screensaver written by Qt5. +The screensaver supports biometric auhentication which is +provided by biometric-auth service. + %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build cmake . -make +make -j4 %install rm -rf $RPM_BUILD_ROOT @@ -51,22 +47,31 @@ make install DESTDIR=%{buildroot} %clean rm -rf $RPM_BUILD_ROOT +%post +set -e +glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: + + %files %doc debian/copyright debian/changelog %{_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 %{_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 +%{_prefix}/lib/ukui-screensaver/ukui-screensaver-default +%{_prefix}/lib/ukui-screensaver/screensaver-focus-helper %changelog +* Tue Dec 6 2022 peijiankang - 3.1.1-1 +- update version to 3.1.1 + * Mon Aug 08 2022 tanyulong - 3.0.1-22 - modify username size