!47 [sync] PR-44: add remove-ukui-settings-daemon-quit.patch

From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

add-switchuser-no-limits-ukui-session.patch

@@ -4,30 +4,13 @@ Date: Mon, 4 Sep 2023 18:16:05 +0800
 Subject: [PATCH] add switchuser no limits
 
 ---
- tools/mainwindow.cpp | 5 +++--
+ tools/mainwindow.cpp | 2 +-
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/tools/mainwindow.cpp b/tools/mainwindow.cpp
 index e077574..0f65f27 100644
 --- a/tools/mainwindow.cpp
 +++ b/tools/mainwindow.cpp
-@@ -200,6 +200,7 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
- 
-     int hideNum = 7;
-     //Make a hash-map to store tableNum-to-lastWidget
-+    /*
-     if (m_power->canAction(UkuiPower::PowerHibernate)) {
-         isHibernateHide = false;
-         hideNum--;
-@@ -209,7 +210,7 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
-         isSuspendHide = false;
-         hideNum--;
-     }
--
-+    */
-     if (m_power->canAction(UkuiPower::PowerLogout)) {
-         isLogoutHide = false;
-         hideNum--;
 @@ -225,7 +226,7 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
          hideNum--;
      }

remove-ukui-settings-daemon-quit.patch

@@ -0,0 +1,25 @@
+From e23d4ade35fd6e9b8ebdfc57f253d185ec3e9abc Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Thu, 21 Sep 2023 10:29:35 +0800
+Subject: [PATCH] remove ukui-settings-daemon
+
+---
+ ukui-session/ukuismserver.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ukui-session/ukuismserver.cpp b/ukui-session/ukuismserver.cpp
+index 0d0df9c..14d9026 100644
+--- a/ukui-session/ukuismserver.cpp
++++ b/ukui-session/ukuismserver.cpp
+@@ -1381,6 +1381,8 @@ void UKUISMServer::changeClientOrder()
+         } else if (programName == QLatin1String("ukui-menu")) {
+             m_clients.removeAll(c);
+             m_clients.append(c);
++        } else if (programName == QLatin1String("ukui-settings-daemon")) {
++            m_clients.removeAll(c);
+         }
+     }
+ }
+-- 
+2.25.1
+

ukui-session-manager.spec

@@ -1,14 +1,13 @@
 Name:           ukui-session-manager
 Version:        3.1.0
-Release:        5
+Release:        6
 Summary:        Session manager of the UKUI desktop environment
 License:        GPL-2.0-or-later and GPL-3.0-or-later and LGPL-2.0-or-later 
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
-%if 0%{?kylin}
 Patch02:        ukui-session-manager-3.1.0-kylin-fix-ukui-kwin-x11-coredump.patch 
 Patch03:        add-switchuser-no-limits-ukui-session.patch
-%endif
+Patch05:        remove-ukui-settings-daemon-quit.patch
 
 BuildRequires:  cmake
 BuildRequires:  libX11-devel
@@ -51,10 +50,9 @@ Provides: x-session-manager
 
 %prep
 %setup -q
-%if 0%{?kylin}
 %patch02 -p1
 %patch03 -p1
-%endif
+%patch05 -p1
 
 %build
 mkdir cmake-build
@@ -86,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man1/ukui-session-tools.1.gz
 
 %changelog
+* Thu Sep 21 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-6
+- Type:bugfix
+- ID  :NA
+- SUG :NA
+- DESC:add patch5: remove-ukui-settings-daemon-quit.patch
+
 * Mon Sep 04 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-5
 - Type:bugfix
 - ID:NA