From a669d04c542db7fb92c1e64847e08b115807b5338df5bfd62600a93ef9c77e44 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Thu, 1 Oct 2015 07:03:49 +0000 Subject: [PATCH 1/3] Accepting request 335109 from home:hillwood:branches:M17N - Use lua 5.2+, fix build in openSUSE_Factory OBS-URL: https://build.opensuse.org/request/show/335109 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=121 --- fcitx.changes | 5 +++++ fcitx.spec | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fcitx.changes b/fcitx.changes index 3d40ec6..5b3f1d3 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/fcitx.spec b/fcitx.spec index 9af814a..4e47e20 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -54,11 +54,7 @@ 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: pkgconfig(lua) BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: gtk2-devel From d05fed8b8538898a5451f9c62668267418231b918e132bf6f7a8dfd5219c7517 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 1 Oct 2015 09:54:59 +0000 Subject: [PATCH 2/3] Accepting request 335154 from home:tiwai:branches:M17N - Add missing post/postun macro calls for updating desktops and icons (boo#947842) - Remove superfluous ldconfig calls from the main package post/postun OBS-URL: https://build.opensuse.org/request/show/335154 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=122 --- fcitx.changes | 8 ++++++++ fcitx.spec | 13 ++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/fcitx.changes b/fcitx.changes index 5b3f1d3..add30e8 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/fcitx.spec b/fcitx.spec index 4e47e20..dd2f0ec 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -54,16 +54,17 @@ BuildRequires: fdupes %if 0%{?suse_version} > 1110 BuildRequires: libqt4-devel %endif -BuildRequires: pkgconfig(lua) 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 @@ -489,9 +490,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 From 0bfd31404672f3a42be02f5302edff57baf287c16fae6d0470ca3bba1b3dae3f Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Fri, 2 Oct 2015 02:58:54 +0000 Subject: [PATCH 3/3] 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 --- fcitx.changes | 13 +++++++++++++ fcitx.spec | 2 -- xim.d-fcitx | 19 +------------------ xinput-fcitx | 21 --------------------- 4 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 xinput-fcitx diff --git a/fcitx.changes b/fcitx.changes index add30e8..483a12c 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -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 diff --git a/fcitx.spec b/fcitx.spec index dd2f0ec..9496905 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -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 diff --git a/xim.d-fcitx b/xim.d-fcitx index 49eb0e7..c805355 100644 --- a/xim.d-fcitx +++ b/xim.d-fcitx @@ -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 diff --git a/xinput-fcitx b/xinput-fcitx deleted file mode 100644 index 606f860..0000000 --- a/xinput-fcitx +++ /dev/null @@ -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 -