Fix fork other session program failed by adding GDK_BACKEND and QT_QPA_FLATFORM environment variables.

Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
This commit is contained in:
tangjie02 2023-06-16 15:57:05 +08:00
parent 7bb570b863
commit 25b778d921
4 changed files with 41 additions and 19 deletions

View File

@ -26,7 +26,7 @@ index b71dd3e..313d055 100644
- </schema>
+ <key name="always-show-exit-window" type="b">
+ <default>true</default>
+ <default>false</default>
+ <description>Set whether to always show the exit window.</description>
+ </key>
+ </schema>

View File

@ -0,0 +1,34 @@
From 18165b636a6a2fc083b2139f0cfc71d1dac8f221 Mon Sep 17 00:00:00 2001
From: tangjie02 <tangjie02@kylinsec.com.cn>
Date: Fri, 16 Jun 2023 15:34:21 +0800
Subject: [PATCH] fix(boot): Fix fork other session program failed by adding
GDK_BACKEND and QT_QPA_FLATFORM environment variables.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修复由于DISPLAY后端设置错误导致会话中的进程无法启动问题
Relates #I7C89D
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
---
data/kiran-session-wayland.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/data/kiran-session-wayland.in b/data/kiran-session-wayland.in
index 4bd1de9..1ffb0b1 100644
--- a/data/kiran-session-wayland.in
+++ b/data/kiran-session-wayland.in
@@ -1,3 +1,6 @@
#!/bin/sh
-exec @CMAKE_INSTALL_FULL_BINDIR@/kiran-session-manager --session-type=kiran-wayland
\ No newline at end of file
+export GDK_BACKEND=x11
+export QT_QPA_PLATFORM=xcb
+
+exec @CMAKE_INSTALL_FULL_BINDIR@/kiran-session-manager --session-type=kiran-wayland
--
2.36.1

View File

@ -1,12 +0,0 @@
diff -ruN kiran-session-manager-2.5.0/data/com.kylinsec.kiran.session-manager.gschema.xml.in kiran-session-manager-2.5.0-new/data/com.kylinsec.kiran.session-manager.gschema.xml.in
--- kiran-session-manager-2.5.0/data/com.kylinsec.kiran.session-manager.gschema.xml.in 2023-06-01 09:25:43.677341400 +0800
+++ kiran-session-manager-2.5.0-new/data/com.kylinsec.kiran.session-manager.gschema.xml.in 2023-06-01 09:26:42.883395253 +0800
@@ -17,7 +17,7 @@
</key>
<key name="always-show-exit-window" type="b">
- <default>true</default>
+ <default>false</default>
<description>Set whether to always show the exit window.</description>
</key>
</schema>

View File

@ -8,8 +8,8 @@ Source0: %{name}-%{version}.tar.gz
Patch1000: 0001-feature-lockscreen-Add-LockScreenWhenHibernate-and-L.patch
Patch1001: 0001-feature-session-Add-always-show-exit-window-flag.patch
Patch1002: 0001-modify-show-exit-window-flag-to-default-false.patch
Patch1003: 0001-Add-Type-Application-in-kiran-session-idlemonitor.de.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
BuildRequires: cmake >= 3.2
@ -89,11 +89,11 @@ fi
%changelog
* Fri Jun 02 2023 huangjiawen <huangjiawen@kylinsec.com.cn> - 2.5.0-7
- KYOS-F: Add Type=Application in kiran-session-idlemonitor.desktop.in
* Fri Jun 16 2023 tangjie02 <tangjie02@kylinsec.com.cn> - 2.5.0-7
- KYOS-B: Fix fork other session program failed by adding GDK_BACKEND and QT_QPA_FLATFORM environment variables.
* Wed May 31 2023 huangjiawen <huangjiawen@kylinsec.com.cn> - 2.5.0-6
- KYOS-F: Modify the show exit window flag to default to show.
* Fri Jun 02 2023 huangjiawen <huangjiawen@kylinsec.com.cn> - 2.5.0-6
- KYOS-F: Add Type=Application in kiran-session-idlemonitor.desktop.in
* Wed May 31 2023 huangjiawen <huangjiawen@kylinsec.com.cn> - 2.5.0-5
- KYOS-F: Add always show exit window flag.