Accepting request 503478 from M17N

1

OBS-URL: https://build.opensuse.org/request/show/503478
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=76

ibus-disable-engines-preload-in-GNOME.patch

@@ -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

ibus.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat May 27 12:21:30 UTC 2017 - qzhao@suse.com
+
+- Update ibus.spec: 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
 
@@ -98,15 +107,15 @@ Wed Mar 23 10:29:32 UTC 2016 - fcrozat@suse.com
 Mon Feb 28 17:59:28 CET 2016 - qzhao@suse.com
 
 - Add ibus-adapt-new-vala.patch: Fix ibus compile error under
-  new vala compiler, for SLE Desktop 12 SP2. This patch is only
+  new vala compiler in SLE Desktop 12 SP2.
-  for SLED.
 
 --------------------------------------------------------------------
 Mon Feb 28 15:57:01 CET 2016 - qzhao@suse.com
 
-- Add conflict to fcitx to fulfill FATE#319095
+- Update ibus.spec: Add "Conflicts: fcitx" tag in SLE,
-  deprecate fcitx chinese input method in favor of ibus
+  This can help to keep old fcitx input-frame for people
-  (dummy bsc#933411). This modification is only for SLED.
+  who updated from SLE-12-SP0 to SP1, means to avoid the exception
+  which was brought by FATE#319095.
 
 -------------------------------------------------------------------
 Mon Feb 28 14:57:01 CET 2016 - sbrabec@suse.com
@@ -116,16 +125,20 @@ Mon Feb 28 14:57:01 CET 2016 - sbrabec@suse.com
 -------------------------------------------------------------------
 Mon Feb 28 12:20:10 CET 2016 - qzhao@suse.com
 
-- Add setup-switch-im.patch. Switch to ibus when ibus not
+- Add setup-switch-im.patch: In SLE, if user launch ibus-setup
-  running.(bnc#899259). This patch is only for SLED.
+  without ibus service daemon running, it will warn the user and
+  switch current input-frame to ibus by setting an environment
+  variable. Note, the setting will make effect the next time this
+  user login to desktop (bsc#899259).
 
 -------------------------------------------------------------------
 Mon Feb 28 10:30:20 CET 2016 - qzhao@suse.com
 
-- Add hide-setup-menu.patch
+- Add hide-setup-menu.patch: Remove ibus-setup.desktop entry in
-  Make ibus-setup launch from indicator field.(bnc#899259)
+  SLE from desktop main menu, So it will only be launched from
-  Remove ibus-setup.desktop from main menu. This patch is only
+  desktop indicator field now.
-  for SLED.
+  This action is for insure ibus-setup runs with ibus-daemon in
+  background everytime (bsc#899259).
 
 -------------------------------------------------------------------
 Wed Feb 24 11:01:08 CET 2016 - tiwai@suse.de

ibus.spec

@@ -45,7 +45,7 @@ Source11:       ibus-autostart.desktop
 Source99:       baselibs.conf
 # PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp
 Patch0:         ibus-python-install-dir.patch
-# PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwa@suse.de -- Fix lost XIM input after screenlock
+# PATFH-FIX-OPENSUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwai@suse.de -- Fix lost XIM input after screenlock
 Patch4:         ibus-xim-fix-re-focus-after-lock.patch
 # PATCH-FIX-UPSTREAM marguerite@opensuse.org
 # Ibus will use python3 only when variable PYTHON2 is empty.
@@ -66,6 +66,9 @@ 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 bnc#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
@@ -103,7 +106,6 @@ BuildRequires:  pkgconfig(vapigen)
 %if %{with_wayland}
 BuildRequires:  pkgconfig(wayland-client) >= 1.2.0
 %endif
-# BuildRequires:  nodejs-emojione
 BuildRequires:  pkgconfig(xkbcommon)
 # copy_deep method is supported since 0.31.1
 BuildRequires:  vala >= 0.31.1
@@ -116,7 +118,9 @@ Requires:       libibus-1_0-5 = %{version}
 # versions to 3.0 only.
 Requires:       typelib-1_0-Gtk-3_0
 Recommends:     %{name}-lang
-# PATCH-FEATURE-SLE Add conflict with fcitx FATE #319095 qzhao@suse.com -- Solve the problem for the people update from SP0 to SP1
+
+# PATCH-FEATURE-SLE FATE#319095 qzhao@suse.com
+# Add conflict with fcitx to keep old IMF for people who update from SLE-12 SP0 to SP1.
 %if !0%{?is_opensuse}
 Conflicts:      fcitx
 %endif
@@ -254,6 +258,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 +298,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
+install -c -m 0644 ibus-autostart.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ibus-autostart.desktop
-
-sed -i 1i"SYS_LIB=%{_lib}" %{buildroot}%{_sysconfdir}/X11/xim.d/ibus
 
 PRIORITY=40
 pushd %{buildroot}%{_sysconfdir}/X11/xim.d/