rpms/ibus-m17n/F-11 ibus-m17n-iok.patch, 1.3, 1.4 ibus-m17n.spec, 1.17, 1.18
Huang Peng
phuang at fedoraproject.org
Wed Oct 14 07:51:20 UTC 2009
Author: phuang
Update of /cvs/pkgs/rpms/ibus-m17n/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1619
Modified Files:
ibus-m17n-iok.patch ibus-m17n.spec
Log Message:
Update iok patch
ibus-m17n-iok.patch:
engine.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
Index: ibus-m17n-iok.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-11/ibus-m17n-iok.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ibus-m17n-iok.patch 25 Sep 2009 07:23:35 -0000 1.3
+++ ibus-m17n-iok.patch 14 Oct 2009 07:51:20 -0000 1.4
@@ -1,6 +1,8 @@
---- src/engine.c.orig 2009-03-02 10:54:14.000000000 +0530
-+++ src/engine.c 2009-03-02 13:12:42.000000000 +0530
-@@ -17,6 +17,8 @@
+diff --git a/src/engine.c b/src/engine.c
+index d6ac852..0355fca 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -17,6 +17,8 @@ struct _IBusM17NEngine {
IBusLookupTable *table;
IBusProperty *status_prop;
IBusPropList *prop_list;
@@ -9,14 +11,7 @@
};
struct _IBusM17NEngineClass {
-@@ -127,12 +129,14 @@
- engine_class->cursor_up = ibus_m17n_engine_cursor_up;
- engine_class->cursor_down = ibus_m17n_engine_cursor_down;
-
-- // engine_class->property_activate = ibus_m17n_engine_property_activate;
-+ engine_class->property_activate = ibus_m17n_engine_property_activate;
- }
-
+@@ -134,6 +136,8 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
static void
ibus_m17n_engine_init (IBusM17NEngine *m17n)
{
@@ -25,7 +20,7 @@
m17n->status_prop = ibus_property_new ("status",
PROP_TYPE_NORMAL,
NULL,
-@@ -143,8 +147,21 @@
+@@ -144,8 +148,21 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n)
0,
NULL);
@@ -47,7 +42,7 @@
m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
m17n->context = NULL;
-@@ -165,6 +182,7 @@
+@@ -166,6 +183,7 @@ ibus_m17n_engine_constructor (GType type,
engine_name = ibus_engine_get_name ((IBusEngine *) m17n);
g_assert (engine_name);
@@ -55,18 +50,16 @@
if (im_table == NULL) {
im_table = g_hash_table_new_full (g_str_hash,
-@@ -185,7 +203,9 @@
-
+@@ -187,6 +205,8 @@ ibus_m17n_engine_constructor (GType type,
lang = strv[0];
name = strv[1];
--
-+
+
+ if(strcmp(name,"inscript")==0)
+ ibus_property_set_visible(m17n->show_iok_prop,TRUE);
im = minput_open_im (msymbol (lang), msymbol (name), NULL);
if (im != NULL) {
mplist_put (im->driver.callback_list, Minput_preedit_start, ibus_m17n_engine_callback);
-@@ -247,6 +267,7 @@
+@@ -231,6 +251,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
m17n->prop_list = NULL;
}
@@ -74,7 +67,7 @@
if (m17n->status_prop) {
g_object_unref (m17n->status_prop);
m17n->status_prop = NULL;
-@@ -398,6 +419,7 @@
+@@ -383,6 +404,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
ibus_engine_register_properties (engine, m17n->prop_list);
@@ -82,12 +75,10 @@
ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
parent_class->focus_in (engine);
-@@ -483,7 +505,20 @@
+@@ -468,6 +490,19 @@ ibus_m17n_engine_property_activate (IBusEngine *engine,
const gchar *prop_name,
guint prop_state)
{
-- g_debug ("prop_name=%s, prop_state=%d", prop_name, prop_state);
-+ gchar *langi;
+ gchar **strv;
+ gchar cmd[80];
+
@@ -95,12 +86,12 @@
+
+ strv = g_strsplit (m17n->keymap_name, ":", 2);
+ g_assert (g_strv_length (strv) == 2);
-+ langi = strv[0];
+
-+ sprintf(cmd,"/usr/bin/iok -n %s",langi);
-+ g_debug ("keymap name = %s,prop_name=%s, prop_state=%d",m17n->keymap_name, prop_name, prop_state);
++ sprintf (cmd, "/usr/bin/iok -n %s", strv[0]);
++ g_debug ("keymap name = %s,prop_name=%s, prop_state=%d", m17n->keymap_name, prop_name, prop_state);
++ g_strfreev (strv);
+
-+ g_spawn_command_line_async(cmd, NULL );
++ g_spawn_command_line_async(cmd, NULL);
parent_class->property_activate (engine, prop_name, prop_state);
}
Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-11/ibus-m17n.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ibus-m17n.spec 25 Sep 2009 07:23:35 -0000 1.17
+++ ibus-m17n.spec 14 Oct 2009 07:51:20 -0000 1.18
@@ -2,15 +2,14 @@
Name: ibus-m17n
Version: 1.2.0.20090617
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: The M17N engine for IBus platform
License: GPLv2+
Group: System Environment/Libraries
URL: http://code.google.com/p/ibus/
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-# Patch0: ibus-m17n-HEAD.patch
-# Patch1: ibus-m17n-iok.patch
+Patch0: ibus-m17n-iok.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext-devel
@@ -29,8 +28,7 @@ the input table maps from m17n-db.
%prep
%setup -q
-# %patch0 -p1
-# %patch1 -p0
+%patch0 -p1
%build
%configure --disable-static
@@ -54,6 +52,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ibus/component/*
%changelog
+* Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-4
+- Update iok patch to fix build error.
+
+* Tue Oct 13 2009 Parag <pnemade at redhat.com> - 1.2.0.20090617-3
+- Re-enable iok support to ibus-m17n.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0.20090617-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list