From e2636c1bd2f9af33f008b23ce6cb34c80f96d04e Mon Sep 17 00:00:00 2001 From: peijiankang Date: Wed, 14 Jun 2023 15:38:49 +0800 Subject: [PATCH] disable Suspend and Sleep of ukui-menu (cherry picked from commit c1dc7cd34e437361ace15ec28e6c13435831f09e) --- disable-Suspend-and-Sleep-of-ukui-menu.patch | 49 ++++++++++++++++++++ ukui-menu.spec | 11 ++++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 disable-Suspend-and-Sleep-of-ukui-menu.patch diff --git a/disable-Suspend-and-Sleep-of-ukui-menu.patch b/disable-Suspend-and-Sleep-of-ukui-menu.patch new file mode 100644 index 0000000..42d72e5 --- /dev/null +++ b/disable-Suspend-and-Sleep-of-ukui-menu.patch @@ -0,0 +1,49 @@ +From e678d299bbeed0333dbb6fa20f293dbb0a0189ae Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Wed, 14 Jun 2023 14:43:07 +0800 +Subject: [PATCH] disable Suspend and Sleep of ukui-menu + +--- + .../RightClickMenu/rightclickmenu.cpp | 26 +++++++++---------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/UserInterface/RightClickMenu/rightclickmenu.cpp b/src/UserInterface/RightClickMenu/rightclickmenu.cpp +index 3db1762..fc06767 100755 +--- a/src/UserInterface/RightClickMenu/rightclickmenu.cpp ++++ b/src/UserInterface/RightClickMenu/rightclickmenu.cpp +@@ -359,19 +359,19 @@ int RightClickMenu::showShutdownMenu(const QPoint &pos, const bool &isFullWind) + this, SLOT(switchUserActionTriggerSlot())); + } + +- reply = iface.call("canHibernate"); +- +- if (reply.isValid() && reply.value()) { +- m_showShutMenu.addAction(QIcon(getIconPixmap("kylin-sleep-symbolic", 1)), tr("Hibernate"), +- this, SLOT(hibernateActionTriggerSlot())); +- } +- +- reply = iface.call("canSuspend"); +- +- if (reply.isValid() && reply.value()) { +- m_showShutMenu.addAction(QIcon(getIconPixmap("kylin-hebernate-symbolic", 1)), tr("Sleep"), +- this, SLOT(sleepActionTriggerSlot())); +- } ++// reply = iface.call("canHibernate"); ++// ++// if (reply.isValid() && reply.value()) { ++// m_showShutMenu.addAction(QIcon(getIconPixmap("kylin-sleep-symbolic", 1)), tr("Hibernate"), ++// this, SLOT(hibernateActionTriggerSlot())); ++// } ++// ++// reply = iface.call("canSuspend"); ++// ++// if (reply.isValid() && reply.value()) { ++// m_showShutMenu.addAction(QIcon(getIconPixmap("kylin-hebernate-symbolic", 1)), tr("Sleep"), ++// this, SLOT(sleepActionTriggerSlot())); ++// } + + m_showShutMenu.addAction(QIcon(getIconPixmap("system-lock-screen-symbolic", 1)), tr("Lock Screen"), + this, SLOT(lockScreenActionTriggerSlot())); +-- +2.33.0 + diff --git a/ukui-menu.spec b/ukui-menu.spec index f8cb9d0..c05cfc7 100644 --- a/ukui-menu.spec +++ b/ukui-menu.spec @@ -1,6 +1,6 @@ Name: ukui-menu Version: 3.1.1 -Release: 11 +Release: 12 Summary: Advanced ukui menu License: GPL-3.0-or-later URL: http://www.ukui.org @@ -30,6 +30,9 @@ patch23: 0020-43-upstream-Debian.patch patch24: 0021-48-wayland.patch #fix error Patch25: 0001-fix-uninstall-failed-issue.patch +%if 0%{?kylin} +Patch26: disable-Suspend-and-Sleep-of-ukui-menu.patch +%endif BuildRequires: qt5-qtbase-devel @@ -83,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ukui-menu/translations/ %changelog +* Wed Jun 14 2023 peijiankang - 3.1.1-12 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: disable Suspend and Sleep of ukui-menu + * Wed May 24 2023 peijiankang - 3.1.1-11 - add patch from upstream