0001-use-QRandomGenerator-to-generate-random-numbers.patch

@@ -1,139 +0,0 @@
-From bc6119282e36cd9392db81f85d227bb7367a57bd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
-Date: Fri, 26 Apr 2024 10:44:42 +0800
-Subject: [PATCH] use QRandomGenerator to generate random numbers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
----
- screensaver/mbackground.cpp |  5 +++--
- screensaver/screensaver.cpp | 12 ++++++------
- screensaver/screensaver.h   |  2 ++
- src/configuration.cpp       |  7 ++++---
- 4 files changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/screensaver/mbackground.cpp b/screensaver/mbackground.cpp
-index a1e6553..00efebe 100644
---- a/screensaver/mbackground.cpp
-+++ b/screensaver/mbackground.cpp
-@@ -23,6 +23,7 @@
- #include <QByteArray>
- #include <QImageReader>
- #include <QStringList>
-+#include <QRandomGenerator>
- 
- #include <ctime>
- #include "mbackground.h"
-@@ -82,8 +83,8 @@ QString MBackground::getRand()
- {
-     if(list.count() <= 0)
-         return "";
--    qsrand(time(NULL));
--    currentIndex = qrand() % list.count();
-+    QRandomGenerator rand1(time(NULL));
-+    currentIndex = rand1.generate() % list.count();
- 
-     return list.at(currentIndex);
- }
-diff --git a/screensaver/screensaver.cpp b/screensaver/screensaver.cpp
-index c6ec6d4..f38b841 100644
---- a/screensaver/screensaver.cpp
-+++ b/screensaver/screensaver.cpp
-@@ -92,13 +92,13 @@ Screensaver::Screensaver(QWidget *parent):
-   process(nullptr),
-   screenLabel(nullptr),
-   respondClick(false),
--  m_weatherManager(new WeatherManager(this))
-+  m_weatherManager(new WeatherManager(this)),
-+  m_rand(QTime(0,0,0).secsTo(QTime::currentTime()))
- {
-     installEventFilter(this);
-   //  setWindowFlags(Qt::X11BypassWindowManagerHint);
-     setUpdateCenterWidget();
-     setMouseTracking(true);
--    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
- 
-     isCustom        =  configuration->getIsCustom();
-     if(isCustom){
-@@ -548,9 +548,9 @@ void Screensaver::setRandomPos()
-     int x = 0;
-     int y = 0;
-     if(x2 > x1)
--        x = qrand()%(x2 - x1) + x1;
-+        x = m_rand.generate()%(x2 - x1) + x1;
-     if(y2 > y1)
--        y = qrand()%(y2 - y1) + y1;
-+        y = m_rand.generate()%(y2 - y1) + y1;
- 	
-     myTextWidget->move(x,y);
- 
-@@ -650,7 +650,7 @@ void Screensaver::startSwitchImages()
-             switchTimer = new QTimer(this);
-             connect(switchTimer, &QTimer::timeout, this, [&]{
-                 if(isAutoSwitch){
--                    int index = qrand() % imagePaths.count();
-+                    int index = m_rand.generate() % imagePaths.count();
-                     background  = QPixmap(imagePaths.at(index));
-                 }else{
-                     if(currentIndex>=imagePaths.count() - 1 || currentIndex<0){
-@@ -700,7 +700,7 @@ void Screensaver::updateCenterWidget(int index)
-         return;
- 
-     if(index<=1){
--        index = qrand() % qlist.count() + 1;
-+        index = m_rand.generate() % qlist.count() + 1;
-     }
-     qsettings->beginGroup(QString::number(index));
-     if(qsettings->contains("OL")){
-diff --git a/screensaver/screensaver.h b/screensaver/screensaver.h
-index 07cc994..ce5036c 100644
---- a/screensaver/screensaver.h
-+++ b/screensaver/screensaver.h
-@@ -30,6 +30,7 @@
- #include <QSplitterHandle>
- #include <QSplitter>
- #include <QTime>
-+#include <QRandomGenerator>
- 
- #include "sleeptime.h"
- #include "chinesedate.h"
-@@ -143,6 +144,7 @@ private:
-     QLabel *m_labelNoticeIcon;
-     QLabel *m_labelNoticeMessage;
-     int                 currentIndex = 0;
-+    QRandomGenerator m_rand;
- protected:
-     void paintEvent(QPaintEvent *event);
-     void resizeEvent(QResizeEvent *event);
-diff --git a/src/configuration.cpp b/src/configuration.cpp
-index ac964a0..dcc6e6a 100644
---- a/src/configuration.cpp
-+++ b/src/configuration.cpp
-@@ -25,6 +25,7 @@
- #include <QGSettings>
- #include <QMimeType>
- #include <ctime>
-+#include <QRandomGenerator>
- 
- #include "commonfunc.h"
- #define GSETTINGS_SCHEMA_SCREENSAVER "org.ukui.screensaver"
-@@ -143,11 +144,11 @@ ScreenSaver *Configuration::getScreensaver()
-             saver->path = "/usr/lib/ukui-screensaver/ukui-screensaver-default";
-             break;
-         }
--        qsrand((unsigned)time(0));
--        int index = qrand() % themes.count();
-+	QRandomGenerator rand1(time(0));
-+        int index = rand1.generate() % themes.count();
-         while(QString::compare(themes[index], "kyccss-personal-slideshow")==0)
-         {
--            index = qrand() % themes.count();
-+            index = rand1.generate() % themes.count();
-         }
-         saver->path = getXScreensaverPath(themes[index]);
-         break;
--- 
-2.43.0
-

0002-fix-build-compile-error.patch

@@ -1,24 +0,0 @@
-From 6f41615756a3793420918265fba01148eab4b42b Mon Sep 17 00:00:00 2001
-From: tanyulong2021 <tanyulong@kylinos.cn>
-Date: Fri, 10 Feb 2023 09:56:04 +0800
-Subject: [PATCH] fix build compile error
-
----
- BiometricAuth/giodbus.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/BiometricAuth/giodbus.cpp b/BiometricAuth/giodbus.cpp
-index 9e0490e..4ad8d27 100644
---- a/BiometricAuth/giodbus.cpp
-+++ b/BiometricAuth/giodbus.cpp
-@@ -1,6 +1,6 @@
- #include "giodbus.h"
- #include <gio/gio.h>
--#include <gio-unix-2.0/gio/gunixfdlist.h>
-+#include <glib-2.0/gio/gunixfdlist.h>
- #include <glib.h>
- 
- int get_server_gvariant_stdout (int drvid)
--- 
-2.33.0
-

add-switchuser-no-limits-in-ukui-screensaver.patch

@@ -1,26 +0,0 @@
-From ad431e316a1905b17509cc8f69040380e3fde9cb Mon Sep 17 00:00:00 2001
-From: peijiankang <peijiankang@kylinos.cn>
-Date: Mon, 4 Sep 2023 20:45:12 +0800
-Subject: [PATCH] add switchuser no limits in ukui-screensaver
-
----
- src/lockwidget.cpp | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
-index ac11367..2e9a415 100644
---- a/src/lockwidget.cpp
-+++ b/src/lockwidget.cpp
-@@ -81,9 +81,6 @@ LockWidget::LockWidget(QWidget *parent)
-     this->installEventFilter(this);
-     initUI();
- 
--    if(users->getUsers().count() < 2){
--        ui->btnSwitchUser->hide();
--    }
- }
- 
- LockWidget::~LockWidget()
--- 
-2.33.0
-

disable-Suspend-and-Sleep-of-ukui-screensaver.patch

@@ -1,36 +0,0 @@
-From b38417c0327894a8165a9ea7eda7db4cbf01531a Mon Sep 17 00:00:00 2001
-From: peijiankang <peijiankang@kylinos.cn>
-Date: Wed, 14 Jun 2023 15:55:43 +0800
-Subject: [PATCH] disable Suspend and Sleep of ukui-screensaver
-
----
- src/powermanager.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/powermanager.cpp b/src/powermanager.cpp
-index 5b3a23f..e854112 100644
---- a/src/powermanager.cpp
-+++ b/src/powermanager.cpp
-@@ -59,7 +59,7 @@ PowerManager::PowerManager(QWidget *parent)
-                                           "org.gnome.SessionManager",
-                                           QDBusConnection::sessionBus(),
-                                           this);
--
-+/*
-     loginInterface = new QDBusInterface(login1Service,
-                                         login1Path,
-                                         login1ManagerInterface,
-@@ -79,7 +79,9 @@ PowerManager::PowerManager(QWidget *parent)
-     }else{
-         canHibernate = false;
-     }
--
-+*/
-+    canSuspend = false;
-+    canHibernate = false;
-     initUI();
-     resize((ITEM_WIDTH+ITEM_SPACING*2)*this->count()-ITEM_SPACING*2, ITEM_HEIGHT+ITEM_SPACING*2);
-     //setCurrentRow(0);
--- 
-2.33.0
-

ukui-screensaver.spec

@@ -1,17 +1,12 @@
 Name:           ukui-screensaver
 Version:        3.1.1
-Release:        7
+Release:        2
 Summary:        Screensaver for UKUI desktop environment
 License:        GPL-3+ and GPL-2+
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
 Patch01:        0001-fix-root-can-not-input-passwd-bug.patch
-Patch02:        0002-fix-build-compile-error.patch
-%if 0%{?kylin}
-Patch03:        disable-Suspend-and-Sleep-of-ukui-screensaver.patch
-Patch04:        add-switchuser-no-limits-in-ukui-screensaver.patch
-%endif
-Patch05:	0001-use-QRandomGenerator-to-generate-random-numbers.patch
+
 BuildRequires:  cmake
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtx11extras-devel
@@ -41,19 +36,11 @@ provided by biometric-auth service.
                                                             
 %prep
 %setup -q
-%patch 1 -p1
-if [ -e "/usr/include/glib-2.0/gio/gunixfdlist.h" ]; then
-%patch 2 -p1
-fi
-%if 0%{?kylin}
-%patch 3 -p1
-%patch 4 -p1
-%endif
-%patch 5 -p1
+%patch1 -p1
 
 %build
 cmake .
-%{make_build}
+make -j4
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,27 +71,6 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||:
 %{_prefix}/lib/ukui-screensaver/screensaver-focus-helper
 
 %changelog
-* Fri Apr 26 2024 houhongxun <houhongxun@kylinos.cn> - 3.1.1-7
-- use QRandomGenerator to generate random numbers
-
-* Mon Sep 04 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-6
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:add patch3:add-switchuser-no-limits-in-ukui-screensaver.patch
-
-* Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-5
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: disable Suspend and Sleep of ukui-screensaver
-
-* Thu May 25 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-4
-- update glib2 error
-
-* Fri Feb 10 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.1-3
-- fix build compile error
-
 * Fri Dec 9 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.1-2
 - fix root can not input passwd bug