From 9ac6cd1a92f40d554b24440fa0bc80f3eb1f8267 Mon Sep 17 00:00:00 2001 From: peijiankang Date: Wed, 14 Jun 2023 15:30:29 +0800 Subject: [PATCH] disable Suspend and Sleep of ukui-greeter (cherry picked from commit e57536de9b94cb3630070e6a9a6e28c3c7c6e2c6) --- ...le-Suspend-and-Sleep-of-ukui-greeter.patch | 51 +++++++++++++++++++ ukui-greeter.spec | 14 ++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 disable-Suspend-and-Sleep-of-ukui-greeter.patch diff --git a/disable-Suspend-and-Sleep-of-ukui-greeter.patch b/disable-Suspend-and-Sleep-of-ukui-greeter.patch new file mode 100644 index 0000000..c04f261 --- /dev/null +++ b/disable-Suspend-and-Sleep-of-ukui-greeter.patch @@ -0,0 +1,51 @@ +From 53a0dcf9936e23aba31e85e232ddb3a00ee8160c Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Wed, 14 Jun 2023 15:27:22 +0800 +Subject: [PATCH] disable Suspend and Sleep of ukui-greeter + +--- + ukui-greeter/greeter/powerwindow.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/ukui-greeter/greeter/powerwindow.cpp b/ukui-greeter/greeter/powerwindow.cpp +index 81fa29f..d11e350 100644 +--- a/ukui-greeter/greeter/powerwindow.cpp ++++ b/ukui-greeter/greeter/powerwindow.cpp +@@ -237,7 +237,7 @@ void PowerManager::initUI() + QVBoxLayout *shutdownlayout = new QVBoxLayout(shutdownWidget); + shutdownlayout->addWidget(shutdownFace); + shutdownlayout->addWidget(shutdownLabel); +- ++/* + if(m_power->canHibernate()) { + hibernateWidget = new QWidget(this); + hibernateWidget->setObjectName("hibernateWidget"); +@@ -271,7 +271,7 @@ void PowerManager::initUI() + suspendlayout->addWidget(suspendFace); + suspendlayout->addWidget(suspendLabel); + } +- ++*/ + + // if(userCount>1){ + // QListWidgetItem *item0 = new QListWidgetItem(); +@@ -279,6 +279,7 @@ void PowerManager::initUI() + // insertItem(this->count(), item0); + // setItemWidget(item0, switchWidget); + // } ++/* + if(m_power->canHibernate()){ + QListWidgetItem *item1 = new QListWidgetItem(); + item1->setSizeHint(QSize(ITEM_WIDTH, ITEM_HEIGHT)); +@@ -292,7 +293,7 @@ void PowerManager::initUI() + insertItem(this->count(), item0); + setItemWidget(item0, suspendWidget); + } +- ++*/ + QListWidgetItem *item2 = new QListWidgetItem(); + item2->setSizeHint(QSize(ITEM_WIDTH, ITEM_HEIGHT)); + insertItem(this->count(), item2); +-- +2.33.0 + diff --git a/ukui-greeter.spec b/ukui-greeter.spec index b22fa35..2883389 100644 --- a/ukui-greeter.spec +++ b/ukui-greeter.spec @@ -1,6 +1,6 @@ Name: ukui-greeter Version: 3.1.2 -Release: 8 +Release: 9 Summary: Lightdm greeter for UKUI License: GPL-2.0-or-later URL: http://www.ukui.org @@ -9,6 +9,9 @@ Patch01: 0001-fix-greeter-translation.patch Patch02: 0002-fix-version-upgraded-the-default-background-is-blank.patch Patch03: 0003-fix-build-compile-error.patch Patch04: 0004-Fix-the-problem-that-the-login-interface-will-flash-back.patch +%if 0%{?kylin} +Patch05: disable-Suspend-and-Sleep-of-ukui-greeter.patch +%endif BuildRequires: pkgconf qt5-qtbase-devel qt5-qtx11extras-devel qt5-qtsvg-devel lightdm-qt5-devel libX11-devel libXtst-devel libXrandr-devel qt5-qttools-devel imlib2-devel xorg-x11-drivers opencv glib2-devel BuildRequires: gsettings-qt-devel @@ -39,6 +42,9 @@ if [ -e "/usr/include/glib-2.0/gio/gunixfdlist.h" ]; then %patch03 -p1 fi %patch04 -p1 +%if 0%{?kylin} +%patch05 -p1 +%endif %build qmake-qt5 @@ -65,6 +71,12 @@ gzip -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui- /usr/lib/ukui-greeter/ukui-greeter-nm-start.sh %changelog +* Wed Jun 14 2023 peijiankang - 3.1.2-9 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: disable Suspend and Sleep of ukui-greeter + * Thu May 25 2023 peijiankang - 3.1.2-8 - update glib2 error