[ibus-qt] Added ibus-qt-HEAD.patch to fix bug 921164.

[Takao Fujiwara]

commit 6326fb040d6a4d21ea3f714199b6003bb7507d76
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Thu Mar 21 18:03:25 2013 +0900

    Added ibus-qt-HEAD.patch to fix bug 921164.

 ibus-qt-HEAD.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 ibus-qt.spec       |    8 ++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/ibus-qt-HEAD.patch b/ibus-qt-HEAD.patch
index 8b13789..6c70f2c 100644
--- a/ibus-qt-HEAD.patch
+++ b/ibus-qt-HEAD.patch
@@ -1 +1,41 @@
+From b5bd6307c83cf900f9f8c9a5226a78bcb825e332 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1 at gmail.com>
+Date: Thu, 21 Mar 2013 11:27:08 +0900
+Subject: [PATCH] Enable dead_belowdot with de layout.
+
+AltGr + j returns dead_belowdot in de layout.
+E.g. AltGr + j, s returns U+1E63 with de.
+XLookupString can get dead_belowdot but the return value is 0.
+I think XLookupString does not failed with return value 0.
+
+BUG=RH#921164
+
+Review URL: https://codereview.appspot.com/7812045
+---
+ qtim/ibus-input-context.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/qtim/ibus-input-context.cpp b/qtim/ibus-input-context.cpp
+index 8c00a10..0c9e547 100644
+--- a/qtim/ibus-input-context.cpp
++++ b/qtim/ibus-input-context.cpp
+@@ -248,9 +248,13 @@ translate_x_key_event (XEvent *xevent, uint *keyval, uint *keycode, uint *state)
+         *state |= IBus::ReleaseMask;
+ 
+     char key_str[64];
+-    if (XLookupString (&xevent->xkey, key_str, sizeof (key_str), (KeySym *)keyval, 0) <= 0) {
+-        *keyval = (quint32) XLookupKeysym (&xevent->xkey, 0);
+-    }
++    /* Follow gtkxim module.
++     * https://git.gnome.org/browse/gtk+/tree/modules/input/gtkimcontextxim.c#n736
++     * I think XLookupString can get right keyval even if the return value
++     * is 0 but key_str might not be a string.
++     * And XLookupString won't return the negative value in my test. */
++    XLookupString (&xevent->xkey, key_str, sizeof (key_str),
++                   (KeySym *)keyval, 0);
+ 
+     return true;
+ 
+-- 
+1.8.0
 
diff --git a/ibus-qt.spec b/ibus-qt.spec
index a91786b..e7deb7c 100644
--- a/ibus-qt.spec
+++ b/ibus-qt.spec
@@ -2,14 +2,14 @@
 
 Name:       ibus-qt
 Version:    1.3.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Qt IBus library and Qt input method plugin
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
 
-# Patch0:     ibus-qt-HEAD.patch
+Patch0:     ibus-qt-HEAD.patch
 
 BuildRequires:  cmake
 BuildRequires:  qt4-devel >= 4.5
@@ -41,6 +41,7 @@ The ibus-qt-docs package contains developer documentation for ibus qt library.
 %prep
 %setup -q -n %{name}-%{version}-Source
 # %%patch0 -p1
+%patch0 -p1
 
 %build
 %cmake \
@@ -75,6 +76,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %doc docs/html
 
 %changelog
+* Thu Mar 21 2013 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.2-2
+- Added ibus-qt-HEAD.patch to fix bug 921164.
+
 * Mon Mar 11 2013 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.2-1
 - Updated to 1.3.2.