diff --git a/mozc-fix-model-path-for-zinnia.patch b/mozc-fix-model-path-for-zinnia.patch deleted file mode 100644 index c3e1566..0000000 --- a/mozc-fix-model-path-for-zinnia.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN mozc-1.3.911.102.orig/handwriting/zinnia_handwriting.cc mozc-1.3.911.102/handwriting/zinnia_handwriting.cc ---- mozc-1.3.911.102.orig/handwriting/zinnia_handwriting.cc 2011-11-30 18:02:08.000000000 +0900 -+++ mozc-1.3.911.102/handwriting/zinnia_handwriting.cc 2011-12-02 11:39:28.000000000 +0900 -@@ -51,7 +51,7 @@ string GetModelFileName() { - #elif defined(USE_LIBZINNIA) - // On Linux, use the model for tegaki-zinnia. - const char kModelFile[] = -- "/usr/share/tegaki/models/zinnia/handwriting-ja.model"; -+ "/usr/share/zinnia/model/tomoe/handwriting-ja.model"; - return kModelFile; - #else - const char kModelFile[] = "handwriting-ja.model"; diff --git a/mozc-fix-use-libprotobuf.patch b/mozc-fix-use-libprotobuf.patch deleted file mode 100644 index 65127dc..0000000 --- a/mozc-fix-use-libprotobuf.patch +++ /dev/null @@ -1,84 +0,0 @@ -Index: build_tools/protoc_wrapper.py -=================================================================== ---- build_tools/protoc_wrapper.py (revision 153) -+++ build_tools/protoc_wrapper.py (working copy) -@@ -30,10 +30,11 @@ - - """Script to invoke protoc with considering project root directory. - -- % python protoc_wrapper.py \ -- --protoc_path=/usr/bin/protoc \ -- --proto=my_data.proto \ -- --cpp_out=../out/debug/gen \ -+ % python protoc_wrapper.py \ -+ --protoc_command=protoc \ -+ --protoc_dir=/usr/bin (optional) \ -+ --proto=my_data.proto \ -+ --cpp_out=../out/debug/gen \ - --project_root=../ - """ - -@@ -47,7 +48,8 @@ - def ParseOption(): - """Parse command line options.""" - parser = optparse.OptionParser() -- parser.add_option('--protoc_path', dest='protoc_path', help='path to protoc') -+ parser.add_option('--protoc_command', dest='protoc_command', help='name of protoc') -+ parser.add_option('--protoc_dir', dest='protoc_dir', help='directory of protoc') - parser.add_option('--proto', dest='proto', help='path of the *.proto file') - parser.add_option('--cpp_out', dest='cpp_out', default='.', - help='path where cpp files should be generated') -@@ -65,7 +67,9 @@ - - # Convert to absolute paths before changing the current directory. - project_root = os.path.abspath(opts.project_root) -- protoc_path = os.path.abspath(opts.protoc_path) -+ protoc_path = opts.protoc_command -+ if opts.protoc_dir: -+ protoc_path = os.path.join(os.path.abspath(opts.protoc_dir), protoc_path) - cpp_out = os.path.abspath(opts.cpp_out) - - # The path of proto file should be recalculated as a relative path from -Index: protobuf/genproto.gypi -=================================================================== ---- protobuf/genproto.gypi (revision 153) -+++ protobuf/genproto.gypi (working copy) -@@ -31,21 +31,22 @@ - { - 'variables': { - 'wrapper_path': '<(DEPTH)/build_tools/protoc_wrapper.py', -+ 'protoc_command': 'protoc<(EXECUTABLE_SUFFIX)', - }, - 'conditions': [ -- ['target_platform!="linux"', { -+ ['target_platform!="Linux"', { - 'variables': { -- 'protoc_command%': '<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)', -+ 'protoc_wrapper_additional_options': ['--protoc_dir=<(mozc_build_tools_dir)'], - }, - }, { # else - 'conditions': [ - ['use_libprotobuf==0', { - 'variables': { -- 'protoc_command%': '<(mozc_build_tools_dir)/protoc<(EXECUTABLE_SUFFIX)', -+ 'protoc_wrapper_additional_options': ['--protoc_dir=<(mozc_build_tools_dir)'], - }, - }, { # else - 'variables': { -- 'protoc_command%': 'protoc<(EXECUTABLE_SUFFIX)', -+ 'protoc_wrapper_additional_options': [], - }, - }], - ], -@@ -65,9 +66,10 @@ - 'action': [ - 'python', '<(wrapper_path)', - '--project_root=<(DEPTH)', -- '--protoc_path=<(protoc_command)', -+ '--protoc_command=<(protoc_command)', - '--proto=<(RULE_INPUT_PATH)', - '--cpp_out=<(proto_out_dir)', -+ '<@(protoc_wrapper_additional_options)', - ], - 'message': 'Generating C++ code from <(RULE_INPUT_PATH)', - }, diff --git a/mozc.spec b/mozc.spec index b260eb4..aba6d9f 100644 --- a/mozc.spec +++ b/mozc.spec @@ -1,7 +1,7 @@ %define pkg mozc Name: mozc -Version: 1.10.1390.102 +Version: 1.11.1502.102 Release: 1%{?dist} Summary: A Japanese Input Method Editor (IME) designed for multi-platform @@ -21,10 +21,7 @@ Source2: http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip Source3: http://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip Source4: ibus-setup-mozc-jp.desktop Patch0: mozc-build-verbosely.patch -Patch1: mozc-fix-model-path-for-zinnia.patch Patch2: mozc-no-Werror.patch -# http://code.google.com/p/mozc/issues/detail?id=189 -Patch3: %{name}-fix-use-libprotobuf.patch BuildRequires: python gettext BuildRequires: openssl-devel libstdc++-devel zlib-devel libxcb-devel protobuf-devel glib2-devel qt-devel zinnia-devel gtk2-devel @@ -121,16 +118,14 @@ to use mozc with XEmacs. %prep %setup -q -a 2 -a 3 %patch0 -p1 -b .0-build-verbosely -%patch1 -p1 -b .1-fix-zinnia %patch2 -p1 -b .2-no-Werror -%patch3 -p0 -b .3-use-libprotobuf (cd data/dictionary_oss; python ../../dictionary/gen_zip_code_seed.py --zip_code=../../KEN_ALL.CSV --jigyosyo=../../JIGYOSYO.CSV >> dictionary09.txt; ) %build -GYP_DEFINES="use_libprotobuf=1" python build_mozc.py gyp --gypdir=%{_bindir} --server_dir=%{_libexecdir}/mozc +GYP_DEFINES="use_libprotobuf=1 zinnia_model_file=/usr/share/zinnia/model/tomoe/handwriting-ja.model" python build_mozc.py gyp --gypdir=%{_bindir} --server_dir=%{_libexecdir}/mozc python build_mozc.py build_tools -c Release python build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server gui/gui.gyp:mozc_tool renderer/renderer.gyp:mozc_renderer @@ -210,6 +205,9 @@ xemacs -batch -f batch-byte-compile $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{pkg} %{_xemacs_sitelispdir}/%{pkg}/*.el %changelog +* Fri Jul 19 2013 Akira TAGOH - 1.11.1502.102-1 +- New upstream release. (#985318) + * Mon Apr 15 2013 Akira TAGOH - 1.10.1390.102-1 - New upstream release. (#328711) - Move credit text since it was referenced by the program at runtime.