commit 8303ea68d6d93d2c23e371255ce50ad19e1c21b7
Author: Jan Rękorajski <[email protected]>
Date: Tue Nov 6 08:20:43 2012 +0100
- updated ibus patch for ibus 1.4.99
- rel 4
ibus-fbterm-ibus.patch | 47 ++++++++++++++++++++++++++++++++++++++---------
ibus-fbterm.spec | 2 +-
2 files changed, 39 insertions(+), 10 deletions(-)
---
diff --git a/ibus-fbterm.spec b/ibus-fbterm.spec
index ab42704..209986a 100644
--- a/ibus-fbterm.spec
+++ b/ibus-fbterm.spec
@@ -2,7 +2,7 @@ Summary: IBus front-end for fbterm
Summary(pl.UTF-8): Interfejs platformy IBus dla fbterma
Name: ibus-fbterm
Version: 0.9.1
-Release: 3
+Release: 4
License: GPL v3
Group: Applications/System
#Source0Download: http://code.google.com/p/ibus-fbterm/downloads/list
diff --git a/ibus-fbterm-ibus.patch b/ibus-fbterm-ibus.patch
index c5d299c..ca06945 100644
--- a/ibus-fbterm-ibus.patch
+++ b/ibus-fbterm-ibus.patch
@@ -1,22 +1,51 @@
---- ibus-fbterm-0.9.1/src/display.c.orig 2009-11-22 02:00:00.000000000
+0100
-+++ ibus-fbterm-0.9.1/src/display.c 2012-09-22 17:50:55.575504236 +0200
-@@ -212,7 +212,7 @@
+--- 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;
-- w += text_width(prop->label->text);
++#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 +238,8 @@
+@@ -238,8 +242,16 @@ static void draw_status_bar()
IBusProperty *prop = ibus_prop_list_get(property_list, i);
if (!prop) break;
-- draw_text(x, y, COLOR_FG, COLOR_BG, prop->label->text,
strlen(prop->label->text));
-- x += FW(text_width(prop->label->text));
-+ draw_text(x, y, COLOR_FG, COLOR_BG,
ibus_property_get_label(prop)->text,
strlen(ibus_property_get_label(prop)->text));
-+ x += FW(text_width(ibus_property_get_label(prop)->text));
++#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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ibus-fbterm.git/commitdiff/8303ea68d6d93d2c23e371255ce50ad19e1c21b7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
