[ibus-fbterm/f17] Rebuilt for ibus 1.4.99.20120304

[Takao Fujiwara]

commit 2711751aa249391ab967a4829049c17cc8b85ec6
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Tue Mar 13 19:59:29 2012 +0900

    Rebuilt for ibus 1.4.99.20120304

 ibus-fbterm-xx-build-error.patch |   51 ++++++++++++++++++++++++++++++++++++++
 ibus-fbterm.spec                 |    8 +++++-
 2 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/ibus-fbterm-xx-build-error.patch b/ibus-fbterm-xx-build-error.patch
new file mode 100644
index 0000000..ca06945
--- /dev/null
+++ b/ibus-fbterm-xx-build-error.patch
@@ -0,0 +1,51 @@
+--- ibus-fbterm-0.9.1/src/display.c.orig	2012-03-12 16:21:06.582175770 +0900
++++ ibus-fbterm-0.9.1/src/display.c	2012-03-12 16:32:37.057787019 +0900
+@@ -212,7 +212,11 @@ static void calculate_status_win()
+ 		IBusProperty *prop = ibus_prop_list_get(property_list, i);
+ 		if (!prop) break;
+ 
++#if IBUS_CHECK_VERSION (1, 4, 0)
++		w += text_width(ibus_property_get_label(prop)->text);
++#else
+ 		w += text_width(prop->label->text);
++#endif
+ 	}
+ 
+ 	status_bar_win.x = cursor_x;
+@@ -238,8 +242,16 @@ static void draw_status_bar()
+ 		IBusProperty *prop = ibus_prop_list_get(property_list, i);
+ 		if (!prop) break;
+ 
++#if IBUS_CHECK_VERSION (1, 4, 0)
++                IBusText *text = ibus_property_get_label(prop);
++		draw_text(x, y, COLOR_FG, COLOR_BG,
++                          text->text,
++                          strlen(text->text));
++		x += FW(text_width(text->text));
++#else
+ 		draw_text(x, y, COLOR_FG, COLOR_BG, prop->label->text, strlen(prop->label->text));
+ 		x += FW(text_width(prop->label->text));
++#endif
+ 
+ 		char space = ' ';
+ 		draw_text(x, y, COLOR_FG, COLOR_BG, &space, 1);
+--- ibus-fbterm-0.9.1/src/ibus-fbterm.c.orig	2012-03-13 19:47:33.036218019 +0900
++++ ibus-fbterm-0.9.1/src/ibus-fbterm.c	2012-03-13 19:48:13.694187234 +0900
+@@ -119,13 +119,17 @@ static void im_active()
+ 	debug("im active\n");
+ 	modifier_state = 0;
+ 	init_keycode_state();
++#if ! IBUS_CHECK_VERSION (1, 4, 99)
+ 	ibus_input_context_enable(ibus_ctx);
++#endif
+ }
+ 
+ static void im_deactive()
+ {
+ 	debug("im deactive\n");
++#if ! IBUS_CHECK_VERSION (1, 4, 99)
+ 	ibus_input_context_disable(ibus_ctx);
++#endif
+ 
+ 	auxiliary_text_win.w = 0;
+ 	lookup_table_win.w = 0;
diff --git a/ibus-fbterm.spec b/ibus-fbterm.spec
index 5341102..8fd979e 100644
--- a/ibus-fbterm.spec
+++ b/ibus-fbterm.spec
@@ -1,12 +1,13 @@
 Name:       ibus-fbterm
 Version:    0.9.1
-Release:    13%{?dist}
+Release:    14%{?dist}
 Summary:    IBus front-end for fbterm
 License:    GPLv3
 Group:      Applications/System
 URL:        http://code.google.com/p/ibus-fbterm
 Source0:    http://ibus-fbterm.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:     ibus-fbterm-0.9.1-uni-shell.patch
+Patch1:     ibus-fbterm-xx-build-error.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,6 +23,7 @@ ibus-fbterm is a input method for FbTerm based on iBus.
 %prep
 %setup -q
 %patch0 -p1 -b .1-uni-shell
+%patch1 -p1 -b .build
 
 %build
 %configure \
@@ -44,6 +46,10 @@ ibus-fbterm is a input method for FbTerm based on iBus.
 #%{_datadir}
 
 %changelog
+* Mon Mar 12 2012 Takao Fujiwara <tfujiwar at redhat.com> - 0.9.1-14
+- Rebuilt for ibus 1.4.99.20120304
+- Added ibus-fbterm-xx-build-error.patch
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild