Accepting request 335645 from home:MargueriteSu:branches:M17N

OBS-URL: https://build.opensuse.org/request/show/335645
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=123
This commit is contained in:
Marguerite Su 2015-10-02 02:58:54 +00:00 committed by Git OBS Bridge
parent d05fed8b85
commit 0bfd314046
4 changed files with 14 additions and 41 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Oct 2 02:50:30 UTC 2015 - i@marguerite.su
- drop xinput-fcitx, which is not used by openSUSE
- simplify xim.d-fcitx again
* do not define shell functions for success/failure, because
previous x11-tools change has been reverted, we can use
bash again.
* do not detect existence for fcitx itself, because this
scriptlet is installed with fcitx.
* drop usage of GTK3_IM_MODULE/QT4_IM_MODULE, the former
doesn't exist while the later is covered by QT_IM_MODULE
-------------------------------------------------------------------
Thu Oct 1 11:30:10 CEST 2015 - tiwai@suse.de

View File

@ -29,8 +29,6 @@ Source: http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.x
Source1: xim.d-fcitx
Source2: fcitx-README.suse
Source3: xim.fcitx.suse.template
# for fedora auto-start
Source7: xinput-fcitx
Source8: openSUSE-themes.tar.gz
Source9: macros.%{name}
Source99: baselibs.conf

View File

@ -1,26 +1,9 @@
function failure
{
return 1
}
function success
{
return 0
}
if ! [ -x /usr/bin/fcitx ] ; then
echo "fcitx is not installed. please 'sudo zypper in fcitx'."
$failure
fi
#make sure set these vars before dbus-launch
export LC_CTYPE=$LANG
export XMODIFIERS="@im=fcitx"
export GTK_IM_MODULE=fcitx
export GTK3_IM_MODULE=fcitx
export QT_IM_SWITCHER=imsw-multi
export QT_IM_MODULE=fcitx
export QT4_IM_MODULE=fcitx
# Avoid relying on autolaunch to improvise D-Bus sessions for each process
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] ; then
@ -30,4 +13,4 @@ fi
fcitx -d
# success:
$success
return 0

View File

@ -1,21 +0,0 @@
XIM=fcitx
XIM_PROGRAM=/usr/bin/fcitx
ICON="/usr/share/pixmaps/fcitx.png"
XIM_ARGS="-D"
PREFERENCE_PROGRAM=/usr/bin/fcitx-configtool
SHORT_DESC="FCITX"
GTK_IM_MODULE=fcitx
GTK3_IM_MODULE=fcitx
if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx.so || \
test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx.so;
then
QT_IM_MODULE=fcitx
if test -f /usr/lib/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so || \
test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so;
then
QT4_IM_MODULE=fcitx
fi
else
QT_IM_MODULE=xim
fi