Accepting request 131766 from home:MargueriteSu:branches:M17N
OBS-URL: https://build.opensuse.org/request/show/131766 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=43
This commit is contained in:
Marguerite Su
Git OBS Bridge
parent
f607a35392
commit
c71108c2e4
@ -9,7 +9,7 @@ The number "30" makes fcitx have priority over other input-method (e.g 50-scim o
|
||||
If you prefer not using fcitx, mv 30-fcitx to 80-fcitx (for example). Or see 2.
|
||||
|
||||
2.If for some reason can't start fcitx when login Xwindow
|
||||
There is another input-method who has higher priority then fcitx (e.g 10-oxim)
|
||||
There is another input-method who has higher priority than fcitx (e.g 10-oxim)
|
||||
You can edit ~/.xim, see ~/.xim.template for more informations.
|
||||
Or edit ~/.profile, add
|
||||
export INPUT_METHOD="fcitx"
|
||||
@ -18,32 +18,32 @@ copy this file to ~/.xim, then you can use fcitx next login X.
|
||||
|
||||
3.You want to use your own input-method other than system setting
|
||||
(1)System setting:
|
||||
Edit /etc/sysconfig/language , set INPUT_METHOD="scim-bridge", or whatever you want,Make sure your start-up script is put in /etc/X11/xim.d/ with same name ypu mention.
|
||||
Edit /etc/sysconfig/language , set INPUT_METHOD="fcitx", or whatever you want,Make sure your start-up script is put in /etc/X11/xim.d/ with same name ypu mention.
|
||||
(2)For specific language setting:
|
||||
Link a start-up script in /etc/X11/xim.d/ to your locale with a higher priority (smaller number), eg
|
||||
ln -s /etc/X11/xim.d/scim-bridge /etc/X11/xim.d/zh_CN/20-scim-bridge
|
||||
ln -s /etc/X11/xim.d/fcitx /etc/X11/xim.d/zh_CN/20-fcitx
|
||||
(3)Personal setting:
|
||||
Edit ~/.profile add
|
||||
export INPUT_METHOD="scim-bridge" or whatever script in /etc/X11/xim.d/
|
||||
export INPUT_METHOD="fcitx" or whatever script in /etc/X11/xim.d/
|
||||
or white your own ~/.xim, see ~/.xim.template for more informations.
|
||||
|
||||
4.Bug report or any suggestion to
|
||||
http://code.google.com/p/fcitx/
|
||||
https://github.com/fcitx/
|
||||
|
||||
|
||||
Chinese:
|
||||
|
||||
1.当您使用的语系是en 或zh_CN时，SuSE 会自动启动fcitx
|
||||
启动的script是/etc/X11/xim.d/YOUR-LOCALE/30-fcitx，这是一个到上层目录fcitx的连结
|
||||
"30"这个数字使他的优先顺序高于90-xcin及50-scim
|
||||
1.当您使用的语系是 en 或 zh_CN 时，SuSE 会自动启动 fcitx
|
||||
启动的脚本是 /etc/X11/xim.d/YOUR-LOCALE/30-fcitx，这是一个到上层目录 fcitx 的连结
|
||||
"30"这个数字使他的优先顺序高于 90-xcin 及 50-scim
|
||||
如果您不喜欢这个顺序，修改连结的名称为(例如：80-fcitx)，或参考2.
|
||||
|
||||
2.重新登入X后，如果不能用fcitx...可能是：
|
||||
有别的输入法的优先顺序高于fcitx(例如：10-oxim)
|
||||
您可以编辑~/.xim，请参考~/.xim.template
|
||||
安装fcitx后，会有一个范本：/usr/share/doc/packages/fcitx/xim.fcitx.suse.template
|
||||
将这个档案复制到您的~/.xim，当您下次登入X时就可以使用fcitx了
|
||||
或编辑~/.profile，加入
|
||||
2.重新登入 X 后，如果不能用 fcitx...可能是：
|
||||
有别的输入法的优先顺序高于 fcitx (例如：10-oxim)
|
||||
您可以编辑 ~/.xim，请参考 ~/.xim.template
|
||||
安装 fcitx 后，会有一个范本：/usr/share/doc/packages/fcitx/xim.fcitx.suse.template
|
||||
将这个档案复制到您的 ~/.xim，当您下次登入X时就可以使用 fcitx 了
|
||||
或编辑 ~/.profile，加入
|
||||
export INPUT_METHOD="fcitx"
|
||||
|
||||
3.如果您想要自己选择输入法而非使用系统设定
|
||||
@ -52,11 +52,11 @@ export INPUT_METHOD="fcitx"
|
||||
请注意你的启动程序必须位于 /etc/X11/xim.d/，并和您指定的名称相同
|
||||
(2)针对特定语言：
|
||||
将您的启动程序连结到你的语系中，并前置较高的优先顺序(较小数字)，例如
|
||||
ln -s /etc/X11/xim.d/fcitx /etc/X11/xim.d/zh_CN/20-scim-bridge
|
||||
ln -s /etc/X11/xim.d/fcitx /etc/X11/xim.d/zh_CN/30-fcitx
|
||||
(3)个人设定：
|
||||
编辑 ~/.profile 加入
|
||||
export INPUT_METHOD="fcitx" 或其他在 /etc/X11/xim.d/ 的启动程序
|
||||
或自行编写启动程序 ~/.xim，请参考 ~/.xim.template
|
||||
|
||||
5.臭虫回报或建议请至
|
||||
http://code.google.com/p/fcitx/
|
||||
https://github.com/fcitx/
|
||||
|
||||
46
fcitx.spec
46
fcitx.spec
@ -87,7 +87,7 @@ Requires: %{name}-qt4 = %{version}-%{release}
|
||||
%if 0%{?suse_version}
|
||||
Recommends: %{name}-pinyin = %{version}-%{release}
|
||||
Recommends: %{name}-table = %{version}-%{release}
|
||||
Recommends: %{name}-branding-openSUSE = %{version}
|
||||
Requires: %{name}-branding = %{version}
|
||||
%endif
|
||||
%if 0%{?fedora_version}
|
||||
Requires(post): %{_sbindir}/alternatives
|
||||
@ -308,35 +308,25 @@ Requires: lib%{name}%{libver} = %{version}-%{release}
|
||||
%description pinyin-tools
|
||||
Tools to convert txt or scel(sougou pinyin data format) pinyin sheets to fcitx match lists.
|
||||
|
||||
%if 0%{?suse_version}
|
||||
|
||||
%package branding-openSUSE
|
||||
Summary: openSUSE default Skin for Fcitx
|
||||
Group: System/I18n/Chinese
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
|
||||
%if 0%{?suse_version} >= 1140
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
Provides: fcitx-branding = %{version}
|
||||
Conflicts: otherproviders(fcitx-branding)
|
||||
Provides: %{name}-branding = %{version}
|
||||
Conflicts: otherproviders(%{name}-branding)
|
||||
Supplements: packageand(%{name}:branding-openSUSE)
|
||||
|
||||
%description branding-openSUSE
|
||||
openSUSE default skin for Fcitx
|
||||
|
||||
You can either use this package or download from kde-look.org using knewstaff in fcitx-config-kde4.
|
||||
|
||||
%package branding-upstream
|
||||
Summary: Fcitx Upstream default Skin
|
||||
Group: System/I18n/Chinese
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
Provides: fcitx-branding = %{version}
|
||||
Conflicts: otherproviders(fcitx-branding)
|
||||
|
||||
%description branding-upstream
|
||||
Fcitx default skin.
|
||||
|
||||
You can either use this package or download from kde-look.org using knewstaff in fcitx-config-kde4.
|
||||
|
||||
%package skin-classic
|
||||
Summary: Fcitx Classic Skin
|
||||
@ -405,10 +395,15 @@ make DESTDIR=%{buildroot} install
|
||||
|
||||
cd ..
|
||||
|
||||
%if 0%{?suse_version}
|
||||
# install openSUSE branding
|
||||
pushd %{buildroot}%{_datadir}/%{name}/skin/
|
||||
tar -xzf %{SOURCE8}
|
||||
popd
|
||||
pushd %{buildroot}%{_datadir}/%{name}/configdesc
|
||||
sed -i 's/DefaultValue=default/DefaultValue=openSUSE-default/' %{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc
|
||||
popd
|
||||
%endif
|
||||
|
||||
# fix desktop file
|
||||
sed -i "s/x-fskin/x-fskin;/" %{buildroot}%{_datadir}/applications/fcitx-skin-installer.desktop
|
||||
@ -432,14 +427,18 @@ desktop-file-install --add-category="System" --delete-original --dir=%{buildroot
|
||||
%if 0%{?suse_version}
|
||||
mkdir %{buildroot}%{_docdir}
|
||||
mv %{buildroot}%{_datadir}/doc/%{name}/ %{buildroot}%{_docdir}
|
||||
cp -r %{SOURCE2} %{buildroot}%{_docdir}/%{name}/
|
||||
cp -r %{SOURCE3} %{buildroot}%{_docdir}/%{name}/
|
||||
cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/
|
||||
cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
|
||||
%endif
|
||||
%if 0%{?fedora_version}
|
||||
mkdir %{buildroot}%{_docdir}/packages/
|
||||
mv %{buildroot}%{_datadir}/doc/%{name}/ %{buildroot}%{_docdir}/packages/
|
||||
cp -r AUTHORS %{buildroot}%{_docdir}/packages/%{name}/
|
||||
cp -r ChangeLog %{buildroot}%{_docdir}/packages/%{name}/
|
||||
cp -r %{SOURCE2} %{buildroot}%{_docdir}/packages/%{name}/
|
||||
cp -r %{SOURCE3} %{buildroot}%{_docdir}/packages/%{name}/
|
||||
cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/
|
||||
cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/
|
||||
%endif
|
||||
|
||||
# create autostart
|
||||
@ -592,8 +591,9 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||
|
||||
%exclude %{_libdir}/%{name}/fcitx-pinyin.so
|
||||
%exclude %{_libdir}/%{name}/fcitx-table.so
|
||||
%exclude %{_libdir}/%{name}/fcitx-qw.so
|
||||
%if 0%{?suse_version}
|
||||
%exclude %{_datadir}/%{name}/skin/openSUSE-default
|
||||
%exclude %{_datadir}/%{name}/skin/default
|
||||
%endif
|
||||
%exclude %{_datadir}/%{name}/skin/classic
|
||||
%exclude %{_datadir}/%{name}/skin/dark
|
||||
|
||||
@ -707,13 +707,13 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||
|
||||
%{_mandir}/man1/mb2org.1.gz
|
||||
%{_mandir}/man1/scel2org.1.gz
|
||||
|
||||
%if 0%{?suse_version}
|
||||
|
||||
%files branding-openSUSE
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/%{name}/skin/openSUSE-default
|
||||
|
||||
%files branding-upstream
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/%{name}/skin/default
|
||||
%endif
|
||||
|
||||
%files skin-classic
|
||||
%defattr(-,root,root)
|
||||
|
||||
@ -6,17 +6,18 @@
|
||||
#if any program can't input Chinese, try export LC_CTYPE=zh_CN.UTF-8, e.g
|
||||
|
||||
#export LC_CTYPE=zh_CN.UTF-8
|
||||
export XMODIFIERS="@im=fcitx"
|
||||
export GTK_IM_MODULE=xim
|
||||
export QT_IM_SWITCHER=imsw-multi
|
||||
export QT_IM_MODULE=xim
|
||||
fcitx -d
|
||||
|
||||
## Note for FCITX version >= 4.1
|
||||
## For FCITX 3 series and 4.0 Only
|
||||
#export XMODIFIERS="@im=fcitx"
|
||||
#export GTK_IM_MODULE=xim
|
||||
#export QT_IM_SWITCHER=imsw-multi
|
||||
#export QT_IM_MODULE=xim
|
||||
#fcitx -d
|
||||
|
||||
## For FCITX version >= 4.1
|
||||
#Since FCITX 4.1, you can use fcitx itself (besides xim) as the immodule,so the following code might work better (fcitx-gtk2/3, fcitx-qt must be installed), especially when you are using gnome3.
|
||||
|
||||
#export XMODIFIERS="@im=fcitx"
|
||||
#export GTK_IM_MODULE=fcitx
|
||||
#export QT_IM_MODULE=fcitx
|
||||
#fcitx -d
|
||||
#
|
||||
export XMODIFIERS="@im=fcitx"
|
||||
export GTK_IM_MODULE=fcitx
|
||||
export QT_IM_MODULE=fcitx
|
||||
fcitx -d
|
||||
Loading…
Reference in New Issue
Block a user