[Pkg-ime-devel] Bug#645729: checking for ibus support in gtk2 and gtk3 separately

[Steve Langasek]

Package: ibus
Version: 1.4.0-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Hello,

The Ubuntu package of ibus includes a patch to debian/xinput/ibus to check
for ibus support in each version of gtk separately.  The reason for this is
given at <https://bugs.launchpad.net/ubuntu/+source/ibus/+bug/823202>.
Basically, if both ibus-gtk and ibus-gtk3 are installed (as should be the
case for a while, since the transition to gtk3 is ongoing), the file check
will fail because the glob expands to multiple files.

If only one of ibus-gtk or ibus-gtk3 is installed, I don't know what the
desired behavior would be here, but I think we should fall back to xim in
that case because it's safer.

Thanks for considering the patch.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
=== modified file 'debian/xinput/ibus'
--- debian/xinput/ibus	2011-05-20 22:02:36 +0000
+++ debian/xinput/ibus	2011-10-18 05:49:19 +0000
@@ -1,7 +1,10 @@
 XIM=ibus
 XIM_PROGRAM=/usr/bin/ibus-daemon
 XIM_ARGS="--xim"
-if [ -e /usr/lib/gtk-*.0/*/immodules/im-ibus.so ]; then
+
+if [ -e /usr/lib/gtk-3.0/*/immodules/im-ibus.so ] \
+   && [ -e /usr/lib/*/gtk-2.0/*/immodules/im-ibus.so ]
+then
     GTK_IM_MODULE=ibus
 else
     GTK_IM_MODULE=xim