diff --git a/30-fcitx.conf b/30-fcitx.conf new file mode 100644 index 0000000..2e5e07c --- /dev/null +++ b/30-fcitx.conf @@ -0,0 +1,5 @@ +INPUT_METHOD=fcitx +XMODIFIERS="@im=fcitx" +GTK_IM_MODULE=fcitx +QT_IM_SWITCHER=imsw-multi +QT_IM_MODULE=fcitx diff --git a/fcitx.spec b/fcitx.spec index 3f21030..6e2c9c5 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,7 +1,7 @@ # # spec file for package fcitx # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,7 @@ Source: https://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar. Source1: xim.d-fcitx Source2: fcitx-README.suse Source3: xim.fcitx.suse.template +Source4: 30-fcitx.conf Source8: openSUSE-themes.tar.gz Source9: macros.%{name} Source99: baselibs.conf @@ -79,7 +80,7 @@ Recommends: %{name}-table = %{version}-%{release} %if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200 Recommends: %{name}-qt4 = %{version}-%{release} %endif -# These libraries are dlopen-ed in fcitx at runtime +# These libraries are dlopen-ed in fcitx at runtime # for spell-checking for keyboard users. ld can't find # them, so explicitly recommends. Recommends: libenchant1 @@ -378,6 +379,10 @@ cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/ mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/ install -m 644 %{SOURCE1} %{buildroot}%{_distconfdir}/X11/xim.d/fcitx +# wayland support +mkdir -p %{buildroot}%{_prefix}/lib/environment.d +install -m 644 %{SOURCE4} %{buildroot}%{_prefix}/lib/environment.d/ + priority=30 pushd %{buildroot}%{_distconfdir}/X11/xim.d/ for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \ @@ -451,6 +456,7 @@ exit 0 %{_libdir}/%{name}/ %{_sysconfdir}/xdg/autostart/%{name}*.desktop %{_distconfdir}/X11/xim.d +%{_prefix}/lib/environment.d %doc %{_docdir}/%{name}/ # excludes