From d18034d3f52cc8064a5a60503267604da005652e Mon Sep 17 00:00:00 2001
From: liulinsong <liulinsong@kylinos.cn>
Date: Thu, 13 Jun 2024 09:47:27 +0800
Subject: [PATCH] update changelog

---
 debian/changelog                           | 18 +++++
 debian/install                             |  1 +
 debian/patches/0001-update-changelog.patch | 82 ++++++++++++++++++++++
 debian/patches/series                      |  1 +
 4 files changed, 102 insertions(+)
 create mode 100644 debian/patches/0001-update-changelog.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 9ad4848..bb413c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+im-config (0.57-ok3) nile; urgency=medium
+
+  * BUG：issue#I9KY3G 解决fcitx5输入法框架无法自启动的问题
+  * 需求号：无
+  * 其他改动说明：将被删除的两个commit从openkylin/yangtze分支cherry-pick过来并压缩为一个commit
+  * 其他改动影响域：无
+
+ -- liulinsong <liulinsong@kylinos.cn>  Thu, 13 Jun 2024 09:43:56 +0800
+
+im-config (0.57-ok2) nile; urgency=medium
+
+  * BUG：issue#I9S5H1 开始菜单默认不显示im-config入口
+  * 需求号：无
+  * 其他改动说明：将被删除的commit从openkylin/yangtze分支cherry-pick过来
+  * 其他改动影响域：无
+
+ -- liulinsong <liulinsong@kylinos.cn>  Thu, 13 Jun 2024 09:23:06 +0800
+
 im-config (0.57-ok1) nile; urgency=medium
 
   * Build for openKylin.
diff --git a/debian/install b/debian/install
index 169b82e..8b9b04f 100644
--- a/debian/install
+++ b/debian/install
@@ -10,3 +10,4 @@ po/locale/*            usr/share/locale
 share/im-config.common usr/share/im-config
 share/xinputrc.common  usr/share/im-config
 xinputrc               etc/X11/xinit
+fcitx5.desktop         etc/xdg/autostart
diff --git a/debian/patches/0001-update-changelog.patch b/debian/patches/0001-update-changelog.patch
new file mode 100644
index 0000000..bb8c1fa
--- /dev/null
+++ b/debian/patches/0001-update-changelog.patch
@@ -0,0 +1,82 @@
+From: liulinsong <liulinsong@kylinos.cn>
+Date: Thu, 13 Jun 2024 09:47:27 +0800
+Subject: update changelog
+
+---
+ data/23_fcitx5.rc    |  2 +-
+ fcitx5.desktop       | 42 ++++++++++++++++++++++++++++++++++++++++++
+ im-config.desktop.in |  1 +
+ 3 files changed, 44 insertions(+), 1 deletion(-)
+ create mode 100644 fcitx5.desktop
+
+diff --git a/data/23_fcitx5.rc b/data/23_fcitx5.rc
+index a900052..b3e58dd 100644
+--- a/data/23_fcitx5.rc
++++ b/data/23_fcitx5.rc
+@@ -1,7 +1,7 @@
+ # start fcitx5
+ # vim: set sts=4 expandtab:
+ 
+-if [ "$IM_CONFIG_PHASE" = 2 ]; then
++if [ "$IM_CONFIG_PHASE" = 2 && "$XDG_SESSION_TYPE" = x11 ]; then
+     # start fcitx5 daemon
+     /usr/bin/fcitx5 -d 2> /dev/null
+ fi
+diff --git a/fcitx5.desktop b/fcitx5.desktop
+new file mode 100644
+index 0000000..ae6daea
+--- /dev/null
++++ b/fcitx5.desktop
+@@ -0,0 +1,42 @@
++[Desktop Entry]
++Name[ca]=Fcitx 5
++Name[da]=Fcitx 5
++Name[de]=Fcitx 5
++Name[fr]=Fcitx 5
++Name[ja]=Fcitx 5
++Name[ko]=Fcitx 5
++Name[ru]=Fcitx 5
++Name[zh_CN]=Fcitx 5
++Name[zh_TW]=Fcitx 5
++Name=Fcitx 5
++GenericName[ca]=Mètode d'entrada
++GenericName[da]=Inputmetode
++GenericName[de]=Eingabemethode
++GenericName[fr]=Méthode de saisie
++GenericName[ja]=入力メソッド
++GenericName[ko]=입력기
++GenericName[ru]=Метод ввода
++GenericName[zh_CN]=输入法
++GenericName[zh_TW]=輸入法
++GenericName=Input Method
++Comment[ca]=Mètode d'entrada estàndard
++Comment[da]=Start inputmetode
++Comment[de]=Eingabemethode starten
++Comment[fr]=Démarrer la méthode de saisie
++Comment[ja]=入力メソッドを開始
++Comment[ko]=입력기 시작
++Comment[ru]=Запустить метод ввода
++Comment[zh_CN]=启动输入法
++Comment[zh_TW]=啟動輸入法
++Comment=Start Input Method
++Exec=/usr/bin/fcitx5
++Icon=fcitx
++Terminal=false
++Type=Application
++Categories=System;Utility;
++StartupNotify=false
++X-GNOME-AutoRestart=false
++X-GNOME-Autostart-Notify=false
++X-KDE-autostart-after=panel
++X-KDE-StartupNotify=false
++X-KDE-Wayland-VirtualKeyboard=true
+diff --git a/im-config.desktop.in b/im-config.desktop.in
+index b564a6c..5d59150 100644
+--- a/im-config.desktop.in
++++ b/im-config.desktop.in
+@@ -8,3 +8,4 @@ Terminal=false
+ Icon=input-keyboard
+ Categories=Settings
+ X-AppStream-Ignore=true
++NoDisplay=true
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..645d63f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-update-changelog.patch