diff -Nru im-config-0.34/debian/changelog im-config-0.34/debian/changelog --- im-config-0.34/debian/changelog 2018-02-13 22:21:00.000000000 +0000 +++ im-config-0.34/debian/changelog 2018-05-24 21:54:00.000000000 +0000 @@ -1,3 +1,11 @@ +im-config (0.34-1ubuntu2) cosmic; urgency=medium + + * debian/patches/dont-set-GTK_IM_MODULE-on-wayland.patch: + - Don't set GTK_IM_MODULE if IBus on Wayland session + (LP: #1761554). + + -- Gunnar Hjalmarsson Thu, 24 May 2018 23:54:00 +0200 + im-config (0.34-1ubuntu1) bionic; urgency=medium * Merge with Debian unstable, remaining changes: diff -Nru im-config-0.34/debian/patches/dont-set-GTK_IM_MODULE-on-wayland.patch im-config-0.34/debian/patches/dont-set-GTK_IM_MODULE-on-wayland.patch --- im-config-0.34/debian/patches/dont-set-GTK_IM_MODULE-on-wayland.patch 1970-01-01 00:00:00.000000000 +0000 +++ im-config-0.34/debian/patches/dont-set-GTK_IM_MODULE-on-wayland.patch 2018-05-24 18:41:07.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Don't set GTK_IM_MODULE if IBus on Wayland session +Bug: https://launchpad.net/bugs/1761554 +Author: Gunnar Hjalmarsson +Forwarded: not-needed + +--- a/data/21_ibus.rc ++++ b/data/21_ibus.rc +@@ -29,7 +29,9 @@ + break + fi + done +-if [ $IM_CONFIG_MARKER2 = 1 ] && [ $IM_CONFIG_MARKER3 = 1 ] ; then ++if [ "$XDG_SESSION_TYPE" = 'wayland' ]; then ++ unset GTK_IM_MODULE ++elif [ $IM_CONFIG_MARKER2 = 1 ] && [ $IM_CONFIG_MARKER3 = 1 ] ; then + GTK_IM_MODULE=ibus + fi + diff -Nru im-config-0.34/debian/patches/series im-config-0.34/debian/patches/series --- im-config-0.34/debian/patches/series 2017-10-14 14:34:59.000000000 +0000 +++ im-config-0.34/debian/patches/series 2018-05-24 17:55:46.000000000 +0000 @@ -2,3 +2,4 @@ use-distinguishable-abstract-address.patch dont-start-ibus-if-gdm3.patch discard-fcitx-launch-errors.patch +dont-set-GTK_IM_MODULE-on-wayland.patch