[Fedora-i18n-bugs] [ibus-m17n/f14] Update to 1.3.2-5.

Daiki Ueno ueno at fedoraproject.org
Wed Jun 15 03:43:48 UTC 2011 

commit c70ab9f4c9aaf48c21210340ae61b4a7256df6cc
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Wed Jun 15 12:43:30 2011 +0900

    Update to 1.3.2-5.

 ibus-m17n-stscap.patch |   38 ++++++++++++++++++++++++++
 ibus-m17n-stsreq.patch |   33 +++++++++++++++++++++++
 ibus-m17n.spec         |   69 +++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 130 insertions(+), 10 deletions(-)
---
diff --git a/ibus-m17n-stscap.patch b/ibus-m17n-stscap.patch
new file mode 100644
index 0000000..2109c3e
--- /dev/null
+++ b/ibus-m17n-stscap.patch
@@ -0,0 +1,38 @@
+From f85e79001e7669e3b1b45b1c6ad14dedc5e0752f Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at unixuser.org>
+Date: Tue, 7 Jun 2011 12:54:53 +0900
+Subject: [PATCH] Request IBUS_CAP_SURROUNDING_TEXT.
+
+---
+ src/m17nutil.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/m17nutil.c b/src/m17nutil.c
+index 1150cc4..db99686 100644
+--- a/src/m17nutil.c
++++ b/src/m17nutil.c
+@@ -91,6 +91,13 @@ ibus_m17n_parse_color (const gchar *hex)
+     return color;
+ }
+ 
++#define DEFAULT_REQUIRES (IBUS_CAP_PREEDIT_TEXT |   \
++                          IBUS_CAP_AUXILIARY_TEXT | \
++                          IBUS_CAP_LOOKUP_TABLE |   \
++                          IBUS_CAP_FOCUS |          \
++                          IBUS_CAP_PROPERTY | \
++                          IBUS_CAP_SURROUNDING_TEXT)
++
+ static IBusEngineDesc *
+ ibus_m17n_engine_new (MSymbol  lang,
+                       MSymbol  name,
+@@ -122,6 +129,7 @@ ibus_m17n_engine_new (MSymbol  lang,
+                                            "icon",        engine_icon ? engine_icon : "",
+                                            "layout",      "us",
+                                            "rank",        config->rank,
++                                           "requires",    DEFAULT_REQUIRES,
+                                            NULL);
+ #else
+     engine = ibus_engine_desc_new (engine_name,
+-- 
+1.7.5.2
+
diff --git a/ibus-m17n-stsreq.patch b/ibus-m17n-stsreq.patch
new file mode 100644
index 0000000..6c2f6f8
--- /dev/null
+++ b/ibus-m17n-stsreq.patch
@@ -0,0 +1,33 @@
+From 02e72cdd3673c65d4217ea19fab7aa2fdfd449f6 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at unixuser.org>
+Date: Tue, 14 Jun 2011 16:10:23 +0900
+Subject: [PATCH] Proclaim we will use surrounding-text, in enable().
+
+---
+ src/engine.c |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index 60816b0..b68b13e 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -697,6 +697,16 @@ ibus_m17n_engine_enable (IBusEngine *engine)
+     IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
+ 
+     parent_class->enable (engine);
++
++#ifdef HAVE_IBUS_ENGINE_GET_SURROUNDING_TEXT
++    /* Issue a dummy ibus_engine_get_surrounding_text() call to tell
++       input context that we will use surrounding-text. */
++    IBusText *text;
++    guint cursor_pos;
++
++    ibus_engine_get_surrounding_text (engine, &text, &cursor_pos);
++    g_object_unref (text);
++#endif  /* HAVE_IBUS_ENGINE_GET_SURROUNDING_TEXT */
+ }
+ 
+ static void
+-- 
+1.7.5.2
+
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index 9b2bfb7..8d7162e 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -2,7 +2,7 @@
 
 Name:       ibus-m17n
 Version:    1.3.2
-Release:    3%{?dist}
+Release:    5%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -10,7 +10,11 @@ URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 
 Patch0:     ibus-m17n-iok.patch
-Patch1:	    ibus-m17n-HEAD.patch
+Patch1:     ibus-m17n-HEAD.patch
+# Surrounding-text support fixes.  Hopefully Patch2 won't be needed
+# with future IBus versions.
+Patch2:	    ibus-m17n-stscap.patch
+Patch3:	    ibus-m17n-stsreq.patch
 
 # The following BR is for autogen and not necessary when packging
 # released tarballs.
@@ -34,6 +38,8 @@ the input table maps from m17n-db.
 %setup -q
 %patch0 -p1 -b .iok
 %patch1 -p1 -b .HEAD
+%patch2 -p1 -b .stscap
+%patch3 -p1 -b .stsreq
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -55,33 +61,76 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 %{_datadir}/ibus/component/*
 
 %changelog
-* Tue May 24 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-3
+* Wed Jun 15 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-5
+- Add ibus-m17n-stsreq.patch.
+- Fix bug 711126 - ibus: surrounding text support fails for the first
+  syllable upon activation
+
+* Tue Jun  7 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-4
+- Add ibus-m17n-stscap.patch.
+- Fix bug 711126 - ibus: surrounding text support fails for the first
+  syllable upon activation
+
+* Mon May 23 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-3
 - Update ibus-m17n-HEAD.patch.
 
-* 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 May 23 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-2
+- Bump the release to fix upgrade path.
+- Fix bug 706602 - ibus-m17n-1.3.2-2.fc14 > ibus-m17n-1.3.2-1.fc15
+- Drop preparing/cleaning buildroot.
 
 * Mon Mar  7 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-1
 - New upstream release.
 
-* Fri Dec 10 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-8
+* Fri Feb 11 2011 Matthias Clasen <mclasen at redhat.com> - 1.3.1-18
+- Rebuild against newer gtk
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Feb  2 2011 Matthias Clasen <mclasen at redhat.com> - 1.3.1-16
+- Rebuild against newer gtk
+
+* 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
+
+* Mon Dec 27 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-13
+- Update iok patch.
+
+* Wed Dec 22 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-12
+- Update surrounding-text patch.
+
+* Fri Dec 10 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-11
 - Update ibus-m17n-HEAD.patch.
 - Lower si-samanala.mim rank per request from a Sinhala user.
 
-* Wed Dec  8 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-7
+* Wed Dec  8 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-10
 - Update ibus-m17n-HEAD.patch.
 - Fix bug 658336 - ibus-m17n: define the IM ranks in a config file and
   not in a compiled binary
 
-* Fri Nov  5 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-6
+* Fri Dec  3 2010 Matthias Clasen <mclasen at redhat.com> - 1.3.1-9
+- Rebuild against newer gtk3
+
+* Tue Nov  9 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-8
+- Apply ibus-m17n-ibus-1.4.patch for ibus-1.3.99.
+- Specify backup filename for each patch.
+
+* Fri Nov  5 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-7
 - Rename ibus-m17n-fedora.patch to ibus-m17n-HEAD.patch since the
   changes are merged into upstream.
 - Update ibus-m17n-HEAD.patch with upstream fix 08e06310
 - Fix bug 649230 - [si] last input character is committed late in
   wijesekara input method
 
+* Fri Oct 22 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-6
+- Link ibus-setup-m17n with GTK+ 3.0.
+
 * Tue Oct 12 2010 Daiki Ueno <dueno at redhat.com> - 1.3.1-5
 - put several Fedora patches into one.
 - Fix bug 640896 - Ibus does not load all the keymaps for a language

More information about the i18n-bugs mailing list