Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2014-05-02 13:55:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-04-25 16:09:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-05-02 13:55:23.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 1 14:14:02 UTC 2014 - [email protected] + +- 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. + +------------------------------------------------------------------- Old: ---- openSUSE-default.tar.gz New: ---- input.svgz openSUSE-themes.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx.spec ++++++ --- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.000000000 +0200 @@ -31,12 +31,13 @@ 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 [email protected] 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 @@ 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 @@ 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 @@ %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 @@ %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 ++++++ xim.d-fcitx ++++++ --- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.000000000 +0200 @@ -10,6 +10,7 @@ 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 ++++++ xim.fcitx.suse.template ++++++ --- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.000000000 +0200 @@ -22,4 +22,5 @@ export GTK3_IM_MODULE=fcitx export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=fcitx +export QT4_IM_MODULE=fcitx fcitx -d ++++++ xinput-fcitx ++++++ --- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.000000000 +0200 @@ -10,6 +10,11 @@ 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
