[ibus/f14/master] Fixes Bug 652157 - Window position of ibus-x11 in ppc64

[Takao Fujiwara]

commit 36c8c94b1e6889f854f53b43ed4489d5e76f61c3
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Tue Nov 16 10:46:05 2010 +0900

    Fixes Bug 652157 - Window position of ibus-x11 in ppc64

 ibus-652157-x11-ppc64.patch |   29 +++++++++++++++++++++++++++++
 ibus.spec                   |   37 ++++++++++++++++++-------------------
 2 files changed, 47 insertions(+), 19 deletions(-)
---
diff --git a/ibus-652157-x11-ppc64.patch b/ibus-652157-x11-ppc64.patch
new file mode 100644
index 0000000..4f1b0c0
--- /dev/null
+++ b/ibus-652157-x11-ppc64.patch
@@ -0,0 +1,29 @@
+From cd7385f4cc1e729891bd878db12dfafad397b098 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1 at gmail.com>
+Date: Thu, 11 Nov 2010 18:09:52 +0900
+Subject: [PATCH] Always read Window as 32 bits integer to fix problem in ppc64.
+
+---
+ client/x11/main.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/client/x11/main.c b/client/x11/main.c
+index c91a6d7..be9cb0e 100644
+--- a/client/x11/main.c
++++ b/client/x11/main.c
+@@ -277,10 +277,10 @@ _xim_store_ic_values (X11IC *x11ic, IMChangeICStruct *call_data)
+             x11ic->input_style = *(gint32 *) ic_attr->value;
+         }
+         else if (g_strcmp0 (XNClientWindow, ic_attr->name) == 0) {
+-            x11ic->client_window =  *(Window *) call_data->ic_attr[i].value;
++            x11ic->client_window =  (Window)(*(CARD32 *) call_data->ic_attr[i].value);
+         }
+         else if (g_strcmp0 (XNFocusWindow, ic_attr->name) == 0) {
+-            x11ic->focus_window =  *(Window *) call_data->ic_attr[i].value;
++            x11ic->focus_window =  (Window)(*(CARD32 *) call_data->ic_attr[i].value);
+         }
+         else {
+             LOG (1, "Unknown ic attribute: %s", ic_attr->name);
+-- 
+1.7.2.1
+
diff --git a/ibus.spec b/ibus.spec
index 62af154..7d4486c 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -11,7 +11,7 @@
 
 Name:       ibus
 Version:    1.3.7
-Release:    11%{?dist}
+Release:    12%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -22,10 +22,11 @@ Source1:    xinput-ibus
 Patch1:     ibus-621795-engineproxy-segv.patch
 Patch2:     ibus-626652-leak.patch
 Patch3:     ibus-xx-g-ir-compiler.patch
-# Patch4:     ibus-xx-va_list.patch
-# Patch5:     ibus-530711-preload-sys.patch
-Patch6:     ibus-541492-xkb.patch
-Patch7:     ibus-435880-surrounding-text.patch
+Patch4:     ibus-652157-x11-ppc64.patch
+# Patch5:     ibus-xx-va_list.patch
+# Patch6:     ibus-530711-preload-sys.patch
+Patch7:     ibus-541492-xkb.patch
+Patch8:     ibus-435880-surrounding-text.patch
 # WORKAROUND_GTK3_BUILD_FAILURE @ fedora14
 Patch99:    ibus-xx-workaround-gtk3.patch
 
@@ -137,12 +138,13 @@ The ibus-devel-docs package contains developer documentation for ibus
 %patch1 -p1 -b .segv
 %patch2 -p1 -b .leak
 %patch3 -p1 -b .gir
-# %patch4 -p1 -b .valist
-# %patch5 -p1 -b .preload-sys
+%patch4 -p1 -b .ppc64
+# %patch5 -p1 -b .valist
+# %patch6 -p1 -b .preload-sys
 %if %have_libxkbfile
-%patch6 -p1 -b .xkb
+%patch7 -p1 -b .xkb
 %endif
-%patch7 -p1 -b .surrounding
+%patch8 -p1 -b .surrounding
 
 #### start WORKAROUND_GTK3_BUILD_FAILURE
 WORKAROUND_GTK3_BUILD_FAILURE=0
@@ -301,16 +303,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Thu Oct 07 2010 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.7-11
-- Added ibus-xx-g-ir-compiler.patch to fix g-ir-compiler error.
-- Updated ibus-435880-surrounding-text.patch
-  Fixes Bug 634829 - ibus_im_context_set_surrounding() to get strings.
-- Updated ibus-541492-xkb.patch
-  Fixed a bug when changed the system layout "jp(kana)" to "jp".
-- Added ibus-xx-workaround-gtk3.patch
-  Workaround for f14 http://koji.fedoraproject.org/koji/taskinfo?taskID=2516604
-
-* Tue Sep 14 2010 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.7-5
+* Tue Nov 16 2010 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.7-12
 - Added ibus-621795-engineproxy-segv.patch
   Fixes crash in ibus_object_destroy
 - Added ibus-626652-leak.patch
@@ -319,6 +312,12 @@ fi
   Fixes Bug 541492 - ibus needs to support some xkb layout switching
 - Added ibus-435880-surrounding-text.patch
   Fixes Bug 435880 - ibus-gtk requires surrounding-text support
+  Fixes Bug 634829 - ibus_im_context_set_surrounding() to get strings.
+- Added ibus-xx-g-ir-compiler.patch to fix g-ir-compiler error.
+- Added ibus-xx-workaround-gtk3.patch
+  Workaround for f14 http://koji.fedoraproject.org/koji/taskinfo?taskID=2516604
+- Added ibus-652157-x11-ppc64.patch
+  Fixes Bug 652157 - Window position of ibus-x11 in ppc64
 
 * Mon Aug 23 2010 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.7-1
 - Update to 1.3.7