diff --git a/fcitx-4.2.4.1.tar.bz2 b/fcitx-4.2.4.1.tar.bz2 new file mode 100644 index 0000000..97300b7 --- /dev/null +++ b/fcitx-4.2.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27d21fc2a37255219b0ff643be72614f3a3314b46c9d7a263e965b096efded52 +size 904487 diff --git a/fcitx-4.2.4.tar.bz2 b/fcitx-4.2.4.tar.bz2 deleted file mode 100644 index cfae2db..0000000 --- a/fcitx-4.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0889c6ea3dd2066ca582ac3cd5b18c293ee01123d2a454a5731af9da42a24542 -size 11133679 diff --git a/fcitx.changes b/fcitx.changes index 04702be..9c3f98f 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 12 07:22:31 UTC 2012 - i@marguerite.su + +- update to 4.2.4.1 + * urgent fix for compose key. +- use new xim.d-fcitx. + ------------------------------------------------------------------- Sun Jun 3 13:05:53 UTC 2012 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index b63c3f8..e9959a8 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -19,7 +19,7 @@ %define libver -4_2_4 Name: fcitx -Version: 4.2.4 +Version: 4.2.4.1 Release: 0 Summary: A Flexible Input Method Framework for CJK License: GPL-2.0+ diff --git a/xim.d-fcitx b/xim.d-fcitx index ad429bc..d40a53f 100644 --- a/xim.d-fcitx +++ b/xim.d-fcitx @@ -1,48 +1,21 @@ -OLD_PATH=$PATH -PATH=/usr/bin:/usr/X11R6/bin:/opt/kde3/bin:$PATH - if ! type -p fcitx > /dev/null 2>&1 ; then - echo "fcitx is not available." - PATH=$OLD_PATH - return 1 + echo "fcitx is not available." + PATH=$OLD_PATH + return 1 fi -#when skim installed, Autostart must be "false". -#here we move $HOME/.kde/share/config/skimrc to skimrc.orig.fcitx -case "$WINDOWMANAGER" in - *kde*) - if type -p skim > /dev/null 2>&1 \ - && ! grep -i -q "^[[:space:]]*Autostart.*=.*false" $HOME/.kde/share/config/skimrc - then - if [ -f $HOME/.kde/share/config/skimrc.orig.fcitx ] ; then - mv -f $HOME/.kde/share/config/skimrc $HOME/.kde/share/config/skimrc.orig.fcitx - chmod 777 $HOME/.kde/share/config/skimrc.orig.fcitx - fi - cat > $HOME/.kde/share/config/skimrc << __END -[General] -Autostart=false -__END - chmod 777 $HOME/.kde/share/config/skimrc - else - # do nothing - : - fi - ;; - *) - # do nothing - ;; -esac +# Avoid relying on autolaunch to improvise D-Bus sessions for each process +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then + eval `dbus-launch --sh-syntax --exit-with-session` +fi -eval `dbus-launch --sh-syntax --exit-with-session` - 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 QT_IM_SWITCHER=imsw-multi - export QT_IM_MODULE=xim - fcitx -d - -PATH=$OLD_PATH +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 QT_IM_SWITCHER=imsw-multi +export QT_IM_MODULE=fcitx +fcitx -d # success: return 0