[ibus-m17n/f16] Update to 1.3.2-10.
Daiki Ueno
ueno at fedoraproject.org
Tue Aug 9 07:15:50 UTC 2011
commit 2e9e6c0278798bdfb09b3f4314307b2a4e23ab8d
Author: Daiki Ueno <ueno at unixuser.org>
Date: Tue Aug 9 16:13:49 2011 +0900
Update to 1.3.2-10.
ibus-m17n-xkb-options.patch | 303 +++---------------------
ibus-m17n-xx-icon-symbol.patch | 517 +++++++++++++++++++++++++++++++++++++++-
ibus-m17n.spec | 16 +-
series | 4 -
4 files changed, 553 insertions(+), 287 deletions(-)
---
diff --git a/ibus-m17n-xkb-options.patch b/ibus-m17n-xkb-options.patch
index 551f1c8..6c3d8b9 100644
--- a/ibus-m17n-xkb-options.patch
+++ b/ibus-m17n-xkb-options.patch
@@ -1,43 +1,4 @@
Patch to set certain XKB options when an m17n IME is set.
-Index: ibus-m17n-1.3.2/configure.ac
-===================================================================
---- ibus-m17n-1.3.2.orig/configure.ac
-+++ ibus-m17n-1.3.2/configure.ac
-@@ -106,6 +106,14 @@ AC_CHECK_FUNCS([ibus_engine_get_surround
- CFLAGS="$save_CFLAGS"
- LIBS="$save_LIBS"
-
-+# check libxklavier
-+have_libxklavier=no
-+PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier gdk-3.0 x11],
-+ have_libxklavier=yes)
-+if test x$have_libxklavier != xno; then
-+ AC_DEFINE([HAVE_LIBXKLAVIER], [1], [Define if libxklavier is found])
-+fi
-+
- # define GETTEXT_* variables
- GETTEXT_PACKAGE=ibus-m17n
- AC_SUBST(GETTEXT_PACKAGE)
-Index: ibus-m17n-1.3.2/src/Makefile.am
-===================================================================
---- ibus-m17n-1.3.2.orig/src/Makefile.am
-+++ ibus-m17n-1.3.2/src/Makefile.am
-@@ -66,10 +66,15 @@ ibus_engine_m17n_SOURCES = \
- engine.c \
- engine.h \
- $(NULL)
-+ibus_engine_m17n_CFLAGS = \
-+ @LIBXKLAVIER_CFLAGS@ \
-+ $(AM_CFLAGS) \
-+ $(NULL)
- ibus_engine_m17n_LDADD = \
- libm17ncommon.a \
- @IBUS_LIBS@ \
- @M17N_LIBS@ \
-+ @LIBXKLAVIER_LIBS@ \
- $(NULL)
-
- if HAVE_GTK
Index: ibus-m17n-1.3.2/src/default.xml.in.in
===================================================================
--- ibus-m17n-1.3.2.orig/src/default.xml.in.in
@@ -50,21 +11,21 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in
+ <name>m17n:bn:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
- <name>m17n:gu:inscript</name>
+ <name>m17n:gu:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
- <name>m17n:hi:inscript</name>
+ <name>m17n:hi:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
<name>m17n:kn:kgp</name>
@@ -76,21 +37,21 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in
+ <name>m17n:mai:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
- <name>m17n:ml:inscript</name>
+ <name>m17n:ml:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
- <name>m17n:mr:inscript</name>
+ <name>m17n:mr:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
<name>m17n:ne:rom</name>
@@ -102,14 +63,14 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in
+ <name>m17n:or:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
- <name>m17n:pa:inscript</name>
+ <name>m17n:pa:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
<name>m17n:sa:harvard-kyoto</name>
@@ -121,13 +82,13 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in
+ <name>m17n:sd:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
<name>m17n:si:wijesekera</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
<name>m17n:ta:tamil99</name>
@@ -139,7 +100,7 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in
+ <name>m17n:te:inscript*</name>
<rank>2</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<!-- Samanala should have lower rank than other Sinhala
engines since it is the only non-keyboard input method in
@@ -147,240 +108,46 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in
<name>m17n:si:*</name>
<rank>1</rank>
<preedit-highlight>FALSE</preedit-highlight>
-+ <xkb-options>lv3:ralt_switch</xkb-options>
++ <layout>default[lv3:ralt_switch]</layout>
</engine>
<engine>
<name>m17n:ta:*</name>
-Index: ibus-m17n-1.3.2/src/engine.c
-===================================================================
---- ibus-m17n-1.3.2.orig/src/engine.c
-+++ ibus-m17n-1.3.2/src/engine.c
-@@ -6,6 +6,10 @@
- #include <ibus.h>
- #include <m17n.h>
- #include <string.h>
-+#ifdef HAVE_LIBXKLAVIER
-+#include <gdk/gdkx.h>
-+#include <libxklavier/xklavier.h>
-+#endif /* HAVE_LIBXKLAVIER */
- #include "m17nutil.h"
- #include "engine.h"
-
-@@ -38,6 +42,10 @@ struct _IBusM17NEngineClass {
- gboolean use_iok;
-
- MInputMethod *im;
-+
-+#if HAVE_LIBXKLAVIER
-+ XklConfigRec *xkl_config_rec;
-+#endif /* HAVE_LIBXKLAVIER */
- };
-
- /* functions prototype */
-@@ -105,12 +113,90 @@ static IBusEngineClass *parent_class = N
-
- static IBusConfig *config = NULL;
-
-+#if HAVE_LIBXKLAVIER
-+static XklEngine *xkl_engine = NULL;
-+static XklConfigRec *xkl_system_config_rec = NULL;
-+
-+static gboolean
-+parse_xkb_options (XklConfigRec *config_rec, const gchar *xkb_options)
-+{
-+ gchar **strv;
-+
-+ strv = g_strsplit (xkb_options, ",", -1);
-+ if (g_strv_length (strv) < 1) {
-+ g_strfreev (strv);
-+ return FALSE;
-+ }
-+
-+ g_strfreev (config_rec->options);
-+ config_rec->options = strv;
-+
-+ return TRUE;
-+}
-+
-+static GdkFilterReturn
-+filter_xkl_event (GdkXEvent *xev,
-+ GdkEvent *event,
-+ gpointer user_data)
-+{
-+ XEvent *xevent = (XEvent *)xev;
-+
-+ xkl_engine_filter_events (xkl_engine, xevent);
-+ return GDK_FILTER_CONTINUE;
-+}
-+
-+static void
-+on_xkl_config_changed (XklEngine *xklengine,
-+ gpointer user_data)
-+{
-+ IBusM17NEngineClass *klass = user_data;
-+ XklConfigRec *config_rec;
-+
-+ config_rec = xkl_config_rec_new ();
-+ if (!xkl_config_rec_get_from_server (config_rec, xkl_engine)) {
-+ g_object_unref (config_rec);
-+ g_warning ("Can't get default keyboard config from the server");
-+ } else if (klass->xkl_config_rec &&
-+ !xkl_config_rec_equals (config_rec, klass->xkl_config_rec)) {
-+ if (xkl_system_config_rec)
-+ g_object_unref (xkl_system_config_rec);
-+ xkl_system_config_rec = config_rec;
-+ }
-+}
-+#endif /* HAVE_LIBXKLAVIER */
-+
- void
- ibus_m17n_init (IBusBus *bus)
- {
-+#if HAVE_LIBXKLAVIER
-+ if (gdk_init_check (NULL, NULL)) {
-+ GdkDisplay *display = gdk_display_get_default ();
-+ g_assert (display);
-+
-+ xkl_engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (display));
-+ xkl_system_config_rec = xkl_config_rec_new ();
-+ if (!xkl_config_rec_get_from_server (xkl_system_config_rec,
-+ xkl_engine)) {
-+ g_object_unref (xkl_system_config_rec);
-+ xkl_system_config_rec = NULL;
-+
-+ g_warning ("Can't get default keyboard config from the server");
-+ } else {
-+ gdk_window_add_filter (NULL,
-+ (GdkFilterFunc) filter_xkl_event,
-+ NULL);
-+ gdk_window_add_filter (gdk_get_default_root_window (),
-+ (GdkFilterFunc) filter_xkl_event,
-+ NULL);
-+ xkl_engine_start_listen (xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
-+ }
-+ }
-+#endif /* HAVE_LIBXKLAVIER */
-+
- config = ibus_bus_get_config (bus);
- if (config)
- g_object_ref_sink (config);
-+
- ibus_m17n_init_common ();
- }
-
-@@ -299,6 +385,25 @@ ibus_m17n_engine_class_init (IBusM17NEng
- G_CALLBACK(ibus_m17n_config_value_changed),
- klass);
-
-+#if HAVE_LIBXKLAVIER
-+ if (engine_config->xkb_options) {
-+ klass->xkl_config_rec = xkl_config_rec_new ();
-+ if (!xkl_config_rec_get_from_server (klass->xkl_config_rec,
-+ xkl_engine)) {
-+ g_object_unref (klass->xkl_config_rec);
-+ g_warning ("Can't get default keyboard config from the server");
-+ } else if (!parse_xkb_options (klass->xkl_config_rec,
-+ engine_config->xkb_options)) {
-+ g_object_unref (klass->xkl_config_rec);
-+ g_warning ("Can't parse xkb options %s",
-+ engine_config->xkb_options);
-+ }
-+ }
-+
-+ g_signal_connect (xkl_engine, "X-config-changed",
-+ G_CALLBACK(on_xkl_config_changed), klass);
-+#endif /* HAVE_LIBXKLAVIER */
-+
- klass->im = NULL;
- }
-
-@@ -412,6 +517,9 @@ ibus_m17n_engine_constructor (GType
- IBusM17NEngine *m17n;
- GObjectClass *object_class;
- IBusM17NEngineClass *klass;
-+#if HAVE_LIBXKLAVIER
-+ GdkDisplay *display;
-+#endif /* HAVE_LIBXKLAVIER */
-
- m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type,
- n_construct_params,
-@@ -499,6 +607,11 @@ ibus_m17n_engine_destroy (IBusM17NEngine
- m17n->context = NULL;
- }
-
-+#if HAVE_LIBXKLAVIER
-+ if (xkl_system_config_rec)
-+ xkl_config_rec_activate (xkl_system_config_rec, xkl_engine);
-+#endif /* HAVE_LIBXKLAVIER */
-+
- IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)m17n);
- }
-
-@@ -735,6 +848,19 @@ ibus_m17n_engine_enable (IBusEngine *eng
- ibus_engine_get_surrounding_text (engine, &text, &cursor_pos);
- g_object_unref (text);
- #endif /* HAVE_IBUS_ENGINE_GET_SURROUNDING_TEXT */
-+
-+#if HAVE_LIBXKLAVIER
-+ GObjectClass *object_class;
-+ IBusM17NEngineClass *klass;
-+
-+ object_class = G_OBJECT_GET_CLASS (m17n);
-+ klass = (IBusM17NEngineClass *) object_class;
-+
-+ if (klass->xkl_config_rec) {
-+ if (!xkl_config_rec_activate (klass->xkl_config_rec, xkl_engine))
-+ g_warning ("Can't set the XKB layout");
-+ }
-+#endif /* HAVE_LIBXKLAVIER */
- }
-
- static void
-@@ -744,6 +870,17 @@ ibus_m17n_engine_disable (IBusEngine *en
-
- ibus_m17n_engine_focus_out (engine);
- parent_class->disable (engine);
-+
-+#if HAVE_LIBXKLAVIER
-+ GObjectClass *object_class;
-+ IBusM17NEngineClass *klass;
-+
-+ object_class = G_OBJECT_GET_CLASS (m17n);
-+ klass = (IBusM17NEngineClass *) object_class;
-+
-+ if (xkl_system_config_rec)
-+ xkl_config_rec_activate (xkl_system_config_rec, xkl_engine);
-+#endif /* HAVE_LIBXKLAVIER */
- }
-
- static void
Index: ibus-m17n-1.3.2/src/m17nutil.c
===================================================================
--- ibus-m17n-1.3.2.orig/src/m17nutil.c
+++ ibus-m17n-1.3.2/src/m17nutil.c
-@@ -290,6 +290,11 @@ ibus_m17n_engine_config_parse_xml_node (
- sub_node->name, sub_node->text);
+@@ -120,7 +120,7 @@ ibus_m17n_engine_new (MSymbol lang,
+ "language", msymbol_name (lang),
+ "license", "GPL",
+ "icon", engine_icon ? engine_icon : "",
+- "layout", "us",
++ "layout", config->layout ? config->layout : "us",
+ "rank", config->rank,
+ NULL);
+ #else
+@@ -282,6 +282,11 @@ ibus_m17n_engine_config_parse_xml_node (
+ cnode->config.rank = atoi (sub_node->text);
continue;
}
-+ if (g_strcmp0 (sub_node->name, "xkb-options") == 0) {
-+ g_free (cnode->config.xkb_options);
-+ cnode->config.xkb_options = g_strdup (sub_node->text);
++ if (g_strcmp0 (sub_node->name , "layout") == 0) {
++ g_free (cnode->config.layout);
++ cnode->config.layout = g_strdup (sub_node->text);
+ continue;
+ }
- g_warning ("<engine> element contains invalid element <%s>",
- sub_node->name);
- }
+ if (g_strcmp0 (sub_node->name , "preedit-highlight") == 0) {
+ if (g_ascii_strcasecmp ("TRUE", sub_node->text) == 0)
+ cnode->config.preedit_highlight = TRUE;
Index: ibus-m17n-1.3.2/src/m17nutil.h
===================================================================
--- ibus-m17n-1.3.2.orig/src/m17nutil.h
+++ ibus-m17n-1.3.2/src/m17nutil.h
-@@ -16,6 +16,9 @@ struct _IBusM17NEngineConfig {
+@@ -14,6 +14,9 @@ struct _IBusM17NEngineConfig {
+ /* engine rank */
+ gint rank;
++ /* keyboard layout */
++ gchar *layout;
++
/* whether to highlight preedit */
gboolean preedit_highlight;
-+
-+ /* keyboard options to which the engine switches when enabled */
-+ char *xkb_options;
};
-
- typedef struct _IBusM17NEngineConfig IBusM17NEngineConfig;
diff --git a/ibus-m17n-xx-icon-symbol.patch b/ibus-m17n-xx-icon-symbol.patch
index 43dac05..1d13292 100644
--- a/ibus-m17n-xx-icon-symbol.patch
+++ b/ibus-m17n-xx-icon-symbol.patch
@@ -1,15 +1,28 @@
-Patch to embed hotkeys and symbol property in component XML.
+From 432d6f93be857d2544ad19ba67caea22d5843cc5 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at unixuser.org>
+Date: Tue, 5 Jul 2011 16:26:49 +0900
+Subject: [PATCH] Supply hotkeys and symbol in engine desc.
+
+---
+ configure.ac | 3 +
+ m4/.gitignore | 2 +
+ m4/ibus.m4 | 52 +++++++++
+ src/default.xml.in.in | 284 +++++++++++++++++++++++++++++++++++++++++--------
+ src/m17nutil.c | 10 ++
+ src/m17nutil.h | 6 +
+ 6 files changed, 312 insertions(+), 45 deletions(-)
+ create mode 100644 m4/ibus.m4
+
Index: ibus-m17n-1.3.2/configure.ac
===================================================================
--- ibus-m17n-1.3.2.orig/configure.ac
+++ ibus-m17n-1.3.2/configure.ac
-@@ -122,6 +122,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
+@@ -114,6 +114,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION(0.16.1)
+# hotkeys in component xml
+IBUS_WITH_HOTKEYS
-+IBUS_SET_SYMBOL([?])
+
# OUTPUT files
@@ -75,12 +88,492 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in
===================================================================
--- ibus-m17n-1.3.2.orig/src/default.xml.in.in
+++ ibus-m17n-1.3.2/src/default.xml.in.in
-@@ -254,5 +254,7 @@
+@@ -10,97 +10,114 @@
+ <name>m17n:as:phonetic</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ক</symbol>
+ </engine>
+ <engine>
+ <name>m17n:bn:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>ক</symbol>
+ </engine>
+ <engine>
+ <name>m17n:gu:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>ક</symbol>
+ </engine>
+ <engine>
+ <name>m17n:hi:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:kn:kgp</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ಕ</symbol>
+ </engine>
+ <engine>
+ <name>m17n:ks:kbd</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:mai:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:ml:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>ക</symbol>
+ </engine>
+ <engine>
+ <name>m17n:mr:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:ne:rom</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ने</symbol>
+ </engine>
+ <engine>
+ <name>m17n:or:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>କ</symbol>
+ </engine>
+ <engine>
+ <name>m17n:pa:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>ਕ</symbol>
+ </engine>
+ <engine>
+ <name>m17n:sa:harvard-kyoto</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:sd:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:si:wijesekera</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>සි</symbol>
+ </engine>
+ <engine>
+ <name>m17n:ta:tamil99</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>க</symbol>
+ </engine>
+ <engine>
+ <name>m17n:te:inscript*</name>
+ <rank>2</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>క</symbol>
+ </engine>
+ <!-- Samanala should have lower rank than other Sinhala
+ engines since it is the only non-keyboard input method in
+@@ -109,57 +126,14 @@
+ <name>m17n:si:samanala</name>
+ <rank>0</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>සි</symbol>
+ </engine>
+ <!-- Chinese and Japanese engines which require preedit decoration. -->
+ <engine>
+ <name>m17n:ja:anthy</name>
+ <rank>0</rank>
+ <preedit-highlight>TRUE</preedit-highlight>
+- </engine>
+- <engine>
+- <name>m17n:zh:cangjie</name>
+- <rank>0</rank>
+- <preedit-highlight>TRUE</preedit-highlight>
+- </engine>
+- <engine>
+- <name>m17n:zh:py-b5</name>
+- <rank>0</rank>
+- <preedit-highlight>TRUE</preedit-highlight>
+- </engine>
+- <engine>
+- <name>m17n:zh:py-gb</name>
+- <rank>0</rank>
+- <preedit-highlight>TRUE</preedit-highlight>
+- </engine>
+- <engine>
+- <name>m17n:zh:py</name>
+- <rank>0</rank>
+- <preedit-highlight>TRUE</preedit-highlight>
+- </engine>
+- <engine>
+- <name>m17n:zh:quick</name>
+- <rank>0</rank>
+- <preedit-highlight>TRUE</preedit-highlight>
+- </engine>
+- <engine>
+- <name>m17n:zh:tonepy-b5</name>
+- <rank>0</rank>
+- <preedit-highlight>TRUE</preedit-highlight>
+- </engine>
+- <engine>
+- <name>m17n:zh:tonepy-gb</name>
+- <rank>0</rank>
+- <preedit-highlight>TRUE</preedit-highlight>
+- </engine>
+- <engine>
+- <name>m17n:zh:tonepy</name>
+- <rank>0</rank>
+- <preedit-highlight>TRUE</preedit-highlight>
+- </engine>
+- <engine>
+- <name>m17n:zh:util</name>
+- <rank>0</rank>
+- <preedit-highlight>TRUE</preedit-highlight>
++ <symbol>あ</symbol>
+ </engine>
+ <!-- Other Indic engines should be selected by default:
+ https://bugzilla.redhat.com/show_bug.cgi?id=640896 -->
+@@ -167,92 +141,312 @@
+ <name>m17n:as:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ক</symbol>
+ </engine>
+ <engine>
+ <name>m17n:bn:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ক</symbol>
+ </engine>
+ <engine>
+ <name>m17n:gu:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ક</symbol>
+ </engine>
+ <engine>
+ <name>m17n:hi:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:kn:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ಕ</symbol>
+ </engine>
+ <engine>
+ <name>m17n:ks:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:mai:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:ml:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ക</symbol>
+ </engine>
+ <engine>
+ <name>m17n:mr:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:ne:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
+ </engine>
+ <engine>
+ <name>m17n:or:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>କ</symbol>
+ </engine>
+ <engine>
+ <name>m17n:pa:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ਕ</symbol>
+ </engine>
+ <engine>
+ <name>m17n:sa:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:sd:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>क</symbol>
+ </engine>
+ <engine>
+ <name>m17n:si:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
+ <layout>default[lv3:ralt_switch]</layout>
++ <symbol>සි</symbol>
+ </engine>
+ <engine>
+ <name>m17n:ta:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>க</symbol>
+ </engine>
+ <engine>
+ <name>m17n:te:*</name>
+ <rank>1</rank>
+ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>క</symbol>
++ </engine>
++ <!-- Tweak symbols: for most maps, their "title" properties
++ fit in one character width. However, some of them are
++ bit longer. -->
++ <engine>
++ <name>m17n:*:kbd</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:*:pre</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:*:post</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:am:sera</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>አ</symbol>
++ </engine>
++ <engine>
++ <name>m17n:bo:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ཀ</symbol>
++ </engine>
++ <engine>
++ <name>m17n:cr:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:dv:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:eo:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:fa:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ف</symbol>
++ </engine>
++ <engine>
++ <name>m17n:fr:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:ii:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:iu:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:kk:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>قا</symbol>
++ </engine>
++ <engine>
++ <name>m17n:km:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ក</symbol>
++ </engine>
++ <engine>
++ <name>m17n:lo:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ກ</symbol>
++ </engine>
++ <engine>
++ <name>m17n:nsk:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:oj:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:ps:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:ru:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>Я</symbol>
++ </engine>
++ <engine>
++ <name>m17n:sv:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:syrc:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:tai:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>꫞</symbol>
++ </engine>
++ <engine>
++ <name>m17n:th:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>ท</symbol>
++ </engine>
++ <engine>
++ <name>m17n:ur:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>خ</symbol>
++ </engine>
++ <engine>
++ <name>m17n:vi:han</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>越</symbol>
++ </engine>
++ <engine>
++ <name>m17n:vi:nom*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>喃</symbol>
++ </engine>
++ <engine>
++ <name>m17n:vi:*</name>
++ <rank>0</rank>
++ <preedit-highlight>FALSE</preedit-highlight>
++ <symbol>Ắ</symbol>
++ </engine>
++ <engine>
++ <name>m17n:yi:*</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ <symbol></symbol>
++ </engine>
++ <engine>
++ <name>m17n:zh:bopomofo</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ <symbol>ㄅ</symbol>
++ </engine>
++ <engine>
++ <name>m17n:zh:cangjie</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ <symbol>倉</symbol>
++ </engine>
++ <engine>
++ <name>m17n:zh:py*</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ <symbol>拼</symbol>
++ </engine>
++ <engine>
++ <name>m17n:zh:quick</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ <symbol>簡</symbol>
++ </engine>
++ <engine>
++ <name>m17n:zh:tonepy*</name>
++ <rank>0</rank>
++ <preedit-highlight>TRUE</preedit-highlight>
++ <symbol>调</symbol>
+ </engine>
+ <!-- Default for other engines. -->
+ <engine>
<name>m17n:*</name>
<rank>0</rank>
<preedit-highlight>FALSE</preedit-highlight>
++ <symbol></symbol>
+ @IBUS_HOTKEYS_XML@
-+ @IBUS_SYMBOL_XML@
</engine>
</engines>
Index: ibus-m17n-1.3.2/src/m17nutil.c
@@ -89,15 +582,15 @@ Index: ibus-m17n-1.3.2/src/m17nutil.c
+++ ibus-m17n-1.3.2/src/m17nutil.c
@@ -122,6 +122,8 @@ ibus_m17n_engine_new (MSymbol lang,
"icon", engine_icon ? engine_icon : "",
- "layout", "us",
+ "layout", config->layout ? config->layout : "us",
"rank", config->rank,
+ "hotkeys", config->hotkeys ? config->hotkeys : "",
+ "symbol", config->symbol ? config->symbol : "",
NULL);
#else
engine = ibus_engine_desc_new (engine_name,
-@@ -282,6 +284,14 @@ ibus_m17n_engine_config_parse_xml_node (
- cnode->config.rank = atoi (sub_node->text);
+@@ -287,6 +289,14 @@ ibus_m17n_engine_config_parse_xml_node (
+ cnode->config.layout = g_strdup (sub_node->text);
continue;
}
+ if (g_strcmp0 (sub_node->name , "hotkeys") == 0) {
@@ -115,9 +608,9 @@ Index: ibus-m17n-1.3.2/src/m17nutil.h
===================================================================
--- ibus-m17n-1.3.2.orig/src/m17nutil.h
+++ ibus-m17n-1.3.2/src/m17nutil.h
-@@ -14,6 +14,12 @@ struct _IBusM17NEngineConfig {
- /* engine rank */
- gint rank;
+@@ -17,6 +17,12 @@ struct _IBusM17NEngineConfig {
+ /* keyboard layout */
+ gchar *layout;
+ /* hotkeys */
+ gchar *hotkeys;
@@ -127,4 +620,4 @@ Index: ibus-m17n-1.3.2/src/m17nutil.h
+
/* whether to highlight preedit */
gboolean preedit_highlight;
-
+ };
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index aa1103c..9f60a37 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -13,14 +13,12 @@
Name: ibus-m17n
Version: 1.3.2
-Release: 7%{?dist}
+Release: 10%{?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
-# dummy source to keep quilt series file
-Source1: series
Patch0: ibus-m17n-HEAD.patch
Patch1: ibus-m17n-iok.patch
@@ -77,6 +75,18 @@ make DESTDIR=${RPM_BUILD_ROOT} install
%{_datadir}/ibus/component/*
%changelog
+* Tue Aug 9 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-10
+- Set symbol for m17n:ne:rom.
+
+* Mon Aug 8 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-9
+- Update ibus-m17n-xkb-options.patch.
+- Don't set XKB options directly from engine but via ibus-xkb
+
+* Fri Aug 5 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-8
+- Update ibus-m17n-xx-icon-symbol.patch.
+- Fix bug 727024 - ibus compose file needs a symbol tag for gnome-shell
+- Update ibus-m17n-xkb-options.patch.
+
* Thu Jul 7 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-7
- don't specify --with-hotkey.
More information about the scm-commits
mailing list