[Fedora-i18n-bugs] [ibus-m17n/f14/master] Update to 1.3.2-2.
Daiki Ueno
ueno at fedoraproject.org
Thu Apr 21 06:53:03 UTC 2011
commit 61f42c059253aac51875b7620c17cd566ec9b323
Author: Daiki Ueno <ueno at unixuser.org>
Date: Thu Apr 21 15:52:47 2011 +0900
Update to 1.3.2-2.
ibus-m17n-696476-restart-exit.patch | 156 +++++++++++++++++++++++++++++++++++
ibus-m17n.spec | 9 ++-
2 files changed, 164 insertions(+), 1 deletions(-)
---
diff --git a/ibus-m17n-696476-restart-exit.patch b/ibus-m17n-696476-restart-exit.patch
new file mode 100644
index 0000000..c51dd2c
--- /dev/null
+++ b/ibus-m17n-696476-restart-exit.patch
@@ -0,0 +1,156 @@
+From 997825bfa6b19c080b825be114bfddf43f9750f6 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at unixuser.org>
+Date: Thu, 21 Apr 2011 12:32:29 +0900
+Subject: [PATCH] Get rid of GTypeModule for class finalizer, as all engines
+ are now static.
+
+---
+ src/engine.c | 89 +++------------------------------------------------------
+ 1 files changed, 5 insertions(+), 84 deletions(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index 3ec608a..832c84e 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -9,23 +9,6 @@
+ #include "m17nutil.h"
+ #include "engine.h"
+
+-/* type module to assign different GType to each engine */
+-#define IBUS_TYPE_M17N_TYPE_MODULE (ibus_m17n_type_module_get_type ())
+-#define IBUS_M17N_TYPE_MODULE (module) (G_TYPE_CHECK_INSTANCE_CAST (module, IBUS_TYPE_M17N_TYPE_MODULE, IBusM17NTypeModule)
+-
+-typedef struct _IBusM17NTypeModule IBusM17NTypeModule;
+-typedef struct _IBusM17NTypeModuleClass IBusM17NTypeModuleClass;
+-
+-struct _IBusM17NTypeModule
+-{
+- GTypeModule parent_instance;
+-};
+-
+-struct _IBusM17NTypeModuleClass
+-{
+- GTypeModuleClass parent_class;
+-};
+-
+ typedef struct _IBusM17NEngine IBusM17NEngine;
+ typedef struct _IBusM17NEngineClass IBusM17NEngineClass;
+
+@@ -56,10 +39,7 @@ struct _IBusM17NEngineClass {
+ };
+
+ /* functions prototype */
+-static GType
+- ibus_m17n_type_module_get_type (void);
+ static void ibus_m17n_engine_class_init (IBusM17NEngineClass *klass);
+-static void ibus_m17n_engine_class_finalize (IBusM17NEngineClass *klass);
+ static void ibus_m17n_config_value_changed (IBusConfig *config,
+ const gchar *section,
+ const gchar *name,
+@@ -122,7 +102,6 @@ static void ibus_m17n_engine_update_lookup_table
+ static IBusEngineClass *parent_class = NULL;
+
+ static IBusConfig *config = NULL;
+-static IBusM17NTypeModule *module = NULL;
+
+ void
+ ibus_m17n_init (IBusBus *bus)
+@@ -131,55 +110,6 @@ ibus_m17n_init (IBusBus *bus)
+ if (config)
+ g_object_ref_sink (config);
+ ibus_m17n_init_common ();
+-
+- module = g_object_new (IBUS_TYPE_M17N_TYPE_MODULE, NULL);
+-}
+-
+-static gboolean
+-ibus_m17n_type_module_load (GTypeModule *module)
+-{
+- return TRUE;
+-}
+-
+-static void
+-ibus_m17n_type_module_unload (GTypeModule *module)
+-{
+-}
+-
+-static void
+-ibus_m17n_type_module_class_init (IBusM17NTypeModuleClass *klass)
+-{
+- GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (klass);
+-
+- module_class->load = ibus_m17n_type_module_load;
+- module_class->unload = ibus_m17n_type_module_unload;
+-}
+-
+-static GType
+-ibus_m17n_type_module_get_type (void)
+-{
+- static GType type = 0;
+-
+- static const GTypeInfo type_info = {
+- sizeof (IBusM17NTypeModuleClass),
+- (GBaseInitFunc) NULL,
+- (GBaseFinalizeFunc) NULL,
+- (GClassInitFunc) ibus_m17n_type_module_class_init,
+- (GClassFinalizeFunc) NULL,
+- NULL,
+- sizeof (IBusM17NTypeModule),
+- 0,
+- (GInstanceInitFunc) NULL,
+- };
+-
+- if (type == 0) {
+- type = g_type_register_static (G_TYPE_TYPE_MODULE,
+- "IBusM17NTypeModule",
+- &type_info,
+- (GTypeFlags) 0);
+- }
+-
+- return type;
+ }
+
+ static gboolean
+@@ -245,7 +175,7 @@ ibus_m17n_engine_get_type_for_name (const gchar *engine_name)
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) ibus_m17n_engine_class_init,
+- (GClassFinalizeFunc)ibus_m17n_engine_class_finalize,
++ (GClassFinalizeFunc)NULL,
+ NULL,
+ sizeof (IBusM17NEngine),
+ 0,
+@@ -267,11 +197,10 @@ ibus_m17n_engine_get_type_for_name (const gchar *engine_name)
+ g_assert (type == 0 || g_type_is_a (type, IBUS_TYPE_ENGINE));
+
+ if (type == 0) {
+- type = g_type_module_register_type (G_TYPE_MODULE (module),
+- IBUS_TYPE_ENGINE,
+- type_name,
+- &type_info,
+- (GTypeFlags) 0);
++ type = g_type_register_static (IBUS_TYPE_ENGINE,
++ type_name,
++ &type_info,
++ (GTypeFlags) 0);
+ }
+ g_free (type_name);
+
+@@ -411,14 +340,6 @@ ibus_m17n_config_value_changed (IBusConfig *config,
+ }
+
+ static void
+-ibus_m17n_engine_class_finalize (IBusM17NEngineClass *klass)
+-{
+- if (klass->im)
+- minput_close_im (klass->im);
+- g_free (klass->config_section);
+-}
+-
+-static void
+ ibus_m17n_engine_init (IBusM17NEngine *m17n)
+ {
+ IBusText* label;
+--
+1.7.4.4
+
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index 9a9c397..a0f973c 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -2,7 +2,7 @@
Name: ibus-m17n
Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The M17N engine for IBus platform
License: GPLv2+
Group: System Environment/Libraries
@@ -11,6 +11,7 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
Patch0: ibus-m17n-iok.patch
Patch1: ibus-m17n-surrounding-text.patch
+Patch2: ibus-m17n-696476-restart-exit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# The following BR is for autogen and not necessary when packging
@@ -35,6 +36,7 @@ the input table maps from m17n-db.
%setup -q
%patch0 -p1 -b .iok
%patch1 -p1 -b .surrounding-text
+%patch2 -p1 -b .696476-restart-exit
# NOCONFIGURE=1 ./autogen.sh
%build
@@ -60,6 +62,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ibus/component/*
%changelog
+* Thu Apr 21 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-2
+- Add ibus-m17n-696476-restart-exit.patch.
+- Fix bug 696476 - [bn][bn-IN]Combinations with Consonant+09CB+special
+ characters fail on Openoffice.org writer
+
* Mon Mar 7 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-1
- New upstream release.
More information about the i18n-bugs
mailing list