[mozc] Re-enable hotkeys support and add a symbol. (#727022)
Akira TAGOH
tagoh at fedoraproject.org
Thu Aug 11 03:09:15 UTC 2011
commit f8cf90b20984b7c2f8265ca00d5e2b0ccd54bbce
Author: Akira TAGOH <tagoh at redhat.com>
Date: Thu Aug 11 12:09:01 2011 +0900
Re-enable hotkeys support and add a symbol. (#727022)
mozc-hotkeys.patch | 11 -----------
mozc-support-new-ibus.patch | 21 +++++++++++++++++++++
mozc.spec | 9 ++++++---
3 files changed, 27 insertions(+), 14 deletions(-)
---
diff --git a/mozc-support-new-ibus.patch b/mozc-support-new-ibus.patch
new file mode 100644
index 0000000..eaf85b3
--- /dev/null
+++ b/mozc-support-new-ibus.patch
@@ -0,0 +1,21 @@
+diff -pruN mozc-1.1.773.102.orig/unix/ibus/gen_mozc_xml.py mozc-1.1.773.102/unix/ibus/gen_mozc_xml.py
+--- mozc-1.1.773.102.orig/unix/ibus/gen_mozc_xml.py 2011-07-19 14:42:21.000000000 +0900
++++ mozc-1.1.773.102/unix/ibus/gen_mozc_xml.py 2011-08-11 12:06:08.000000000 +0900
+@@ -74,6 +74,8 @@ IBUS_ENGINES_PROPS = {
+ 'name': ['mozc-jp'],
+ 'longname': ['%s'],
+ 'layout': ['jp'],
++ 'hotkeys': ['Control+space,Zenkaku_Hankaku'],
++ 'symbol': [u'あ'],
+ },
+ # On Chrome/Chromium OS, we provide three engines.
+ 'ChromeOS': {
+@@ -165,7 +167,7 @@ def OutputCpp(product_name, component, e
+ for key in engine_common:
+ OutputCppVariable(product_name, 'Engine', key, engine_common[key])
+ for key in engines:
+- if key == 'hotkeys':
++ if key == 'hotkeys' or key == 'symbol':
+ # Skip hotkeys because it is not used from C++ code.
+ continue
+ print 'const char* kEngine%sArray[] = {' % key.capitalize()
diff --git a/mozc.spec b/mozc.spec
index 3be2a27..2c56d8c 100644
--- a/mozc.spec
+++ b/mozc.spec
@@ -2,7 +2,7 @@
Name: mozc
Version: 1.1.773.102
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Open-sourced Google Japanese Input
Group: System Environment/Libraries
@@ -22,7 +22,7 @@ Source1: mozc-init.el
Patch0: mozc-build-verbosely.patch
Patch1: mozc-fix-model-path-for-zinnia.patch
Patch2: mozc-no-Werror.patch
-Patch3: mozc-hotkeys.patch
+Patch3: mozc-support-new-ibus.patch
BuildRequires: python gettext
BuildRequires: openssl-devel libstdc++-devel zlib-devel libcurl-devel gtest-devel protobuf-devel glib2-devel qt-devel zinnia-devel
@@ -134,7 +134,7 @@ to use mozc with XEmacs.
%patch0 -p1 -b .0-build-verbosely
%patch1 -p1 -b .1-fix-zinnia
%patch2 -p1 -b .2-no-Werror
-#%%patch3 -p1 -b .3-hotkeys
+%patch3 -p1 -b .3-new-ibus
%build
@@ -251,6 +251,9 @@ rm -rf $RPM_BUILD_ROOT
%{_xemacs_sitelispdir}/%{pkg}/*.el
%changelog
+* Thu Aug 11 2011 Akira TAGOH <tagoh at redhat.com> - 1.1.773.102-2
+- Re-enable hotkeys support and add a symbol. (#727022)
+
* Thu Jul 21 2011 Akira TAGOH <tagoh at redhat.com> - 1.1.773.102-1
- New upstream release.
More information about the scm-commits
mailing list