packages/ukui-session-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:e12d6fd8fb678ef1816137c264cff04a24a86cdb
Branches Tags
packages:main
..
compare: packages:a5dc19b3f1f1008901777f5d9124605c965e7532
Branches Tags
packages:main

No commits in common. "e12d6fd8fb678ef1816137c264cff04a24a86cdb" and "a5dc19b3f1f1008901777f5d9124605c965e7532" have entirely different histories.
e12d6fd8fb ... a5dc19b3f1

7 changed files with 19 additions and 197 deletions
Show Stats Expand all files Collapse all files

25
add-switchuser-no-limits-ukui-session.patch
View File

@ -1,25 +0,0 @@
From 875737c14d243792680c8ed2349cb73a9eadc197 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Mon, 4 Sep 2023 18:16:05 +0800
Subject: [PATCH] add switchuser no limits
---
tools/mainwindow.cpp | 2 +-
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
@@ -225,7 +226,7 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
hideNum--;
}
- if (LockChecker::getCachedUsers() > 1 && m_power->canAction(UkuiPower::PowerSwitchUser)) {
+ if (m_power->canAction(UkuiPower::PowerSwitchUser)) {
isSwitchuserHide = false;
hideNum--;
}
--
2.33.0

25
remove-ukui-settings-daemon-quit.patch
View File

@ -1,25 +0,0 @@
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

BIN
ukui-session-manager-3.0.6.tar.gz Normal file
View File

Binary file not shown.

57
ukui-session-manager-3.1.0-kylin-fix-ukui-kwin-x11-coredump.patch
View File

@ -1,57 +0,0 @@
diff -Naur ukui-session-manager-3.1.0/ukui-session/ukuismserver.cpp ukui-session-manager-3.1.0~/ukui-session/ukuismserver.cpp
--- ukui-session-manager-3.1.0/ukui-session/ukuismserver.cpp 2022-04-20 17:40:57.000000000 +0800
+++ ukui-session-manager-3.1.0~/ukui-session/ukuismserver.cpp 2023-07-09 13:49:42.930414204 +0800
@@ -1065,22 +1065,28 @@
void UKUISMServer::completeKilling()
{
+// if (m_state == Killing) {
+// //这一段的含义是只要客户端列表中还有非窗管的客户端存在，则等待，直到客户端中只有一个窗管，则开始杀死窗管
+// bool wait = false;
+// foreach (UKUISMClient *c, m_clients) {
+// if (isWM(c)) {
+// continue;
+// }
+// wait = true;
+// }
+
+// if (wait) {
+// return;
+// }
+
+// // killWM();
+// //修改为不杀死窗管，直接结束会话
+// killingCompleted();
+// }
+// dy use default kde method
if (m_state == Killing) {
- //这一段的含义是只要客户端列表中还有非窗管的客户端存在，则等待，直到客户端中只有一个窗管，则开始杀死窗管
- bool wait = false;
- foreach (UKUISMClient *c, m_clients) {
- if (isWM(c)) {
- continue;
- }
- wait = true;
- }
-
- if (wait) {
+ if (!m_clients.isEmpty()) // still waiting for clients to go away
return;
- }
-
-// killWM();
- //修改为不杀死窗管，直接结束会话
killingCompleted();
}
}
@@ -1145,7 +1151,9 @@
void UKUISMServer::killingCompleted()
{
emit logoutFinished();
-// qApp->quit();
+ //dy use default kde method
+ qApp->quit();
+ return;
//目前不清楚如果不做清理会有什么影响，看日志没有发现问题，使用上也没有区别，但为了保险还是加上
cleanUp();

BIN
ukui-session-manager-3.1.0.tar.gz
View File

Binary file not shown.

105
ukui-session-manager.spec
View File

@ -1,39 +1,19 @@
%define debug_package %{nil}
Name: ukui-session-manager
Version: 3.1.0
Release: 6
Version: 3.0.6
Release: 4
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
License: LGPL-2.0-or-later and GPL-2.0-or-later
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch02: ukui-session-manager-3.1.0-kylin-fix-ukui-kwin-x11-coredump.patch
Patch03: add-switchuser-no-limits-ukui-session.patch
Patch05: remove-ukui-settings-daemon-quit.patch
BuildRequires: cmake
BuildRequires: libX11-devel
BuildRequires: xdg-user-dirs
BuildRequires: kf5-kidletime-devel
BuildRequires: kf5-kcoreaddons-devel
BuildRequires: kf5-kconfig-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: gsettings-qt-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: libXtst-devel
BuildRequires: pkgconf
BuildRequires: ukui-interface
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: libSM-devel
BuildRequires: glib2-devel
BuildRequires: cmake,libXtst-devel,libX11-devel,xdg-user-dirs,kf5-kidletime-devel,qt5-qtx11extras-devel,qt5-qtbase-devel,systemd-devel,qt5-qttools-devel,qt5-qtmultimedia-devel,gsettings-qt-devel,pkgconf
Requires: ukui-themes
Requires: glib2
Requires: qt5-qtmultimedia
Recommends: peony
Recommends: ukui-kwin
Recommends: ukui-panel
Recommends: ukui-polkit
Recommends: ukui-screensaver
@ -50,9 +30,6 @@ Provides: x-session-manager
%prep
%setup -q
%patch02 -p1
%patch03 -p1
%patch05 -p1
%build
mkdir cmake-build
@ -65,7 +42,8 @@ popd
pushd cmake-build
%make_install INSTALL_ROOT=%{buildroot}
popd
#mkdir -p %{buildroot}/etc/X11/Xsession.d/ %{buildroot}/usr/share/man/man1/
#install -m644 debian/99ukui-environment %{buildroot}/etc/X11/Xsession.d/99ukui-environment
install -d %{buildroot}/usr/share/man/man1/ %{buildroot}/etc/polkit-1/localauthority/50-local.d/
install -m644 data/com.ubuntu.enable-hibernate.pkla %{buildroot}/etc/polkit-1/localauthority/50-local.d/com.ubuntu.enable-hibernate.pkla
gzip -c man/ukui-session.1 > %{buildroot}/usr/share/man/man1/ukui-session.1.gz
@ -76,71 +54,26 @@ rm -rf $RPM_BUILD_ROOT
%files
%doc debian/changelog debian/copyright
#%%{_sysconfdir}/X11/Xsession.d/99ukui-environment
%{_sysconfdir}/polkit-1/localauthority/50-local.d/com.ubuntu.enable-hibernate.pkla
%{_datadir}/*
%{_prefix}/bin/ukui-session
%{_prefix}/bin/ukui-session-tools
%{_datadir}/man/man1/ukui-session.1.gz
%{_datadir}/man/man1/ukui-session-tools.1.gz
#%%{_datadir}/man/man1/ukui-session.1.gz
#%%{_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
* Fri Jun 17 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.6-4
- remove 0001-modify-ukui-volume-control-applet-satrtup.patch
* Mon Sep 04 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add patch3:add-switchuser-no-limits-ukui-session.patch
rm disable-Suspend-and-Sleep-of-ukui-session-manager.patch
* Thu Jun 16 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.6-3
- modify ukui-volume-control-applet satrtup
* Mon Jul 10 2023 huayadong <huayadong@kylinos.cn> - 3.1.0-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add patch2:ukui-session-manager-3.1.0-kylin-fix-ukui-kwin-x11-coredump.patch
* Fri Mar 11 2022 douyan <douyan@kylinos.cn> - 3.0.6-2
- remove Requires ukwm
* Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: disable Suspend and Sleep of ukui-session-manager
* Tue Feb 07 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.0-2
- Enable debuginfo for fix strip
* Tue Dec 6 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.0-1
- update version to 3.1.0
* Mon Aug 08 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.2-11
- add control dependency and rules
* Thu Aug 04 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.2-10
- update frash style
* Mon May 23 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.2-9
- Improve the project according to the requirements of compliance improvement
* Wed Apr 06 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.2-8
- add yaml file
* Tue Dec 07 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-7
- add patch: 0006-ukui-session-session-application.patch
* Thu Dec 02 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-6
- update debian changelog
* Thu Nov 11 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-5
- add startlogout signal
* Mon Nov 1 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-4
- adjust the sequence to make translation file loaded first
* Thu Oct 28 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-3
- reset changelog and format
* Mon Oct 26 2020 huayadong <huayadong@kylinos.cn> - 3.0.6-1
- update to upstream version 3.0.6-1
* Thu Dec 3 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-2
- fix poweroff

4
ukui-session-manager.yaml
View File

@ -1,4 +0,0 @@
version_control: github
src_repo: UKUI/ukui-session-manager
tag_prefix: "^v"
separator: "."