Accepting request 919392 from home:trmdi

Add wayland support

OBS-URL: https://build.opensuse.org/request/show/919392
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=162
This commit is contained in:
Takashi Iwai 2021-09-16 05:49:08 +00:00 committed by Git OBS Bridge
parent ac87de61c8
commit 0819f8fbf9
2 changed files with 13 additions and 2 deletions

5
30-fcitx.conf Normal file
View File

@ -0,0 +1,5 @@
INPUT_METHOD=fcitx
XMODIFIERS="@im=fcitx"
GTK_IM_MODULE=fcitx
QT_IM_SWITCHER=imsw-multi
QT_IM_MODULE=fcitx

View File

@ -1,7 +1,7 @@
# #
# spec file for package fcitx # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 Source1: xim.d-fcitx
Source2: fcitx-README.suse Source2: fcitx-README.suse
Source3: xim.fcitx.suse.template Source3: xim.fcitx.suse.template
Source4: 30-fcitx.conf
Source8: openSUSE-themes.tar.gz Source8: openSUSE-themes.tar.gz
Source9: macros.%{name} Source9: macros.%{name}
Source99: baselibs.conf Source99: baselibs.conf
@ -79,7 +80,7 @@ Recommends: %{name}-table = %{version}-%{release}
%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200 %if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
Recommends: %{name}-qt4 = %{version}-%{release} Recommends: %{name}-qt4 = %{version}-%{release}
%endif %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 # for spell-checking for keyboard users. ld can't find
# them, so explicitly recommends. # them, so explicitly recommends.
Recommends: libenchant1 Recommends: libenchant1
@ -378,6 +379,10 @@ cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/ mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/
install -m 644 %{SOURCE1} %{buildroot}%{_distconfdir}/X11/xim.d/fcitx 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 priority=30
pushd %{buildroot}%{_distconfdir}/X11/xim.d/ 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 \ 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}/ %{_libdir}/%{name}/
%{_sysconfdir}/xdg/autostart/%{name}*.desktop %{_sysconfdir}/xdg/autostart/%{name}*.desktop
%{_distconfdir}/X11/xim.d %{_distconfdir}/X11/xim.d
%{_prefix}/lib/environment.d
%doc %{_docdir}/%{name}/ %doc %{_docdir}/%{name}/
# excludes # excludes