[ibus-m17n] Update to 1.3.1-15.

Daiki Ueno ueno at fedoraproject.org
Fri Jan 14 01:23:03 UTC 2011


commit 2adfc60926071606752bb0d5c4a4d968590cafa7
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Fri Jan 14 10:22:55 2011 +0900

    Update to 1.3.1-15.

 ibus-m17n-iok.patch |   10 +++++-----
 ibus-m17n.spec      |    7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/ibus-m17n-iok.patch b/ibus-m17n-iok.patch
index 19dc2a1..b777368 100644
--- a/ibus-m17n-iok.patch
+++ b/ibus-m17n-iok.patch
@@ -1,4 +1,4 @@
-From e494dd5bde1640bc11e0be4296e7a85e88701cbe Mon Sep 17 00:00:00 2001
+From 5eea6bfe70ba1815bda1ba22a28c584f9d5f6a64 Mon Sep 17 00:00:00 2001
 From: Daiki Ueno <ueno at unixuser.org>
 Date: Wed, 8 Dec 2010 18:06:11 +0900
 Subject: [PATCH] Apply iok patch from fedora.
@@ -8,7 +8,7 @@ Subject: [PATCH] Apply iok patch from fedora.
  1 files changed, 43 insertions(+), 0 deletions(-)
 
 diff --git a/src/engine.c b/src/engine.c
-index f8e7fe5..04b0722 100644
+index f8e7fe5..3143428 100644
 --- a/src/engine.c
 +++ b/src/engine.c
 @@ -35,6 +35,7 @@ struct _IBusM17NEngine {
@@ -49,9 +49,6 @@ index f8e7fe5..04b0722 100644
                                            NULL);
      g_object_ref_sink (m17n->setup_prop);
  
-+    if (klass->use_iok)
-+        ibus_property_set_visible (m17n->show_iok_prop, TRUE);
-+
 +    label = ibus_text_new_from_string ("iok");
 +    m17n->show_iok_prop = ibus_property_new ("iok",
 +                                             PROP_TYPE_NORMAL,
@@ -64,6 +61,9 @@ index f8e7fe5..04b0722 100644
 +                                             NULL);
 +    g_object_ref_sink (m17n->show_iok_prop);
 +
++    if (klass->use_iok)
++        ibus_property_set_visible (m17n->show_iok_prop, TRUE);
++
      m17n->prop_list = ibus_prop_list_new ();
      g_object_ref_sink (m17n->prop_list);
      ibus_prop_list_append (m17n->prop_list,  m17n->status_prop);
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index c0412db..4f828cc 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -2,7 +2,7 @@
 
 Name:       ibus-m17n
 Version:    1.3.1
-Release:    14%{?dist}
+Release:    15%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -66,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Jan 14 2011 Daiki Ueno <dueno at redhat.com> - 1.3.1-15
+- Update iok patch.
+- Fix bug 669128 - [abrt] ibus-m17n-1.3.1-14.fc15:
+  Process /usr/libexec/ibus-engine-m17n was killed by signal 6 (SIGABRT)
+
 * Sun Jan  9 2011 Matthias Clasen <mclasen at redhat.com> - 1.3.1-14
 - Rebuild against newer gtk3
 


More information about the scm-commits mailing list