summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-03-11 10:32:44 +0000
committerintrigeri <intrigeri@boum.org>2019-03-11 14:54:08 +0000
commit13519c32fe0805e6f83bd0ddb1279e85fa8ed2ad (patch)
treed652d80cc30744638dc7177ee6e5091c4cd9d607 /config
parent6abd762670349b78489f73d25acfad6566d68961 (diff)
IBus: switch from ibus-pinyin to ibus-libpinyin + ibus-chewing (refs: #11292).
ibus-pinying is deprecated and in Tails 3.12.1, it segfaults when enabling Bopomofo support. Let's replace it with ibus-libpinying — which supports both Chinese Pinyin and Chinese ZhuYin (Bopomofo) — and also install ibus-chewing, that according to some sources has better Bopomofo support: https://wiki.archlinux.org/index.php/IBus https://www.pinyinjoe.com/linux/ubuntu-18-gnome-chinese-setup.htm
Diffstat (limited to 'config')
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-configure-keyboard25
-rw-r--r--config/chroot_local-packageslists/tails-common.list6
2 files changed, 14 insertions, 17 deletions
diff --git a/config/chroot_local-includes/usr/local/lib/tails-configure-keyboard b/config/chroot_local-includes/usr/local/lib/tails-configure-keyboard
index 4ae9639..c25119c 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-configure-keyboard
+++ b/config/chroot_local-includes/usr/local/lib/tails-configure-keyboard
@@ -23,29 +23,24 @@ fi
LANGPREFIX=`echo "$LANG" | sed 's/_.*//'`
case "$LANGPREFIX" in
ja)
- PRELOAD="['anthy', 'pinyin', 'hangul', 'Unikey', 'bopomofo']"
- SOURCES="[$SOURCES, ('ibus', 'anthy'), ('ibus', 'pinyin'), ('ibus', 'hangul'), ('ibus', 'Unikey'), ('ibus', 'bopomofo')]"
- NEEDIBUS='y'
+ PRELOAD="['anthy', 'libpinyin', 'hangul', 'Unikey', 'chewing']"
+ SOURCES="[$SOURCES, ('ibus', 'anthy'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
;;
ko)
- PRELOAD="['hangul', 'pinyin', 'anthy', 'Unikey', 'bopomofo']"
- SOURCES="[$SOURCES, ('ibus', 'hangul'), ('ibus', 'pinyin'), ('ibus', 'anthy'), ('ibus', 'Unikey'), ('ibus', 'bopomofo')]"
- NEEDIBUS='y'
+ PRELOAD="['hangul', 'libpinyin', 'anthy', 'Unikey', 'chewing']"
+ SOURCES="[$SOURCES, ('ibus', 'hangul'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'anthy'), ('ibus', 'Unikey')]"
;;
vi)
- PRELOAD="['Unikey', 'hangul', 'pinyin', 'anthy', 'bopomofo']"
- SOURCES="[$SOURCES, ('ibus', 'Unikey'), ('ibus', 'hangul'), ('ibus', 'pinyin'), ('ibus', 'anthy'), ('ibus', 'bopomofo')]"
- NEEDIBUS='y'
+ PRELOAD="['Unikey', 'hangul', 'libpinyin', 'anthy', 'chewing']"
+ SOURCES="[$SOURCES, ('ibus', 'Unikey'), ('ibus', 'hangul'), ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'anthy')]"
;;
zh)
- PRELOAD="['pinyin', 'bopomofo', 'anthy', 'hangul', 'Unikey']"
- SOURCES="[$SOURCES, ('ibus', 'pinyin'), ('ibus', 'bopomofo'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
- NEEDIBUS='y'
+ PRELOAD="['libpinyin', 'chewing', 'anthy', 'hangul', 'Unikey']"
+ SOURCES="[$SOURCES, ('ibus', 'libpinyin'), ('ibus', 'chewing'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey')]"
;;
*)
- PRELOAD="['pinyin', 'anthy', 'hangul', 'Unikey', 'bopomofo']"
- SOURCES="[$SOURCES, ('ibus', 'pinyin'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey'), ('ibus', 'bopomofo')]"
- NEEDIBUS='n'
+ PRELOAD="['libpinyin', 'anthy', 'hangul', 'Unikey', 'chewing']"
+ SOURCES="[$SOURCES, ('ibus', 'libpinyin'), ('ibus', 'anthy'), ('ibus', 'hangul'), ('ibus', 'Unikey'), ('ibus', 'chewing')]"
;;
esac
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 9084578..77f032b 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -276,8 +276,10 @@ xserver-xorg-video-amdgpu
ibus-gtk
ibus-gtk3
ibus-qt4
-## Chinese
-ibus-pinyin
+## Chinese Pinyin and ZhuYin (Bopomofo)
+ibus-libpinyin
+## Chinese ZhuYin (Bopomofo)
+ibus-chewing
## Japanese
ibus-anthy
## Korean