diff -Nru im-config-0.29.orig/debian/changelog im-config-0.29/debian/changelog --- im-config-0.29.orig/debian/changelog 2016-11-16 11:14:00.000000000 +0100 +++ im-config-0.29/debian/changelog 2017-01-31 23:52:14.121146600 +0100 @@ -1,3 +1,10 @@ +im-config (0.29-1ubuntu12.4) xenial-proposed; urgency=medium + + * debian/patches/hime-qt5.patch: + - Fix hime qt5 immodule (LP: #1655036). + + -- Gunnar Hjalmarsson Tue, 31 Jan 2017 23:52:00 +0100 + im-config (0.29-1ubuntu12.3) xenial-proposed; urgency=medium * debian/patches/fix-uim-qt5.patch: diff -Nru im-config-0.29.orig/debian/patches/hime-qt5.patch im-config-0.29/debian/patches/hime-qt5.patch --- im-config-0.29.orig/debian/patches/hime-qt5.patch 1970-01-01 01:00:00.000000000 +0100 +++ im-config-0.29/debian/patches/hime-qt5.patch 2017-01-31 23:43:49.596763797 +0100 @@ -0,0 +1,39 @@ +Description: Fix hime qt5 immodule +Bug-Ubuntu: https://launchpad.net/bugs/1655036 +Origin: https://anonscm.debian.org/cgit/collab-maint/im-config.git/commit/?id=de33e65fe4fdd30ee0acfa13decf6dd6d4d5256b + +diff --git a/data/25_hime.conf b/data/25_hime.conf +index 5381aee..71c8f86 100644 +--- a/data/25_hime.conf ++++ b/data/25_hime.conf +@@ -7,8 +7,8 @@ IM_CONFIG_LONG="$(gettext "HIME Input Method Editor (hime) + * Traditional Chinese: hime-chewing + * Japanese: hime-anthy + * Application platform support: +- * GNOME/GTK+: hime-gtk3-immodule +- * KDE/Qt: hime-qt4-immodule")" ++ * GNOME/GTK+: hime-gtk2-immodule, hime-gtk3-immodule ++ * KDE/Qt: hime-qt4-immodule, hime-qt5-immodule")" + + package_auto () { + package_status hime && package_status hime-gtk3-immodule && package_status hime-qt4-immodule +diff --git a/data/25_hime.rc b/data/25_hime.rc +index bab6959..b5d42d7 100644 +--- a/data/25_hime.rc ++++ b/data/25_hime.rc +@@ -44,6 +44,15 @@ for IM_CONFIG_MARKER in /usr/lib/*/qt4/plugins/inputmethods/im-hime.so \ + fi + done + ++QT_IM_MODULE=xim ++# use immodule when available for Qt5 ++for IM_CONFIG_MARKER in /usr/lib/*/qt5/plugins/platforminputcontexts/im-hime.so ; do ++ if [ -e $IM_CONFIG_MARKER ]; then ++ QT_IM_MODULE=hime ++ break ++ fi ++done ++ + # hime has no clutter support, and qt3 immodule is not compiled. + CLUTTER_IM_MODULE=xim + fi diff -Nru im-config-0.29.orig/debian/patches/series im-config-0.29/debian/patches/series --- im-config-0.29.orig/debian/patches/series 2016-11-16 11:14:00.000000000 +0100 +++ im-config-0.29/debian/patches/series 2017-01-31 23:46:25.289462722 +0100 @@ -5,3 +5,4 @@ use-distinguishable-abstract-address.patch fix-uim-qt5.patch gcin-qt5.patch +hime-qt5.patch