diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-05-08 15:16:58 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-05-08 15:17:28 +0200 |
| commit | 7b2db1f6673cfa92ba74c6f513eac5faa65e27ff (patch) | |
| tree | 37625f477a2e126938d6ba7387bff0fd922da3a6 | |
| parent | d3ac5db9da6ff1290439a1cfe80db51bb1792e9b (diff) | |
| download | drakx-7b2db1f6673cfa92ba74c6f513eac5faa65e27ff.tar drakx-7b2db1f6673cfa92ba74c6f513eac5faa65e27ff.tar.gz drakx-7b2db1f6673cfa92ba74c6f513eac5faa65e27ff.tar.bz2 drakx-7b2db1f6673cfa92ba74c6f513eac5faa65e27ff.tar.xz drakx-7b2db1f6673cfa92ba74c6f513eac5faa65e27ff.zip | |
install the right fcitx packages on Plasma
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/lang.pm | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 472dbd60c..7b1769a8e 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- localedrake: + o install the right IM packages on Plasma when using fcitx + Version 17.30 - 7 May 2016 - install nonfree firmware for amdgpu, i915, nouveau diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b34fe6033..d6ce2fe64 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- install the right IM packages on Plasma when using fcitx + Version 17.30 - 7 May 2016 - install nonfree firmware for amdgpu, i915, nouveau diff --git a/perl-install/lang.pm b/perl-install/lang.pm index acf1d5f8b..d6f096a57 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -795,11 +795,15 @@ The actual packages list will consist of: my %IM_config = ( fcitx => { - GTK_IM_MODULE => 'xim', + GTK_IM_MODULE => 'fcitx', XIM => 'fcitx', XIM_PROGRAM => 'fcitx', XMODIFIERS => '@im=fcitx', langs => 'zh', + packages => { + common => sub { if_($is_plasma, 'fcitx-qt5') }, + generic => sub { qw(fcitx) }, + }, }, gcin => { GTK_IM_MODULE => 'gcin', |