[ibus-m17n] Update to 1.3.1-1.
Daiki Ueno
ueno at fedoraproject.org
Fri Sep 3 08:29:00 UTC 2010
commit 83f062206bac1868ef540cdd5cd9ef0eea4a3ef4
Author: Daiki Ueno <ueno at unixuser.org>
Date: Fri Sep 3 17:30:46 2010 +0900
Update to 1.3.1-1.
.gitignore | 1 +
ibus-m17n-HEAD.patch | 153 --------------------------------------------------
ibus-m17n-iok.patch | 139 +++++++++++++++------------------------------
ibus-m17n.spec | 16 ++++--
sources | 2 +-
5 files changed, 58 insertions(+), 253 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0c4121f..973301d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
ibus-m17n-1.3.0.tar.gz
/ibus-m17n-1.3.0.tar.gz
+/ibus-m17n-1.3.1.tar.gz
diff --git a/ibus-m17n-iok.patch b/ibus-m17n-iok.patch
index 54e7757..b3c9adc 100644
--- a/ibus-m17n-iok.patch
+++ b/ibus-m17n-iok.patch
@@ -1,98 +1,61 @@
diff --git a/src/engine.c b/src/engine.c
-index e5bc115..7eac4f3 100644
+index 260a806..abeeeef 100644
--- a/src/engine.c
+++ b/src/engine.c
-@@ -17,6 +17,8 @@ struct _IBusM17NEngine {
- IBusLookupTable *table;
- IBusProperty *status_prop;
+@@ -19,6 +19,8 @@ struct _IBusM17NEngine {
+ IBusProperty *setup_prop;
IBusPropList *prop_list;
+ gchar *config_section;
+ IBusProperty *show_iok_prop;
+ gchar *keymap_name;
};
struct _IBusM17NEngineClass {
-@@ -134,6 +136,8 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
- static void
- ibus_m17n_engine_init (IBusM17NEngine *m17n)
- {
-+ IBusText *text;
-+
- m17n->status_prop = ibus_property_new ("status",
- PROP_TYPE_NORMAL,
- NULL,
-@@ -145,9 +149,22 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n)
- NULL);
- g_object_ref_sink (m17n->status_prop);
+@@ -218,10 +220,23 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n)
+ NULL);
+ g_object_ref_sink (m17n->setup_prop);
-+ text = ibus_text_new_from_string ("iok");
++ label = ibus_text_new_from_string ("iok");
+ m17n->show_iok_prop = ibus_property_new ("iok",
-+ PROP_TYPE_NORMAL,
-+ text,
-+ "/usr/share/pixmaps/iok.xpm",
-+ text,
-+ TRUE,
-+ FALSE,
-+ 0,
-+ NULL);
++ PROP_TYPE_NORMAL,
++ label,
++ "/usr/share/pixmaps/iok.xpm",
++ label,
++ TRUE,
++ FALSE,
++ 0,
++ NULL);
+ g_object_ref_sink (m17n->show_iok_prop);
+
m17n->prop_list = ibus_prop_list_new ();
g_object_ref_sink (m17n->prop_list);
ibus_prop_list_append (m17n->prop_list, m17n->status_prop);
+ ibus_prop_list_append (m17n->prop_list, m17n->setup_prop);
+ ibus_prop_list_append (m17n->prop_list, m17n->show_iok_prop);
m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
g_object_ref_sink (m17n->table);
-@@ -162,6 +179,7 @@ ibus_m17n_engine_constructor (GType type,
- IBusM17NEngine *m17n;
- MInputMethod *im;
- const gchar *engine_name;
-+ gchar **strv;
-
- m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type,
- n_construct_params,
-@@ -169,6 +187,15 @@ ibus_m17n_engine_constructor (GType type,
+@@ -248,6 +263,7 @@ ibus_m17n_engine_constructor (GType type,
engine_name = ibus_engine_get_name ((IBusEngine *) m17n);
g_assert (engine_name);
+ m17n->keymap_name = g_strdup (engine_name);
-+
-+ strv = g_strsplit (engine_name, ":", 3);
-+ g_assert (g_strv_length (strv) == 3);
-+ g_assert (g_strcmp0 (strv[0], "m17n") == 0);
-+
+
+ strv = g_strsplit (engine_name, ":", 3);
+
+@@ -257,6 +273,10 @@ ibus_m17n_engine_constructor (GType type,
+ lang = strv[1];
+ name = strv[2];
+
+ /* show iok icon for inscript */
-+ if(strcmp (strv[2], "inscript") == 0 || strcmp (strv[2] , "inscript2") == 0)
++ if(strcmp (name, "inscript") == 0 || strcmp (name , "inscript2") == 0)
+ ibus_property_set_visible (m17n->show_iok_prop, TRUE);
-
++
if (im_table == NULL) {
im_table = g_hash_table_new_full (g_str_hash,
-@@ -181,12 +208,6 @@ ibus_m17n_engine_constructor (GType type,
- if (im == NULL) {
- gchar *lang;
- gchar *name;
-- gchar **strv;
--
-- strv = g_strsplit (engine_name, ":", 3);
--
-- g_assert (g_strv_length (strv) == 3);
-- g_assert (g_strcmp0 (strv[0], "m17n") == 0);
-
- lang = strv[1];
- name = strv[2];
-@@ -211,9 +232,9 @@ ibus_m17n_engine_constructor (GType type,
- g_hash_table_insert (im_table, g_strdup (engine_name), im);
- }
-
-- g_strfreev (strv);
- }
-
-+ g_strfreev (strv);
- if (im == NULL) {
- g_warning ("Can not find m17n keymap %s", engine_name);
- g_object_unref (m17n);
-@@ -240,6 +261,11 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
- m17n->status_prop = NULL;
+ g_str_equal,
+@@ -369,6 +389,11 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
+ m17n->setup_prop = NULL;
}
+ if (m17n->show_iok_prop) {
@@ -103,35 +66,23 @@ index e5bc115..7eac4f3 100644
if (m17n->table) {
g_object_unref (m17n->table);
m17n->table = NULL;
-@@ -405,6 +431,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
- IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
-
- ibus_engine_register_properties (engine, m17n->prop_list);
-+
- ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
-
- parent_class->focus_in (engine);
-@@ -490,6 +517,23 @@ ibus_m17n_engine_property_activate (IBusEngine *engine,
- const gchar *prop_name,
- guint prop_state)
- {
-+ gchar **strv;
-+ gchar cmd[80];
-+
-+ IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
-+
-+ if (g_strcmp0 (prop_name, "iok") != 0)
-+ return;
+@@ -669,6 +694,19 @@ ibus_m17n_engine_property_activate (IBusEngine *engine,
+ LIBEXECDIR, engine_name);
+ g_spawn_command_line_async (setup, NULL);
+ g_free (setup);
++ } else if (g_strcmp0 (prop_name, "iok") == 0) {
++ gchar **strv;
++ gchar cmd[80];
+
-+ strv = g_strsplit (m17n->keymap_name, ":", 3);
-+ g_assert (g_strv_length (strv) == 3);
-+ g_assert (g_strcmp0 (strv[0], "m17n") == 0);
++ strv = g_strsplit (m17n->keymap_name, ":", 3);
++ g_assert (g_strv_length (strv) == 3);
++ g_assert (g_strcmp0 (strv[0], "m17n") == 0);
+
-+ sprintf (cmd, "/usr/bin/iok -n %s", strv[1]);
-+ g_debug ("keymap name = %s,prop_name=%s, prop_state=%d", m17n->keymap_name, prop_name, prop_state);
-+ g_strfreev (strv);
++ sprintf (cmd, "/usr/bin/iok -n %s", strv[1]);
++ 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);
}
-
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index 8e29951..8504f1f 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -1,22 +1,22 @@
%define require_ibus_version 1.3.7
Name: ibus-m17n
-Version: 1.3.0
-Release: 4%{?dist}
+Version: 1.3.1
+Release: 1%{?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
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: m17n-lib-devel
+BuildRequires: gtk2-devel
BuildRequires: ibus-devel >= %{require_ibus_version}
Requires: ibus >= %{require_ibus_version}
@@ -30,7 +30,6 @@ the input table maps from m17n-db.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%configure --disable-static
@@ -51,9 +50,16 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING README
%{_datadir}/ibus-m17n
%{_libexecdir}/ibus-engine-m17n
+%{_libexecdir}/ibus-setup-m17n
%{_datadir}/ibus/component/*
%changelog
+* Fri Sep 3 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-1
+- Update to 1.3.1.
+- Fix bug 615158 - Do not change the background colour of the pre-edit buffer
+- Add gtk2-devel to BR
+- Install ibus-setup-m17n in %%{_libexecdir}
+
* Thu Aug 26 2010 Daiki Ueno <dueno at redhat.com> - 1.3.0-4
- Rebuild with ibus 1.3.7 to avoid ABI incompatibility. Bug 627256.
diff --git a/sources b/sources
index 58a6e4c..3bc4b4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-898b5ce1a685df201f959ac8feeb5a82 ibus-m17n-1.3.0.tar.gz
+38ff41207518812945c60084deba0080 ibus-m17n-1.3.1.tar.gz
More information about the scm-commits
mailing list