From eb59adce24e42500e1dace44739df63d7cf89899 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Jun 23 2015 02:48:04 +0000
Subject: Updated ibus-fbterm-xx-build-error.patch to work with ibus 1.5.


---

diff --git a/ibus-fbterm-xx-build-error.patch b/ibus-fbterm-xx-build-error.patch
index ca06945..175ade2 100644
--- a/ibus-fbterm-xx-build-error.patch
+++ b/ibus-fbterm-xx-build-error.patch
@@ -1,5 +1,14 @@
---- 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
+--- ibus-fbterm-0.9.1/src/display.c.orig	2009-11-22 10:00:00.000000000 +0900
++++ ibus-fbterm-0.9.1/src/display.c	2015-06-19 14:41:31.430729955 +0900
+@@ -3,7 +3,7 @@ enum { AuxiliaryTextWin = 0, LookupTable
+ static unsigned short cursor_x, cursor_y;
+ static Rectangle auxiliary_text_win, lookup_table_win, status_bar_win;
+ 
+-static const Info info;
++static Info info;
+ 
+ #define FW(x) ((x) * info.fontWidth)
+ #define FH(y) ((y) * info.fontHeight)
 @@ -212,7 +212,11 @@ static void calculate_status_win()
  		IBusProperty *prop = ibus_prop_list_get(property_list, i);
  		if (!prop) break;
@@ -17,10 +26,10 @@
  		if (!prop) break;
  
 +#if IBUS_CHECK_VERSION (1, 4, 0)
-+                IBusText *text = ibus_property_get_label(prop);
++		IBusText *text = ibus_property_get_label(prop);
 +		draw_text(x, y, COLOR_FG, COLOR_BG,
-+                          text->text,
-+                          strlen(text->text));
++		          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));
@@ -29,8 +38,8 @@
  
  		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
+--- ibus-fbterm-0.9.1/src/ibus-fbterm.c.orig	2009-11-22 10:00:00.000000000 +0900
++++ ibus-fbterm-0.9.1/src/ibus-fbterm.c	2015-06-19 14:40:05.175761004 +0900
 @@ -119,13 +119,17 @@ static void im_active()
  	debug("im active\n");
  	modifier_state = 0;
@@ -49,3 +58,15 @@
  
  	auxiliary_text_win.w = 0;
  	lookup_table_win.w = 0;
+@@ -240,7 +244,11 @@ int main()
+ 					 "signal::register-properties", slot_register_properties, NULL,
+ 					 "signal::update-property", slot_update_property, NULL,
+ 					 NULL);
++#if IBUS_CHECK_VERSION (1, 4, 99)
++	ibus_input_context_set_capabilities(ibus_ctx, IBUS_CAP_AUXILIARY_TEXT | IBUS_CAP_LOOKUP_TABLE | IBUS_CAP_PROPERTY | IBUS_CAP_FOCUS);
++#else
+ 	ibus_input_context_set_capabilities(ibus_ctx, IBUS_CAP_AUXILIARY_TEXT | IBUS_CAP_LOOKUP_TABLE | IBUS_CAP_PROPERTY);
++#endif
+ 
+ 	register_im_callbacks(cbs);
+ 	connect_fbterm(1);
diff --git a/ibus-fbterm.spec b/ibus-fbterm.spec
index a666025..405d2e7 100644
--- a/ibus-fbterm.spec
+++ b/ibus-fbterm.spec
@@ -1,6 +1,6 @@
 Name:       ibus-fbterm
 Version:    0.9.1
-Release:    20%{?dist}
+Release:    21%{?dist}
 Summary:    IBus front-end for fbterm
 License:    GPLv3
 Group:      Applications/System
@@ -46,6 +46,9 @@ ibus-fbterm is a input method for FbTerm based on iBus.
 #%{_datadir}
 
 %changelog
+* Tue Jun 23 2015 Takao Fujiwara <tfujiwar@redhat.com> - 0.9.1-21
+- Updated ibus-fbterm-xx-build-error.patch to work with ibus 1.5.
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild