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

Accepting request 232326 from home:MargueriteSu:branches:M17N

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/232326
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=93
This commit is contained in:
Marguerite Su 2014-05-01 14:30:06 +00:00 committed by Git OBS Bridge
parent 1f8197361a
commit c6c0eeac67
8 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fcitx.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu May 1 14:14:02 UTC 2014 - i@marguerite.su
- Fix bnc#851983: "fcitx tray icon is incompatible with other
systray icons" by refreshing input.svgz
- Fix environment variables: QT_IM_MODULE supports Qt4 & Qt5 now
we need a new QT4_IM_MODULE variable set to prepare for the
worst
- new skin: New Air. Idea from KDE Air theme.
-------------------------------------------------------------------
Thu Apr 17 16:10:11 UTC 2014 - i@marguerite.su

38
fcitx.spec
View File

@ -31,12 +31,13 @@ Source2: fcitx-README.suse
Source3: xim.fcitx.suse.template
# for fedora auto-start
Source7: xinput-fcitx
Source8: openSUSE-default.tar.gz
Source8: openSUSE-themes.tar.gz
Source9: macros.%{name}
BuildRequires: cairo-devel
Source10: input.svgz
#PATCH-FEATURE-OPENSUSE marguerite@opensuse.org To support sougou IM, we need a context
# variable to disable punc on the fly
Patch: fcitx-context-variable-disable-punc-on-the-fly.patch
BuildRequires: cairo-devel
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
@ -340,6 +341,20 @@ openSUSE default skin for Fcitx
You can either use this package or download from kde-look.org using knewstaff in fcitx-config-kde4.
%package skin-new-air
Summary: New Air skin for Fcitx
Group: System/I18n/Chinese
Requires: %{name} = %{version}
%if 0%{?suse_version} >= 1140
BuildArch: noarch
%endif
%description skin-new-air
New Air skin for Fcitx, inspired by KDE Air theme.
You can either use this package or download from kde-look.org using knewstaff in
fcitx-config-kde4.
%endif
%package skin-classic
@ -417,13 +432,19 @@ make DESTDIR=%{buildroot} install
cd ..
%if 0%{?suse_version}
# install openSUSE branding
# install openSUSE skins
pushd %{buildroot}%{_datadir}/%{name}/skin/
tar -xzf %{SOURCE8}
mv openSUSE-themes/Dartmouth ./openSUSE-default
mv openSUSE-themes/New_Air ./New_Air
rm -rf openSUSE-themes
popd
# fcitx 4.2.8 use new dbus systray mechanism, so fix the ugly oxygen keyboard icon
mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/
cp -r openSUSE-default/source/inactive.svg %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svg
popd
cp -r %{SOURCE10} %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/
# Change default skin
pushd %{buildroot}%{_datadir}/%{name}/configdesc
sed -i 's/DefaultValue=default/DefaultValue=openSUSE-default/' %{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc
popd
@ -612,6 +633,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||
%exclude %{_libdir}/%{name}/libexec/fcitx-scanner
%if 0%{?suse_version}
%exclude %{_datadir}/%{name}/skin/openSUSE-default
%exclude %{_datadir}/%{name}/skin/New_Air
%endif
%exclude %{_datadir}/%{name}/skin/classic
%exclude %{_datadir}/%{name}/skin/dark
@ -722,13 +744,17 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||
%files branding-openSUSE
%defattr(-,root,root)
%{_datadir}/%{name}/skin/openSUSE-default
%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svg
%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz
%if 0%{?suse_version} <= 1220
%dir %{_kde4_appsdir}/desktoptheme
%dir %{_kde4_appsdir}/desktoptheme/openSUSE
%dir %{_kde4_appsdir}/desktoptheme/openSUSE/icons
%endif
%files skin-new-air
%defattr(-,root,root)
%{_datadir}/%{name}/skin/New_Air
%endif
%files skin-classic

BIN
input.svgz Normal file
View File

Binary file not shown.

3
openSUSE-default.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea201658d8b0e8246d5917ba46ea9bf1c78c966f37ddbcb7edd42b26f93bc7e3
size 306602

3
openSUSE-themes.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:627d7d30a069ee21a5a6fd04eff5165be0afc75675fe4d97b087f0e0ceba8af2
size 778121

1
xim.d-fcitx
View File

@ -10,6 +10,7 @@ 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 test -z "$DBUS_SESSION_BUS_ADDRESS" ; then

1
xim.fcitx.suse.template
View File

@ -22,4 +22,5 @@ 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
fcitx -d

5
xinput-fcitx
View File

@ -10,6 +10,11 @@ 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