Skip to content

Commit 6b8b423

Browse files
wyu71Zeno-sole
wyu71
authored and
Zeno-sole
committed
feat: enable XDGAUTOSTART and merge patches from master
Enable XDGAUTOSTART option in debian/rules and add autostart file installation. Merge 13 patches from master branch including zh_HK/lo translations and various fixes. 启用 XDGAUTOSTART 选项，添加自启动文件安装。合并 master 分支 13 个补丁， 包括 zh_HK/lo 翻译和多项修复。 Log: 启用自启动功能并合并补丁 Influence: fcitx5 将通过 XDG autostart 机制自动启动，同时包含多项翻译和功能修复。
1 parent 0d1f407 commit 6b8b423

17 files changed

+6738
-2
lines changed

‎debian/changelog‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
fcitx5 (5.1.12-2deepin1) unstable; urgency=medium
2+
3+
* Merge patches from master branch.
4+
* debian/rules: Enable XDGAUTOSTART.
5+
* debian/fcitx5.install: Add autostart file installation.
6+
7+
-- Wang Yu <wangyu@uniontech.com> Tue, 11 Mar 2026 16:15:00 +0800
8+
19
fcitx5 (5.1.12-2) unstable; urgency=medium
210

311
* Rebuild for Debian 13 release.

‎debian/fcitx5.install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#! /usr/bin/dh-exec
22
[linux-any] etc/xdg/Xwayland-session.d/20-fcitx-x11
3+
[linux-any] etc/xdg/autostart/
34
usr/bin/
45
[linux-any] usr/libexec/
56
usr/share/applications/

‎debian/patches/0001-fix-kde-config-fcitx5-package-name-in-fcitx5-configt.patch‎

Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
1+
From: Shengjing Zhu <zhsj@debian.org>
2+
Date: Wed, 26 Aug 2020 01:38:16 +0800
3+
Subject: fix kde-config-fcitx5 package name in fcitx5-configtool
4+
5+
Last-Update: 2024-10-08
6+
---
7+
data/fcitx5-configtool.sh | 2 +-
8+
po/ca.po | 2 +-
9+
po/da.po | 2 +-
10+
po/de.po | 2 +-
11+
po/es.po | 2 +-
12+
po/fcitx5.pot | 2 +-
13+
po/fr.po | 2 +-
14+
po/he.po | 2 +-
15+
po/ja.po | 4 ++--
16+
po/ko.po | 2 +-
17+
po/ru.po | 4 ++--
18+
po/vi.po | 2 +-
19+
po/zh_CN.po | 4 ++--
20+
po/zh_TW.po | 4 ++--
21+
14 files changed, 18 insertions(+), 18 deletions(-)
22+
23+
Index: fcitx5-community/data/fcitx5-configtool.sh
24+
===================================================================
25+
--- fcitx5-community.orig/data/fcitx5-configtool.sh
26+
+++ fcitx5-community/data/fcitx5-configtool.sh
27+
@@ -131,7 +131,7 @@ run_qt() {
28+
run_xdg() {
29+
case "$DE" in
30+
kde)
31+
- message "$(_ "You're currently running KDE, but KCModule for fcitx couldn't be found. The package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or fcitx5-configtool. Now it will open the configuration directory.")"
32+
+ message "$(_ "You're currently running KDE, but KCModule for fcitx couldn't be found. The package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or fcitx5-configtool. Now it will open the configuration directory.")"
33+
;;
34+
*)
35+
message "$(_ "You're currently running Fcitx with GUI, but fcitx5-config-qt couldn't be found. The package name provides this binary is usually fcitx5-configtool. Now it will open the configuration directory.")"
36+
Index: fcitx5-community/po/ca.po
37+
===================================================================
38+
--- fcitx5-community.orig/po/ca.po
39+
+++ fcitx5-community/po/ca.po
40+
@@ -2889,7 +2889,7 @@ msgstr ""
41+
#: data/fcitx5-configtool.sh:134
42+
msgid ""
43+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
44+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
45+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
46+
"fcitx5-configtool. Now it will open the configuration directory."
47+
msgstr ""
48+
49+
Index: fcitx5-community/po/da.po
50+
===================================================================
51+
--- fcitx5-community.orig/po/da.po
52+
+++ fcitx5-community/po/da.po
53+
@@ -2925,7 +2925,7 @@ msgstr ""
54+
#: data/fcitx5-configtool.sh:134
55+
msgid ""
56+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
57+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
58+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
59+
"fcitx5-configtool. Now it will open the configuration directory."
60+
msgstr ""
61+
62+
Index: fcitx5-community/po/de.po
63+
===================================================================
64+
--- fcitx5-community.orig/po/de.po
65+
+++ fcitx5-community/po/de.po
66+
@@ -2902,7 +2902,7 @@ msgstr ""
67+
#: data/fcitx5-configtool.sh:134
68+
msgid ""
69+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
70+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
71+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
72+
"fcitx5-configtool. Now it will open the configuration directory."
73+
msgstr ""
74+
75+
Index: fcitx5-community/po/es.po
76+
===================================================================
77+
--- fcitx5-community.orig/po/es.po
78+
+++ fcitx5-community/po/es.po
79+
@@ -2888,7 +2888,7 @@ msgstr ""
80+
#: data/fcitx5-configtool.sh:134
81+
msgid ""
82+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
83+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
84+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
85+
"fcitx5-configtool. Now it will open the configuration directory."
86+
msgstr ""
87+
88+
Index: fcitx5-community/po/fcitx5.pot
89+
===================================================================
90+
--- fcitx5-community.orig/po/fcitx5.pot
91+
+++ fcitx5-community/po/fcitx5.pot
92+
@@ -2884,7 +2884,7 @@ msgstr ""
93+
#: data/fcitx5-configtool.sh:134
94+
msgid ""
95+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
96+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
97+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
98+
"fcitx5-configtool. Now it will open the configuration directory."
99+
msgstr ""
100+
101+
Index: fcitx5-community/po/fr.po
102+
===================================================================
103+
--- fcitx5-community.orig/po/fr.po
104+
+++ fcitx5-community/po/fr.po
105+
@@ -2975,7 +2975,7 @@ msgstr ""
106+
#: data/fcitx5-configtool.sh:134
107+
msgid ""
108+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
109+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
110+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
111+
"fcitx5-configtool. Now it will open the configuration directory."
112+
msgstr ""
113+
114+
Index: fcitx5-community/po/he.po
115+
===================================================================
116+
--- fcitx5-community.orig/po/he.po
117+
+++ fcitx5-community/po/he.po
118+
@@ -2890,7 +2890,7 @@ msgstr ""
119+
#: data/fcitx5-configtool.sh:134
120+
msgid ""
121+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
122+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
123+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
124+
"fcitx5-configtool. Now it will open the configuration directory."
125+
msgstr ""
126+
127+
Index: fcitx5-community/po/ja.po
128+
===================================================================
129+
--- fcitx5-community.orig/po/ja.po
130+
+++ fcitx5-community/po/ja.po
131+
@@ -2991,11 +2991,11 @@ msgstr ""
132+
#: data/fcitx5-configtool.sh:134
133+
msgid ""
134+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
135+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
136+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
137+
"fcitx5-configtool. Now it will open the configuration directory."
138+
msgstr ""
139+
"現在 KDE を実行していますが、Fcitx 用の KCModule が見つかりません。この "
140+
-"KCModule のパッケージ名は、通常 kcm-fcitx5、kde-config-fcitx5、または fcitx5-"
141+
+"KCModule のパッケージ名は、通常 kcm-fcitx5、kde-config-fcitx55、または fcitx5-"
142+
"configtool です。これで設定ディレクトリが開きます。"
143+
144+
#: data/fcitx5-diagnose.sh:1085
145+
Index: fcitx5-community/po/ko.po
146+
===================================================================
147+
--- fcitx5-community.orig/po/ko.po
148+
+++ fcitx5-community/po/ko.po
149+
@@ -2930,7 +2930,7 @@ msgstr ""
150+
#: data/fcitx5-configtool.sh:134
151+
msgid ""
152+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
153+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
154+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
155+
"fcitx5-configtool. Now it will open the configuration directory."
156+
msgstr ""
157+
158+
Index: fcitx5-community/po/ru.po
159+
===================================================================
160+
--- fcitx5-community.orig/po/ru.po
161+
+++ fcitx5-community/po/ru.po
162+
@@ -3026,11 +3026,11 @@ msgstr ""
163+
#: data/fcitx5-configtool.sh:134
164+
msgid ""
165+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
166+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
167+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
168+
"fcitx5-configtool. Now it will open the configuration directory."
169+
msgstr ""
170+
"В настоящее время вы используете KDE, но KCModule для fcitx не найден. Имя "
171+
-"пакета этого KCModule обычно — kcm-fcitx5, kde-config-fcitx5 или fcitx5-"
172+
+"пакета этого KCModule обычно — kcm-fcitx5, kde-config-fcitx55 или fcitx5-"
173+
"configtool. Сейчас откроется каталог конфигурации."
174+
175+
#: data/fcitx5-diagnose.sh:1085
176+
Index: fcitx5-community/po/vi.po
177+
===================================================================
178+
--- fcitx5-community.orig/po/vi.po
179+
+++ fcitx5-community/po/vi.po
180+
@@ -2904,7 +2904,7 @@ msgstr ""
181+
#: data/fcitx5-configtool.sh:134
182+
msgid ""
183+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
184+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
185+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
186+
"fcitx5-configtool. Now it will open the configuration directory."
187+
msgstr ""
188+
189+
Index: fcitx5-community/po/zh_CN.po
190+
===================================================================
191+
--- fcitx5-community.orig/po/zh_CN.po
192+
+++ fcitx5-community/po/zh_CN.po
193+
@@ -2954,11 +2954,11 @@ msgstr ""
194+
#: data/fcitx5-configtool.sh:134
195+
msgid ""
196+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
197+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
198+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
199+
"fcitx5-configtool. Now it will open the configuration directory."
200+
msgstr ""
201+
"您正在使用 KDE，但是 fcitx 的 KCModule 未被找到，此 KCModule 的软件包名称通常"
202+
-"是 kcm-fcitx5、kde-config-fcitx5 或 fcitx5-configtool。现在将打开配置目录。"
203+
+"是 kcm-fcitx5、kde-config-fcitx55 或 fcitx5-configtool。现在将打开配置目录。"
204+
205+
#: data/fcitx5-diagnose.sh:1085
206+
msgid ""
207+
Index: fcitx5-community/po/zh_TW.po
208+
===================================================================
209+
--- fcitx5-community.orig/po/zh_TW.po
210+
+++ fcitx5-community/po/zh_TW.po
211+
@@ -2956,11 +2956,11 @@ msgstr ""
212+
#: data/fcitx5-configtool.sh:134
213+
msgid ""
214+
"You're currently running KDE, but KCModule for fcitx couldn't be found. The "
215+
-"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx5, or "
216+
+"package name of this KCModule is usually kcm-fcitx5, kde-config-fcitx55, or "
217+
"fcitx5-configtool. Now it will open the configuration directory."
218+
msgstr ""
219+
"您正在使用 KDE，但是 fcitx 的 KCModule 未被找到。此 KCModule 軟體包的名稱通常"
220+
-"是 kcm-fcitx5、kde-config-fcitx5 或 fcitx5-configtool。現在將打開設定目錄。"
221+
+"是 kcm-fcitx5、kde-config-fcitx55 或 fcitx5-configtool。現在將打開設定目錄。"
222+
223+
#: data/fcitx5-diagnose.sh:1085
224+
msgid ""

‎debian/patches/0002-configtool-opens-dde-control-center-when-using-DDE.patch‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
From: zsien <quezhiyong@uniontech.com>
2+
Date: Fri, 10 Feb 2023 17:02:28 +0800
3+
Subject: configtool opens dde-control-center when using DDE
4+
5+
---
6+
data/fcitx5-configtool.sh | 27 +++++++++++++++++++++++++--
7+
1 file changed, 25 insertions(+), 2 deletions(-)
8+
9+
Index: fcitx5-community/data/fcitx5-configtool.sh
10+
===================================================================
11+
--- fcitx5-community.orig/data/fcitx5-configtool.sh
12+
+++ fcitx5-community/data/fcitx5-configtool.sh
13+
@@ -65,6 +65,11 @@ detectDE() {
14+
XFCE)
15+
DE=xfce
16+
break
17+
+ ;;
18+
+ DDE|Deepin)
19+
+ DE=dde
20+
+ break
21+
+ ;;
22+
esac
23+
done
24+
fi
25+
@@ -93,6 +98,9 @@ detectDE() {
26+
xfce|xfce4|'Xfce Session')
27+
DE=xfce;
28+
;;
29+
+ DDE*|deepin)
30+
+ DE=dde;
31+
+ ;;
32+
esac
33+
fi
34+
35+
@@ -121,6 +129,18 @@ run_kde() {
36+
fi
37+
}
38+
39+
+run_dde() {
40+
+ local dbus_service="org.deepin.dde.ControlCenter1"
41+
+ local dbus_path="/org/deepin/dde/ControlCenter1"
42+
+ local dbus_interface="org.deepin.dde.ControlCenter1"
43+
+ local dcc_module="keyboard/Manage Input Methods"
44+
+
45+
+ if dbus-send --print-reply=literal --dest=$dbus_service $dbus_path $dbus_interface.GetAllModule 2>> /dev/null | grep -q "$dcc_module" >> /dev/null 2>&1; then
46+
+ exec dbus-send --print-reply=literal --dest=$dbus_service $dbus_path $dbus_interface.ShowPage string:"$dcc_module"
47+
+ fi
48+
+ return 1
49+
+}
50+
+
51+
run_qt() {
52+
if command -v fcitx5-config-qt > /dev/null 2>&1; then
53+
exec fcitx5-config-qt
54+
@@ -162,10 +182,13 @@ detectDE
55+
# xdg is never a preferred solution
56+
case "$DE" in
57+
kde)
58+
- order="kde qt xdg"
59+
+ order="kde qt dde xdg"
60+
+ ;;
61+
+ dde)
62+
+ order="dde qt kde xdg"
63+
;;
64+
*)
65+
- order="qt kde xdg"
66+
+ order="qt kde dde xdg"
67+
;;
68+
esac
69+

‎debian/patches/0003-Revert-disable-ctrl-shift-enumerate-key-by-default.patch‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Index: fcitx5-community/src/lib/fcitx/globalconfig.cpp
2+
===================================================================
3+
--- fcitx5-community.orig/src/lib/fcitx/globalconfig.cpp
4+
+++ fcitx5-community/src/lib/fcitx/globalconfig.cpp
5+
@@ -60,14 +60,14 @@ FCITX_CONFIGURATION(
6+
this,
7+
"EnumerateForwardKeys",
8+
_("Enumerate Input Method Forward"),
9+
- {},
10+
+ {Key("Control+Shift_L")},
11+
KeyListConstrain({KeyConstrainFlag::AllowModifierLess,
12+
KeyConstrainFlag::AllowModifierOnly})};
13+
KeyListOption enumerateBackwardKeys{
14+
this,
15+
"EnumerateBackwardKeys",
16+
_("Enumerate Input Method Backward"),
17+
- {},
18+
+ {Key("Control+Shift_R")},
19+
KeyListConstrain({KeyConstrainFlag::AllowModifierLess,
20+
KeyConstrainFlag::AllowModifierOnly})};
21+
Option<bool> enumerateSkipFirst{

0 commit comments

Comments
 (0)