From c6c0eeac67a4293b272e99bafe30a426724a69f57f4d86339288caf6e6eeb123 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Thu, 1 May 2014 14:30:06 +0000 Subject: [PATCH] Accepting request 232326 from home:MargueriteSu:branches:M17N OBS-URL: https://build.opensuse.org/request/show/232326 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=93 --- fcitx.changes | 10 ++++++++++ fcitx.spec | 38 ++++++++++++++++++++++++++++++++------ input.svgz | Bin 0 -> 1562 bytes openSUSE-default.tar.gz | 3 --- openSUSE-themes.tar.gz | 3 +++ xim.d-fcitx | 1 + xim.fcitx.suse.template | 1 + xinput-fcitx | 5 +++++ 8 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 input.svgz delete mode 100644 openSUSE-default.tar.gz create mode 100644 openSUSE-themes.tar.gz diff --git a/fcitx.changes b/fcitx.changes index 8f38f1e..ff31bba 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -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 diff --git a/fcitx.spec b/fcitx.spec index 3a7d05c..aacf04f 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -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 diff --git a/input.svgz b/input.svgz new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..9da72e30535fedfdb448cda13018dd0f808797dc7c99a970c64646fed62c8d13 GIT binary patch literal 1562 zcmV+#2Icu5iwFP!000000OeRqkJ~m7zVEM4l}i@2C_eO}V{Z-(3Iyn>P0(W@OSG-5 zBnlM0w)5*d)Weo!J4u^GfJL-e>}qB>ocZSCkmBO)p~$T#q3TSQOPe5UTcS*4nw6WS z{qe)^PGnoPj>|O8Whs_+DebopcZ**f$NEi)Sc}x!XL@VBFCXh9u7ve^t93PZ-Ti)# zvQCJk+PL?Y<2>BmE$XMuon=`tZ&}aNWNCK;s-4Ok!!&V4E(%fV+9im%_Srl+n`5fDC}deTBg^{Lz*wd0leLLv&l)4bId?I2DRscYsgI?O56*Zf#CUBe#TdJwJ6nF6 z)w~8kEBHN`_X1SQol3+S#tBpk?Y{f)?xb`uN_9GL)8jdsbp&!57ox7>MAU9CZ^rMl zRBx9y!_C`PWSgyC+LR+6M4{gZvvg@g)Uj$6omW z+Qlg#GfDcCiM<)qX1a>&78%Q`;tjAUmuhLhA|YXfb&8c#sZhNtXr7Tu0@9g2w(F+z z-A81+p7a=ntbMMT)!R6gdnm_L`B};WoCi~Ra)2Ze4@2Pch0cV-kmobZqp1=qvoj0J z*_D|F@>Yk7;X9>_K^`9kWW8a;^E;b*EB6~^z+1=p3BA)uC?90ubW9_ddN(Y3_J!mk zzRm*Db1uN>bda8NfnujC;zL$sp9O?SrY3b6SB?q49>?EgwaZcga;sSekvoKS>Q6%nUR-71Ofx(X^<;(I{-oZPucDxfmOH zD%SORRhl=iA5sV%r?HOD>RuA|$wLF5|M~9shi>LYlFa{>>ah>RvW!8zk~^TA{csX5 z(qs-Tw}|yaRsgW3TmK3zcHy2CBV&`%*=g%miMDrN-N4eM$jl)3FP-K2doxLw*1&0| zb8!|f+%EbqH+PWS!tGOU-Zt$Jt>Usa;hIvxzd3Bjubl{SpHgUKGlyW0AsVuK`;1}N zUoU8`mPJVRRPh@!yPiFz6LGf+GaB3>Nw`79c;Mp6}hC%5rwr zx@$HM=TRJ2GFIuZdYfS>+L>{P2Ns4Iu?IG5*n%{cjit*D=OG3{DuO(G8H{l<9>4M43F4gi{}1@q>_$1+#Zqj7p~#PDcoEFk68Rbs0}Q$S(&_ONF+QBO zgXds;WcoQJUurea&Ug=TazVX@@fZb!d%-lA=VN>{b^Y?_@qNJij9vqtBkV;un3nn( zfuFkm`GEJX0q?&#)ui#%pUh%k(OI&-M$)R6_BG1Q0i`HUbE5YM8BM}cn)x)D>s6>b;| zq0>%V!TGXGmVk+t%1L(WDb_nBragb*ZU!&Y#c=)p5)!e$WOeu^tHJH+$6Bb`-5&Et zv65x&LSat#tNk=Hb3_x+m1ft=83)^~ zJfHbvbh{-xx|!~uez~)8;_asZ3s4a9aTSk^hC_LMSo_1PmQ8=jvT3hZ;LpO`0zKUQ M3pRa~ClVO|0I6>b<^TWy literal 0 HcmV?d00001 diff --git a/openSUSE-default.tar.gz b/openSUSE-default.tar.gz deleted file mode 100644 index dd30860..0000000 --- a/openSUSE-default.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea201658d8b0e8246d5917ba46ea9bf1c78c966f37ddbcb7edd42b26f93bc7e3 -size 306602 diff --git a/openSUSE-themes.tar.gz b/openSUSE-themes.tar.gz new file mode 100644 index 0000000..1a369b3 --- /dev/null +++ b/openSUSE-themes.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:627d7d30a069ee21a5a6fd04eff5165be0afc75675fe4d97b087f0e0ceba8af2 +size 778121 diff --git a/xim.d-fcitx b/xim.d-fcitx index b384556..f292a65 100644 --- a/xim.d-fcitx +++ b/xim.d-fcitx @@ -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 diff --git a/xim.fcitx.suse.template b/xim.fcitx.suse.template index 87fc17e..65d5a70 100644 --- a/xim.fcitx.suse.template +++ b/xim.fcitx.suse.template @@ -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 diff --git a/xinput-fcitx b/xinput-fcitx index 13496c0..606f860 100644 --- a/xinput-fcitx +++ b/xinput-fcitx @@ -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