0001-feature-blacklist_autostart_apps-Add-mate-volume-con.patch

@@ -1,27 +0,0 @@
-From dc2ee24bb97dd8334aa133c8f8b8d39e274b31b1 Mon Sep 17 00:00:00 2001
-From: luoqing <luoqing@kylinsec.com.cn>
-Date: Sun, 8 Oct 2023 11:30:31 +0800
-Subject: [PATCH] feature(blacklist_autostart_apps):Add
- mate-volume-control-status-icon.desktop to the autostart blacklist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- 将mate-volume-control-status-icon.desktop添加到自启动黑名单
----
- data/blacklist_autostart_apps.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/blacklist_autostart_apps.txt b/data/blacklist_autostart_apps.txt
-index 04002c9..8459d14 100644
---- a/data/blacklist_autostart_apps.txt
-+++ b/data/blacklist_autostart_apps.txt
-@@ -2,3 +2,4 @@ mate-screensaver.desktop
- mate-power-manager.desktop
- orca-autostart.desktop
- nm-applet.desktop
-+mate-volume-control-status-icon.desktop
-\ No newline at end of file
--- 
-2.33.0
-

0001-fix-blacklist-autostart-add-polkit-mate-authenticati.patch

@@ -1,29 +0,0 @@
-From 900779f8301993031bfc75e12d9b75fb27f6b990 Mon Sep 17 00:00:00 2001
-From: liuxinhao <liuxinhao@kylinsec.com.cn>
-Date: Sat, 20 Jan 2024 12:57:58 +0800
-Subject: [PATCH] fix(blacklist autostart): add
- polkit-mate-authentication-agent-1 to blacklist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- 添加polkit-mate-authentication-agent-1进入自启动黑名单，2.5已有kiran-polkit-agent实现
----
- data/blacklist_autostart_apps.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/data/blacklist_autostart_apps.txt b/data/blacklist_autostart_apps.txt
-index 8459d14..6302c5f 100644
---- a/data/blacklist_autostart_apps.txt
-+++ b/data/blacklist_autostart_apps.txt
-@@ -2,4 +2,5 @@ mate-screensaver.desktop
- mate-power-manager.desktop
- orca-autostart.desktop
- nm-applet.desktop
--mate-volume-control-status-icon.desktop
-\ No newline at end of file
-+mate-volume-control-status-icon.desktop
-+polkit-mate-authentication-agent-1.desktop
--- 
-2.33.0
-

0001-fix-xsmp-Ignore-the-cancel-shutdown-request.patch

@@ -1,68 +0,0 @@
-From 9c06f60de67e54bd835e66d1b1adca9e370f0b2b Mon Sep 17 00:00:00 2001
-From: tangjie02 <tangjie02@kylinsec.com.cn>
-Date: Tue, 12 Sep 2023 20:29:06 +0800
-Subject: [PATCH] fix(xsmp): Ignore the cancel shutdown request.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- 用于响应客户端取消结束会话的事件不能通知到用户，会导致开始菜单注销按钮功能不能正常使用，影响用户体验，因此暂时禁止处理该请求
-
-Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
----
- src/core/inhibitor-manager.cpp | 13 ++++++++++---
- src/core/session-manager.cpp   |  7 ++++---
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/src/core/inhibitor-manager.cpp b/src/core/inhibitor-manager.cpp
-index b42b57d..552929a 100644
---- a/src/core/inhibitor-manager.cpp
-+++ b/src/core/inhibitor-manager.cpp
-@@ -129,9 +129,8 @@ void InhibitorManager::deleteInhibitorsWithStartupID()
- 
- bool InhibitorManager::hasInhibitor(uint32_t flags)
- {
--    auto iter = std::find_if(this->m_inhibitors.begin(), this->m_inhibitors.end(), [flags](QSharedPointer<Inhibitor> iter) {
--        return ((flags & iter->flags) == flags);
--    });
-+    auto iter = std::find_if(this->m_inhibitors.begin(), this->m_inhibitors.end(), [flags](QSharedPointer<Inhibitor> iter)
-+                             { return ((flags & iter->flags) == flags); });
- 
-     return (iter != this->m_inhibitors.end());
- }
-@@ -147,6 +146,14 @@ bool InhibitorManager::addInhibitor(QSharedPointer<Inhibitor> inhibitor)
- 
-     KLOG_DEBUG() << "Cookie: " << inhibitor->cookie;
- 
-+    KLOG_DEBUG() << "Add a new inhibitor,"
-+                 << " cookie: " << inhibitor->cookie
-+                 << ", appid: " << inhibitor->appID
-+                 << ", flags: " << inhibitor->flags
-+                 << ", reason: " << inhibitor->reason
-+                 << ", startupID: " << inhibitor->startupID
-+                 << ", toplevelXID: " << inhibitor->toplevelXID;
-+
-     if (this->m_inhibitors.find(inhibitor->cookie) != this->m_inhibitors.end())
-     {
-         KLOG_WARNING() << "The inhibitor " << inhibitor->cookie << " already exist.";
-diff --git a/src/core/session-manager.cpp b/src/core/session-manager.cpp
-index 6ca79be..b5bdb57 100644
---- a/src/core/session-manager.cpp
-+++ b/src/core/session-manager.cpp
-@@ -486,9 +486,10 @@ void SessionManager::onInteractDone(Client *client)
- 
- void SessionManager::onShutdownCanceled(Client *client)
- {
--    KLOG_DEBUG() << "Client: " << client->getID() << " cancels shutdown.";
--
--    this->cancelEndSession();
-+    KLOG_WARNING() << "Client: " << client->getID() << " want to cancels shutdown. ignore the client request.";
-+    /* 如果QT的窗口在closeEvent函数中调用event->ignore()来忽略窗口关闭事件，则桌面会话退出时会收到QT客户端发送的取消结束会话的事件，
-+       用于响应客户端取消结束会话的事件不能通知到用户，会导致开始菜单->注销按钮功能不能正常使用，影响用户体验，因此暂时禁止处理该请求。*/
-+    // this->cancelEndSession();
- }
- 
- void SessionManager::onEndSessionPhase2Request(Client *client)
--- 
-2.36.1
-

kiran-session-manager.spec

@@ -1,6 +1,6 @@
 Name:           kiran-session-manager
 Version:        2.5.0
-Release:        12
+Release:        8
 Summary:        Session manager for KIRAN desktop environment
 
 License:        MulanPSL-2.0
@@ -11,9 +11,6 @@ Patch1001:      0001-feature-session-Add-always-show-exit-window-flag.patch
 Patch1002:      0001-Add-Type-Application-in-kiran-session-idlemonitor.de.patch
 Patch1003:      0001-fix-boot-Fix-fork-other-session-program-failed-by-ad.patch
 Patch1004:      0001-fix-kiran-session-manager-fixes-link-Qt5DBus-error.patch 
-Patch1005:      0001-fix-xsmp-Ignore-the-cancel-shutdown-request.patch
-Patch1006:      0001-feature-blacklist_autostart_apps-Add-mate-volume-con.patch
-Patch1007:		0001-fix-blacklist-autostart-add-polkit-mate-authenticati.patch
 
 BuildRequires:  cmake >= 3.2
 BuildRequires:  pkgconfig(gio-unix-2.0)
@@ -36,12 +33,7 @@ BuildRequires:  kf5-kio-devel
 
 
 Requires:       systemd
-
-%if 0%{?rhel} > 7 || 0%{?openEuler}
-Requires:   dbus-daemon
-%else
-Requires:   dbus
-%endif
+Requires:       dbus-daemon
 
 %description
 Session manager for KIRAN desktop environment
@@ -97,18 +89,6 @@ fi
 
 
 %changelog
-* Sat Jan 20 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.0-12
-- KYOS-B: add polkit-mate-authentication-agent-1 to blacklist 
-
-* Sun Oct 08 2023 luoqing <luoqing@kylinsec.com.cn> - 2.5.0-11
-- KYOS-F: Add mate-volume-control-status-icon.desktop to the autostart blacklist
-
-* Tue Sep 12 2023 tangjie02 <tangjie02@kylinsec.com.cn> - 2.5.0-10
-- KYOS-F: 0001-fix-xsmp-Ignore-the-cancel-shutdown-request.patch.
-
-* Mon Sep 11 2023 longcheng <longcheng@kylinsec.com.cn> - 2.5.0-9
-- KYOS-B: change BuildRequires in redhat 7 (#14460)
-
 * Thu Sep 7 2023 yinhongchang <yinhongchang@kylinsec.com.cn> - 2.5.0-8
 - KYOS-F: fixes link Qt5DBus error
 

kiran-session-manager.yaml

@@ -1,4 +1,4 @@
 version_control: gitee
-src_repo: openeuler/kiran-session-manager
-tag_prefix: "^v"
-separator: "."
+src_repo: https://gitee.com/openeuler/kiran-session-manager.git
+tag_prefix: "v"
+seperator: "."