commit a3736bee03246807acc7827fa89985844e7bcb9e Author: Daiki Ueno ueno@unixuser.org Date: Fri Sep 16 17:18:04 2011 +0900
Update to 1.3.3-4.
ibus-m17n-default-xml-override.patch | 2 +- ibus-m17n-iok.patch | 4 +- ibus-m17n-setup-refactor.patch | 2 +- ibus-m17n-virtkbd.patch | 6 ++-- ibus-m17n-xkb-options.patch | 2 +- ibus-m17n-xx-icon-symbol.patch | 36 +++++++++++++++++----------------- ibus-m17n.spec | 5 +++- 7 files changed, 30 insertions(+), 27 deletions(-) --- diff --git a/ibus-m17n-default-xml-override.patch b/ibus-m17n-default-xml-override.patch index 21f2be2..946200c 100644 --- a/ibus-m17n-default-xml-override.patch +++ b/ibus-m17n-default-xml-override.patch @@ -617,5 +617,5 @@ index 0000000..0908818 + return g_test_run (); +} -- -1.7.6.1 +1.7.6.2
diff --git a/ibus-m17n-iok.patch b/ibus-m17n-iok.patch index b885aae..c1b02c7 100644 --- a/ibus-m17n-iok.patch +++ b/ibus-m17n-iok.patch @@ -1,4 +1,4 @@ -From 240931f8433ffa9de0c78a862e0d5e0aad93953d Mon Sep 17 00:00:00 2001 +From 07ff49d4718bd468fb260bf31922b1df2d6cfa70 Mon Sep 17 00:00:00 2001 From: Daiki Ueno ueno@unixuser.org Date: Fri, 2 Sep 2011 11:27:02 +0900 Subject: [PATCH 6/6] Apply iok patch from fedora. @@ -98,5 +98,5 @@ index 1e6bd1b..f23d982 100644 }
-- -1.7.6.1 +1.7.6.2
diff --git a/ibus-m17n-setup-refactor.patch b/ibus-m17n-setup-refactor.patch index ccd1346..6fc0d4b 100644 --- a/ibus-m17n-setup-refactor.patch +++ b/ibus-m17n-setup-refactor.patch @@ -839,5 +839,5 @@ index aba0e92..30386df 100644
int -- -1.7.6.1 +1.7.6.2
diff --git a/ibus-m17n-virtkbd.patch b/ibus-m17n-virtkbd.patch index ad70c1c..2ceb043 100644 --- a/ibus-m17n-virtkbd.patch +++ b/ibus-m17n-virtkbd.patch @@ -1,4 +1,4 @@ -From 5ec645b395e81cd804f50e5bcd6c21e92d257fbe Mon Sep 17 00:00:00 2001 +From 49d2f16638aaa9160b87936cb89fea92186e5171 Mon Sep 17 00:00:00 2001 From: Daiki Ueno ueno@unixuser.org Date: Wed, 31 Aug 2011 18:28:48 +0900 Subject: [PATCH 5/6] Support virtual keyboard. @@ -70,7 +70,7 @@ index e354149..eac6629 100644
if HAVE_GTK diff --git a/src/default.xml.in.in b/src/default.xml.in.in -index 8192878..47053ae 100644 +index b1c77c5..dfcd978 100644 --- a/src/default.xml.in.in +++ b/src/default.xml.in.in @@ -12,6 +12,7 @@ @@ -845,5 +845,5 @@ index 0000000..c28953a + +#endif /* __VIRTKBD_H__ */ -- -1.7.6.1 +1.7.6.2
diff --git a/ibus-m17n-xkb-options.patch b/ibus-m17n-xkb-options.patch index ab09cf0..b8f5dd7 100644 --- a/ibus-m17n-xkb-options.patch +++ b/ibus-m17n-xkb-options.patch @@ -89,5 +89,5 @@ index 313e7bc..c7b283e 100644 gboolean preedit_highlight; }; -- -1.7.6.1 +1.7.6.2
diff --git a/ibus-m17n-xx-icon-symbol.patch b/ibus-m17n-xx-icon-symbol.patch index 42e70fd..588c27a 100644 --- a/ibus-m17n-xx-icon-symbol.patch +++ b/ibus-m17n-xx-icon-symbol.patch @@ -1,4 +1,4 @@ -From 4cad5fe6e36be9cbfe0d50f683b489e9202c7d53 Mon Sep 17 00:00:00 2001 +From 0f9cea9b0d4c9ce3519a8d1e93977e16e6f2185e Mon Sep 17 00:00:00 2001 From: Daiki Ueno ueno@unixuser.org Date: Wed, 31 Aug 2011 11:44:46 +0900 Subject: [PATCH 4/6] Supply hotkeys and symbol in engine desc. @@ -29,8 +29,8 @@ index 927d382..23102c4 100644 AC_CONFIG_FILES([ po/Makefile.in diff --git a/m4/.gitignore b/m4/.gitignore index 0f4126c..e28d185 100644 -#--- a/m4/.gitignore -#+++ b/m4/.gitignore +--- a/m4/.gitignore ++++ b/m4/.gitignore @@ -1 +1,3 @@ *.m4 +!ibus.m4 @@ -94,7 +94,7 @@ index 0000000..f8f074a + AC_SUBST(IBUS_SYMBOL_XML) +]) diff --git a/src/default.xml.in.in b/src/default.xml.in.in -index 785ab05..8192878 100644 +index 785ab05..b1c77c5 100644 --- a/src/default.xml.in.in +++ b/src/default.xml.in.in @@ -10,6 +10,8 @@ @@ -113,19 +113,19 @@ index 785ab05..8192878 100644 + <!-- Set IME symbols. --> + <engine> + <name>m17n:as:*</name> -+ <symbol>ক</symbol> ++ <symbol>অ</symbol> + </engine> + <engine> + <name>m17n:bn:*</name> -+ <symbol>ক</symbol> ++ <symbol>বা</symbol> + </engine> + <engine> + <name>m17n:gu:*</name> -+ <symbol>ક</symbol> ++ <symbol>ગુ</symbol> + </engine> + <engine> + <name>m17n:hi:*</name> -+ <symbol>क</symbol> ++ <symbol>हिं</symbol> + </engine> + <engine> + <name>m17n:kn:*</name> @@ -137,15 +137,15 @@ index 785ab05..8192878 100644 + </engine> + <engine> + <name>m17n:mai:*</name> -+ <symbol>क</symbol> ++ <symbol>मै</symbol> + </engine> + <engine> + <name>m17n:ml:*</name> -+ <symbol>ക</symbol> ++ <symbol>മ</symbol> + </engine> + <engine> + <name>m17n:mr:*</name> -+ <symbol>क</symbol> ++ <symbol>म</symbol> + </engine> + <engine> + <name>m17n:ne:*</name> @@ -153,19 +153,19 @@ index 785ab05..8192878 100644 + </engine> + <engine> + <name>m17n:or:*</name> -+ <symbol>କ</symbol> ++ <symbol>ଓ</symbol> + </engine> + <engine> + <name>m17n:pa:*</name> -+ <symbol>ਕ</symbol> ++ <symbol>ਪੰ</symbol> + </engine> + <engine> + <name>m17n:sa:*</name> -+ <symbol>क</symbol> ++ <symbol>सं</symbol> + </engine> + <engine> + <name>m17n:sd:*</name> -+ <symbol>क</symbol> ++ <symbol>सिं</symbol> + </engine> + <engine> + <name>m17n:si:*</name> @@ -173,11 +173,11 @@ index 785ab05..8192878 100644 + </engine> + <engine> + <name>m17n:ta:*</name> -+ <symbol>க</symbol> ++ <symbol>த</symbol> + </engine> + <engine> + <name>m17n:te:*</name> -+ <symbol>క</symbol> ++ <symbol>తె</symbol> + </engine> + <engine> + <name>m17n:*:kbd</name> @@ -386,5 +386,5 @@ index c7b283e..21b1bb9 100644 gboolean preedit_highlight; }; -- -1.7.6.1 +1.7.6.2
diff --git a/ibus-m17n.spec b/ibus-m17n.spec index 1afff8d..b32b63d 100644 --- a/ibus-m17n.spec +++ b/ibus-m17n.spec @@ -23,7 +23,7 @@
Name: ibus-m17n Version: 1.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The M17N engine for IBus platform License: GPLv2+ Group: System Environment/Libraries @@ -95,6 +95,9 @@ make DESTDIR=${RPM_BUILD_ROOT} install %{_datadir}/ibus/component/*
%changelog +* Fri Sep 16 2011 Daiki Ueno dueno@redhat.com - 1.3.3-4 +- Fix Indic IME symbols (thanks to pravins). + * Fri Sep 9 2011 Takao Fujiwara tfujiwar@redhat.com - 1.3.3-3 - Rebuild with the latest ibus 1.3.99.20110817-4 and eekboard 1.0.3
i18n-bugs@lists.fedoraproject.org
-
Daiki Ueno