rpm/fcitx
SHA256
1
0
Fork 0
forked from pool/fcitx
Code Pull Requests Activity

Accepting request 335646 from M17N

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/335646
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fcitx?expand=0&rev=48
This commit is contained in:
Dominique Leuenberger 2015-10-06 11:25:47 +00:00 committed by Git OBS Bridge
commit 9124df6cd9
4 changed files with 37 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fcitx.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
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
- Add missing post/postun macro calls for updating desktops and
icons (boo#947842)
- Remove superfluous ldconfig calls from the main package
post/postun
-------------------------------------------------------------------
Wed Oct 1 06:06:23 UTC 2015 - hillwood@linuxfans.org
- Use lua 5.2+, fix build in openSUSE_Factory
-------------------------------------------------------------------
Mon Aug 10 14:19:20 UTC 2015 - i@marguerite.su

19
fcitx.spec
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
@ -54,20 +52,17 @@ BuildRequires: fdupes
%if 0%{?suse_version} > 1110
BuildRequires: libqt4-devel
%endif
%if 0%{?suse_version} <= 1210
BuildRequires: lua-devel
%else
BuildRequires: lua51-devel
%endif
BuildRequires: cmake
BuildRequires: extra-cmake-modules
BuildRequires: gtk2-devel
BuildRequires: opencc-devel
BuildRequires: pkgconfig(lua)
%if 0%{?suse_version} >= 1140
BuildRequires: gobject-introspection-devel
BuildRequires: gtk3-devel
%endif
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libicu-devel
BuildRequires: libxml2-devel
BuildRequires: pkg-config
@ -493,9 +488,15 @@ fi
%endif
%post -p /sbin/ldconfig
%post
%desktop_database_post
%icon_theme_cache_post
exit 0
%postun -p /sbin/ldconfig
%postun
%desktop_database_postun
%icon_theme_cache_postun
exit 0
%post -n lib%{name}%{libver} -p /sbin/ldconfig

19
xim.d-fcitx
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

21
xinput-fcitx
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