From 1d03c34f952225181fb7046a8f68ccdf41c21fa5 Mon Sep 17 00:00:00 2001
From: hantengc <hanteng@kylinos.cn>
Date: Tue, 10 Dec 2024 17:01:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BD=BF=E7=94=A8cmake=E7=9A=84?=
 =?UTF-8?q?=E5=AE=8F=E6=9D=A5=E5=AE=9A=E4=B9=89=E5=AE=89=E8=A3=85=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d00ebe..655e32a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,6 +121,6 @@ target_link_libraries(${PROJECT_NAME}
                 ${GSettings_QT_LIBRARIES}
             )
 
-install(TARGETS ${PROJECT_NAME}  DESTINATION /usr/bin)
-install(FILES data/org.ukui.virtualkeyboard.gschema.xml DESTINATION /usr/share/glib-2.0/schemas/)
-install(FILES data/ukui-virtual-keyboard-symbolic.svg DESTINATION /usr/share/icons/hicolor/scalable/actions)
+install(TARGETS ${PROJECT_NAME}  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(FILES data/org.ukui.virtualkeyboard.gschema.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/)
+install(FILES data/ukui-virtual-keyboard-symbolic.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/actions)
-- 
Gitee


From e9f2fda001c348c03ac36232d0699421fc5a58bf Mon Sep 17 00:00:00 2001
From: hantengc <hanteng@kylinos.cn>
Date: Tue, 10 Dec 2024 17:10:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6,=E7=A1=AE=E4=BF=9D=E5=9C=A8wayland=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E4=B8=8B=E8=99=9A=E6=8B=9F=E9=94=AE=E7=9B=98=E4=BE=9D?=
 =?UTF-8?q?=E6=97=A7=E4=BD=BF=E7=94=A8xcb=E7=9A=84=E5=90=8E=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                       |  2 ++
 data/kylin-virtual-keyboard-xwayland |  7 +++++++
 data/kylin-virtual-keyboard.desktop  | 13 +++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100755 data/kylin-virtual-keyboard-xwayland
 create mode 100644 data/kylin-virtual-keyboard.desktop

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 655e32a..7a30d9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,3 +124,5 @@ target_link_libraries(${PROJECT_NAME}
 install(TARGETS ${PROJECT_NAME}  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 install(FILES data/org.ukui.virtualkeyboard.gschema.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/)
 install(FILES data/ukui-virtual-keyboard-symbolic.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/actions)
+install(FILES data/kylin-virtual-keyboard.desktop DESTINATION /etc/xdg/autostart/)
+install(FILES data/kylin-virtual-keyboard-xwayland DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
diff --git a/data/kylin-virtual-keyboard-xwayland b/data/kylin-virtual-keyboard-xwayland
new file mode 100755
index 0000000..a3bcc6d
--- /dev/null
+++ b/data/kylin-virtual-keyboard-xwayland
@@ -0,0 +1,7 @@
+#!/bin/bash
+# The input method requires the use of the xcb platform environment in the wayland environment
+# However, it cannot affect the entire system environment
+
+export QT_QPA_PLATFORM=xcb
+exec /usr/bin/kylin-virtual-keyboard 
+unset QT_QPA_PLATFORM
diff --git a/data/kylin-virtual-keyboard.desktop b/data/kylin-virtual-keyboard.desktop
new file mode 100644
index 0000000..0957552
--- /dev/null
+++ b/data/kylin-virtual-keyboard.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=kylin-virtual-keyboard
+Name[zh_CN]=麒麟虚拟键盘
+Comment=kylin-virtual-keyboard
+Comment[zh_CN]=麒麟虚拟键盘
+Exec=/usr/bin/kylin-virtual-keyboard-xwayland
+Terminal=false
+Type=Application
+X-GNOME-AutoRestart=true
+X-GNOME-AutoRestart-Phase=Application
+X-UKUI-AutoRestart=true
+X-UKUI-AutoRestart-Phase=Application
+NoDisplay=true
-- 
Gitee