pool/fcitx
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 205590 from M17N

Browse Source 
fix bnc#848694 for 13.1. don't know if this can get into by directly submitting to Factory. if not, please drop me a note in accept message

OBS-URL: https://build.opensuse.org/request/show/205590
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fcitx?expand=0&rev=31
This commit is contained in:
Stephan Kulow 2013-11-04 07:49:21 +00:00 committed by Git OBS Bridge
commit c64bee76cf
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fcitx.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Nov 2 07:31:38 UTC 2013 - i@marguerite.su
- fix bnc#848694: fcitx still use the old gtk_immodule_post/postun
-------------------------------------------------------------------
Sat Sep 28 09:02:48 UTC 2013 - i@marguerite.su

24
fcitx.spec
View File

@ -504,32 +504,16 @@ fdupes -n -q -r %{buildroot}
%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so
%endif
# Convenient define for the scriplets
%if %{_lib} == lib64
%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0-64
%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk64.immodules
%else
%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0
%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk.immodules
%endif
%post gtk2
%{_gtk2_query_immodules_update_cache}
%gtk2_immodule_post
%postun gtk2
%{_gtk2_query_immodules_update_cache}
%gtk2_immodule_postun
%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
%if %{_lib} == lib64
%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64
%else
%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0
%endif
%define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules} --update-cache
%post gtk3
%{_gtk3_query_immodules_update_cache}
%gtk3_immodule_post
# Add fcitx icons to gnome3 panel
TARGET="/usr/share/gnome-shell/js/ui/statusIconDispatcher.js"
@ -539,7 +523,7 @@ sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'fcitx': 'input-method',"
fi
%postun gtk3
%{_gtk3_query_immodules_update_cache}
%gtk3_immodule_postun
%endif

4
xim.d-fcitx
View File

@ -1,6 +1,5 @@
if ! type -p fcitx > /dev/null 2>&1 ; then
echo "fcitx is not available."
PATH=$OLD_PATH
echo "fcitx is not installed. please run `sudo zypper in fcitx`."
return 1
fi
@ -10,7 +9,6 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
fi
export LC_CTYPE=$LANG
# So you can use either zh_CN.UTF-8 or zh_CN.GB2312
export XMODIFIERS="@im=fcitx"
export GTK_IM_MODULE=fcitx
export GTK3_IM_MODULE=fcitx