pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 501092 from home:qzhao:branches:M17N

Browse Source 
Update ibus.spec file, copy auto-start files to SOURCE directory to enable modifications before compile.  Add ibus-disable-engines-preload-in-GNOME.patch, Disable load preload-engines actions in SLE, which is unnecessary for mono IMF  in SLE and may cause CJK user login failed (bsc#1036729).

OBS-URL: https://build.opensuse.org/request/show/501092
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=164
This commit is contained in:
Takashi Iwai 2017-06-07 10:03:48 +00:00 committed by Git OBS Bridge
parent 6098dc3e6a
commit ced48654c0
3 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ibus-disable-engines-preload-in-GNOME.patch Normal file
View File

@ -0,0 +1,21 @@
diff -Nura ibus-1.5.16/xim.d-ibus-121 ibus-1.5.16_new/xim.d-ibus-121
--- ibus-1.5.16/xim.d-ibus-121 2017-06-05 14:38:10.728021247 +0800
+++ ibus-1.5.16_new/xim.d-ibus-121 2017-06-05 14:40:44.380353362 +0800
@@ -13,17 +13,6 @@
# G-S-D. see bnc#873016.
*gnome*)
SOURCES=$(gsettings get org.freedesktop.ibus.general preload-engines)
- if [ "$SOURCES" == '@as []' ]; then
- echo "initial GNOME startup, ibus default configuration applied"
- ibus-daemon -d
- timer=5
- while [ "$SOURCES" == '@as []' ] && [ ${timer} -gt 0 ]; do
- sleep 1
- timer=$[${timer}-1]
- SOURCES=$(gsettings get org.freedesktop.ibus.general preload-engines)
- done
- ibus exit
- fi
# make sure G-S-D keyboard plugin is active
echo "ibus will be managed by GNOME."
gsettings set org.gnome.settings-daemon.plugins.keyboard active true

9
ibus.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat May 27 12:21:30 UTC 2017 - qzhao@suse.com
- Update ibus.spec file, copy auto-start files to SOURCE directory
to enable modifications before compile.
- Add ibus-disable-engines-preload-in-GNOME.patch, Disable load
preload-engines actions in SLE, which is unnecessary for mono IMF
in SLE and may cause CJK user login failed (bsc#1036729).
-------------------------------------------------------------------
Wed May 24 14:00:34 UTC 2017 - ftake@geeko.jp

17
ibus.spec
View File

@ -66,6 +66,8 @@ Patch10: hide-setup-menu.patch
# PATCH-FIX-SLE setup-switch-im.patch bnc#899259 qzhao@suse.com
# switch to ibus when ibus not running.
Patch11: setup-switch-im.patch
# PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bsc#1036729 qzhao@suse.com -- Disable ibus engines preload in GNOME for These works are handled by gnome-shell.
Patch12: ibus-disable-engines-preload-in-GNOME.patch
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel >= 0.83.0
BuildRequires: dconf-devel >= 0.7.5
@ -254,6 +256,13 @@ sed -i \
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
cp -r %{SOURCE4} .
sed -i 1i"SYS_LIB=%{_lib}" xim.d-ibus-121
cp -r %{SOURCE10} .
cp -r %{SOURCE11} .
%if !0%{?is_opensuse}
%patch12 -p1
%endif
%build
autoreconf -fi
@ -287,13 +296,11 @@ make DESTDIR=%{buildroot} install -j1
# autostart
mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xim.d/ibus
install -m 644 xim.d-ibus-121 %{buildroot}%{_sysconfdir}/X11/xim.d/ibus
mkdir -p %{buildroot}%{_bindir}
install -c -m 0755 %{SOURCE10} %{buildroot}%{_bindir}/ibus-autostart
install -c -m 0755 ibus-autostart %{buildroot}%{_bindir}/ibus-autostart
mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
install -c -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/xdg/autostart/ibus-autostart.desktop
sed -i 1i"SYS_LIB=%{_lib}" %{buildroot}%{_sysconfdir}/X11/xim.d/ibus
install -c -m 0644 ibus-autostart.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ibus-autostart.desktop
PRIORITY=40
pushd %{buildroot}%{_sysconfdir}/X11/xim.d/