=> Bootstrap dependency digest>=20211023: found digest-20220214 => Checksum BLAKE2s OK for fcitx-mozc-2.26.4276.100.tar.xz => Checksum SHA512 OK for fcitx-mozc-2.26.4276.100.tar.xz ===> Installing dependencies for fcitx5-mozc-2.26.4276.100nb24 ========================================================================== The following variables will affect the build process of this package, fcitx5-mozc-2.26.4276.100nb24. Their current value is shown below: * JPEG_DEFAULT = jpeg * KRB5_DEFAULT = heimdal * PYTHON_VERSION_DEFAULT = 311 * SSLBASE = /usr * SSLCERTBUNDLE (not defined) * SSLCERTS = /etc/openssl/certs * SSLDIR = /etc/openssl * SSLKEYS = /etc/openssl/private Based on these variables, the following variables have been set: * JPEGBASE (defined, but empty) * JPEG_TYPE = jpeg * KRB5BASE (defined, but empty) * KRB5_TYPE = heimdal * PYPACKAGE = python311 You may want to abort the process now with CTRL-C and change the value of variables in the first group before continuing. Be sure to run `/usr/bin/make clean' after the changes. ========================================================================== => Tool dependency py311-gyp-[0-9]*: found py311-gyp-0.1pre20210830.d6c5dd51dc3a60bf4ff32a5256713690a1a10376nb2 => Tool dependency py311-six-[0-9]*: found py311-six-1.16.0nb1 => Tool dependency ninja-build-[0-9]*: found ninja-build-1.11.1nb1 => Tool dependency glib2-tools-[0-9]*: found glib2-tools-2.78.1 => Tool dependency python311>=3.11: found python311-3.11.7 => Tool dependency mktools-[0-9]*: found mktools-20220614 => Tool dependency bash-[0-9]*: found bash-5.2.21nb1 => Tool dependency gmake>=3.81: found gmake-4.4.1 => Tool dependency pkgconf-[0-9]*: found pkgconf-2.0.3 => Tool dependency cwrappers>=20150314: found cwrappers-20220403 => Tool dependency checkperms>=1.1: found checkperms-1.12 => Build dependency x11-links>=1.35: found x11-links-1.35nb1 => Full dependency xdg-utils-[0-9]*: found xdg-utils-1.1.3nb3 => Full dependency mozc-server-[0-9]*: found mozc-server-2.26.4282.100nb25 => Full dependency mozc-tool-[0-9]*: found mozc-tool-2.26.4282.100nb25 => Full dependency fcitx5>=5.0.1: found fcitx5-5.0.5nb10 => Full dependency glib2>=2.76.4nb1: found glib2-2.78.1nb1 => Full dependency protobuf>=25.0: found protobuf-25.1 => Full dependency zinnia>=0.05: found zinnia-0.06 => Full dependency curl>=8.4.0nb1: found curl-8.5.0 => Full dependency gtk2+>=2.24.33nb16: found gtk2+-2.24.33nb16 => Full dependency qt5-qtbase>=5.15.11nb4: found qt5-qtbase-5.15.12 ===> Skipping vulnerability checks. WARNING: No /usr/pkg/pkgdb/pkg-vulnerabilities file found. WARNING: To fix run: `/usr/sbin/pkg_admin -K /usr/pkg/pkgdb fetch-pkg-vulnerabilities'. ===> Overriding tools for fcitx5-mozc-2.26.4276.100nb24 ===> Extracting for fcitx5-mozc-2.26.4276.100nb24 ===> Patching for fcitx5-mozc-2.26.4276.100nb24 => Applying pkgsrc patches for fcitx5-mozc-2.26.4276.100nb24 => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-.._scripts_install__fcitx5 => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-.._scripts_install__fcitx5 Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-.._scripts_install__fcitx5,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |--- ../scripts/install_fcitx5.orig 2021-02-17 12:18:42.000000000 +0000 |+++ ../scripts/install_fcitx5 -------------------------- Patching file ../scripts/install_fcitx5 using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 9. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-.._scripts_install__fcitx5__icons => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-.._scripts_install__fcitx5__icons Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-.._scripts_install__fcitx5__icons,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |--- ../scripts/install_fcitx5_icons.orig 2021-02-17 12:18:42.000000000 +0000 |+++ ../scripts/install_fcitx5_icons -------------------------- Patching file ../scripts/install_fcitx5_icons using Plan A... Hunk #1 succeeded at 2. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-2.26.4282.100 => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-2.26.4282.100 Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-2.26.4282.100,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* Update to 2.26.4282.100 | |diff --git android/gen_mozc_drawable.py android/gen_mozc_drawable.py |index 92e58828a..3b8fc46c1 100644 |--- android/gen_mozc_drawable.py |+++ android/gen_mozc_drawable.py -------------------------- Patching file android/gen_mozc_drawable.py using Plan A... Hunk #1 succeeded at 353. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git android/gen_touch_event_stats.py android/gen_touch_event_stats.py |index 2a28ba15d..f38f9b03a 100644 |--- android/gen_touch_event_stats.py |+++ android/gen_touch_event_stats.py -------------------------- Patching file android/gen_touch_event_stats.py using Plan A... Hunk #1 succeeded at 112. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/BUILD base/BUILD |index 83f5740e4..6dca976f7 100644 |--- base/BUILD |+++ base/BUILD -------------------------- Patching file base/BUILD using Plan A... Hunk #1 succeeded at 60. Hunk #2 succeeded at 100. Hunk #3 succeeded at 120. Hunk #4 succeeded at 133. Hunk #5 succeeded at 150. Hunk #6 succeeded at 208. Hunk #7 succeeded at 216. Hunk #8 succeeded at 559. Hunk #9 succeeded at 716. Hunk #10 succeeded at 783. Hunk #11 succeeded at 876. Hunk #12 succeeded at 908. Hunk #13 succeeded at 939. Hunk #14 succeeded at 999. Hunk #15 succeeded at 1152. Hunk #16 succeeded at 1166. Hunk #17 succeeded at 1181. Hunk #18 succeeded at 1271. Hunk #19 succeeded at 1309. Hunk #20 succeeded at 1364. Hunk #21 succeeded at 1422. Hunk #22 succeeded at 1529. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/base.gyp base/base.gyp |index 50446616f..0b87c4817 100644 |--- base/base.gyp |+++ base/base.gyp -------------------------- Patching file base/base.gyp using Plan A... Hunk #1 succeeded at 188. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/base_test.gyp base/base_test.gyp |index d252fe60a..09a4cb2fa 100644 |--- base/base_test.gyp |+++ base/base_test.gyp -------------------------- Patching file base/base_test.gyp using Plan A... Hunk #1 succeeded at 101. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/config_file_stream.h base/config_file_stream.h |index 17ddcf15d..7a09f850e 100644 |--- base/config_file_stream.h |+++ base/config_file_stream.h -------------------------- Patching file base/config_file_stream.h using Plan A... Hunk #1 succeeded at 74. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/config_file_stream_test.cc base/config_file_stream_test.cc |index 6040f604f..29875f055 100644 |--- base/config_file_stream_test.cc |+++ base/config_file_stream_test.cc -------------------------- Patching file base/config_file_stream_test.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 61. Hunk #3 succeeded at 74. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/cpu_stats_main.cc base/cpu_stats_main.cc |index d70e0f75c..b318d00d3 100644 |--- base/cpu_stats_main.cc |+++ base/cpu_stats_main.cc -------------------------- Patching file base/cpu_stats_main.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 65. Hunk #3 succeeded at 76. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/encryptor_main.cc base/encryptor_main.cc |index 04790502c..4714fcf30 100644 |--- base/encryptor_main.cc |+++ base/encryptor_main.cc -------------------------- Patching file base/encryptor_main.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 64. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/encryptor_test.cc base/encryptor_test.cc |index d992ea901..9f9553a4e 100644 |--- base/encryptor_test.cc |+++ base/encryptor_test.cc -------------------------- Patching file base/encryptor_test.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 226. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/file_util_test.cc base/file_util_test.cc |index 1a11e2c5c..7251d2821 100644 |--- base/file_util_test.cc |+++ base/file_util_test.cc -------------------------- Patching file base/file_util_test.cc using Plan A... Hunk #1 succeeded at 37. Hunk #2 succeeded at 71. Hunk #3 succeeded at 92. Hunk #4 succeeded at 114. Hunk #5 succeeded at 150. Hunk #6 succeeded at 198. Hunk #7 succeeded at 224. Hunk #8 succeeded at 292. Hunk #9 succeeded at 455. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/flags.cc base/flags.cc |deleted file mode 100644 |index b01f56893..000000000 |--- base/flags.cc |+++ /dev/null -------------------------- Patching file base/flags.cc using Plan A... Hunk #1 succeeded at 0. Removing base/flags.cc (empty after patching). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/flags.h base/flags.h |index 3bd878fa2..9e5ea80b9 100644 |--- base/flags.h |+++ base/flags.h -------------------------- Patching file base/flags.h using Plan A... Hunk #1 succeeded at 33. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/flags_test.cc base/flags_test.cc |deleted file mode 100644 |index 4453a8754..000000000 |--- base/flags_test.cc |+++ /dev/null -------------------------- Patching file base/flags_test.cc using Plan A... Hunk #1 succeeded at 0. Removing base/flags_test.cc (empty after patching). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/gen_character_set.py base/gen_character_set.py |index 87a36e280..2b6b588a2 100644 |--- base/gen_character_set.py |+++ base/gen_character_set.py -------------------------- Patching file base/gen_character_set.py using Plan A... Hunk #1 succeeded at 145. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/init_mozc.cc base/init_mozc.cc |index 010341048..eee8b6226 100644 |--- base/init_mozc.cc |+++ base/init_mozc.cc -------------------------- Patching file base/init_mozc.cc using Plan A... Hunk #1 succeeded at 29. Hunk #2 succeeded at 72. Hunk #3 succeeded at 107. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/logging.cc base/logging.cc |index 2ef09dfdc..a00a1badc 100644 |--- base/logging.cc |+++ base/logging.cc -------------------------- Patching file base/logging.cc using Plan A... Hunk #1 succeeded at 57. Hunk #2 succeeded at 176. Hunk #3 succeeded at 273. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/logging.h base/logging.h |index 180bf552e..5283af14f 100644 |--- base/logging.h |+++ base/logging.h -------------------------- Patching file base/logging.h using Plan A... Hunk #1 succeeded at 34. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/mac_util.h base/mac_util.h |index bf512ba89..1bc4a508a 100644 |--- base/mac_util.h |+++ base/mac_util.h -------------------------- Patching file base/mac_util.h using Plan A... Hunk #1 succeeded at 55. Hunk #2 succeeded at 83. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/mac_util_main.cc base/mac_util_main.cc |index ba0fb87d1..1632e1ea3 100644 |--- base/mac_util_main.cc |+++ base/mac_util_main.cc -------------------------- Patching file base/mac_util_main.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 61. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/mmap.h base/mmap.h |index 028903589..93b52642b 100644 |--- base/mmap.h |+++ base/mmap.h -------------------------- Patching file base/mmap.h using Plan A... Hunk #1 succeeded at 55. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/mmap_test.cc base/mmap_test.cc |index bdcea1a6f..160fb915b 100644 |--- base/mmap_test.cc |+++ base/mmap_test.cc -------------------------- Patching file base/mmap_test.cc using Plan A... Hunk #1 succeeded at 34. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/multifile_test.cc base/multifile_test.cc |index cb8b70d4a..c43c02eee 100644 |--- base/multifile_test.cc |+++ base/multifile_test.cc -------------------------- Patching file base/multifile_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 51. Hunk #3 succeeded at 66. Hunk #4 succeeded at 83. Hunk #5 succeeded at 113. Hunk #6 succeeded at 126. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/number_util.cc base/number_util.cc |index b1f776978..fb3fe08b7 100644 |--- base/number_util.cc |+++ base/number_util.cc -------------------------- Patching file base/number_util.cc using Plan A... Hunk #1 succeeded at 389. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/number_util_test.cc base/number_util_test.cc |index 3582ade3a..3604aa0fa 100644 |--- base/number_util_test.cc |+++ base/number_util_test.cc -------------------------- Patching file base/number_util_test.cc using Plan A... Hunk #1 succeeded at 583. Hunk #2 succeeded at 641. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/password_manager.cc base/password_manager.cc |index 9e35f23c9..0ca8194b7 100644 |--- base/password_manager.cc |+++ base/password_manager.cc -------------------------- Patching file base/password_manager.cc using Plan A... Hunk #1 succeeded at 135. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/password_manager_main.cc base/password_manager_main.cc |index 41fa60428..6af134eb6 100644 |--- base/password_manager_main.cc |+++ base/password_manager_main.cc -------------------------- Patching file base/password_manager_main.cc using Plan A... Hunk #1 succeeded at 27. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/password_manager_test.cc base/password_manager_test.cc |index b9776d00a..35ba43725 100644 |--- base/password_manager_test.cc |+++ base/password_manager_test.cc -------------------------- Patching file base/password_manager_test.cc using Plan A... Hunk #1 succeeded at 29. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/process.h base/process.h |index ca906f39e..dc3ffe744 100644 |--- base/process.h |+++ base/process.h -------------------------- Patching file base/process.h using Plan A... Hunk #1 succeeded at 65. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/process_main.cc base/process_main.cc |index 7b2405732..dfb2111b5 100644 |--- base/process_main.cc |+++ base/process_main.cc -------------------------- Patching file base/process_main.cc using Plan A... Hunk #1 succeeded at 29. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/process_mutex.h base/process_mutex.h |index 68cf1ed4f..b8e411ea1 100644 |--- base/process_mutex.h |+++ base/process_mutex.h -------------------------- Patching file base/process_mutex.h using Plan A... Hunk #1 succeeded at 50. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/process_mutex_main.cc base/process_mutex_main.cc |index 05bc2f46c..4b44b0111 100644 |--- base/process_mutex_main.cc |+++ base/process_mutex_main.cc -------------------------- Patching file base/process_mutex_main.cc using Plan A... Hunk #1 succeeded at 34. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/process_mutex_test.cc base/process_mutex_test.cc |index d3050590f..b29af1c21 100644 |--- base/process_mutex_test.cc |+++ base/process_mutex_test.cc -------------------------- Patching file base/process_mutex_test.cc using Plan A... Hunk #1 succeeded at 36. Hunk #2 succeeded at 51. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/run_level_main.cc base/run_level_main.cc |index c91f35b91..a12be8d92 100644 |--- base/run_level_main.cc |+++ base/run_level_main.cc -------------------------- Patching file base/run_level_main.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 45. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/scheduler.h base/scheduler.h |index 75160258c..ec25a26e3 100644 |--- base/scheduler.h |+++ base/scheduler.h -------------------------- Patching file base/scheduler.h using Plan A... Hunk #1 succeeded at 30. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/singleton_test.cc base/singleton_test.cc |index dea826ab2..c3b7e2031 100644 |--- base/singleton_test.cc |+++ base/singleton_test.cc -------------------------- Patching file base/singleton_test.cc using Plan A... Hunk #1 succeeded at 81. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/stopwatch_main.cc base/stopwatch_main.cc |index 4d52a8350..3a656f8c6 100644 |--- base/stopwatch_main.cc |+++ base/stopwatch_main.cc -------------------------- Patching file base/stopwatch_main.cc using Plan A... Hunk #1 succeeded at 30. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/unverified_aes256.h base/unverified_aes256.h |index e431bf6ea..ffae1e302 100644 |--- base/unverified_aes256.h |+++ base/unverified_aes256.h -------------------------- Patching file base/unverified_aes256.h using Plan A... Hunk #1 succeeded at 35. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/unverified_sha1.h base/unverified_sha1.h |index 988fd1269..5b3a76f62 100644 |--- base/unverified_sha1.h |+++ base/unverified_sha1.h -------------------------- Patching file base/unverified_sha1.h using Plan A... Hunk #1 succeeded at 36. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git base/win_sandbox.cc base/win_sandbox.cc |index 140ef6baa..fec250bb8 100644 |--- base/win_sandbox.cc |+++ base/win_sandbox.cc -------------------------- Patching file base/win_sandbox.cc using Plan A... Hunk #1 succeeded at 257. Hunk #2 succeeded at 1393. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git build_defs.bzl build_defs.bzl |index ccf4e6eae..d0d3fc57f 100644 |--- build_defs.bzl |+++ build_defs.bzl -------------------------- Patching file build_defs.bzl using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 82. Hunk #3 succeeded at 132. Hunk #4 succeeded at 189. Hunk #5 succeeded at 213. Hunk #6 succeeded at 222. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git build_tools/copy_dll_and_symbol.py build_tools/copy_dll_and_symbol.py |index 0f871190f..e0177c2b0 100644 |--- build_tools/copy_dll_and_symbol.py |+++ build_tools/copy_dll_and_symbol.py -------------------------- Patching file build_tools/copy_dll_and_symbol.py using Plan A... Hunk #1 succeeded at 82. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git build_tools/mozc_win32_resource_template.rc build_tools/mozc_win32_resource_template.rc |index 72f401f66..7776912d8 100644 |Binary files build_tools/mozc_win32_resource_template.rc and build_tools/mozc_win32_resource_template.rc differ |diff --git client/BUILD client/BUILD |index 099654818..840880f62 100644 |--- client/BUILD |+++ client/BUILD -------------------------- Patching file client/BUILD using Plan A... Hunk #1 succeeded at 127. Hunk #2 succeeded at 141. Hunk #3 succeeded at 160. Hunk #4 succeeded at 182. Hunk #5 succeeded at 202. Hunk #6 succeeded at 233. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git client/client.h client/client.h |index 3c7224489..0d4d52aed 100644 |--- client/client.h |+++ client/client.h -------------------------- Patching file client/client.h using Plan A... Hunk #1 succeeded at 51. Hunk #2 succeeded at 177. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git client/client_interface.h client/client_interface.h |index 14f1313c2..8a1ea88bc 100644 |--- client/client_interface.h |+++ client/client_interface.h -------------------------- Patching file client/client_interface.h using Plan A... Hunk #1 succeeded at 73. Hunk #2 succeeded at 121. Hunk #3 succeeded at 181. Hunk #4 succeeded at 200. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git client/client_performance_test_main.cc client/client_performance_test_main.cc |index defdb2eda..3a377628f 100644 |--- client/client_performance_test_main.cc |+++ client/client_performance_test_main.cc -------------------------- Patching file client/client_performance_test_main.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 47. Hunk #3 succeeded at 99. Hunk #4 succeeded at 377. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git client/client_quality_test_main.cc client/client_quality_test_main.cc |index d43d203f9..a88baac88 100644 |--- client/client_quality_test_main.cc |+++ client/client_quality_test_main.cc -------------------------- Patching file client/client_quality_test_main.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 42. Hunk #3 succeeded at 202. Hunk #4 succeeded at 221. Hunk #5 succeeded at 247. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git client/client_scenario_test_main.cc client/client_scenario_test_main.cc |index 584dbb985..acdb700fe 100644 |--- client/client_scenario_test_main.cc |+++ client/client_scenario_test_main.cc -------------------------- Patching file client/client_scenario_test_main.cc using Plan A... Hunk #1 succeeded at 39. Hunk #2 succeeded at 53. Hunk #3 succeeded at 96. Hunk #4 succeeded at 107. Hunk #5 succeeded at 138. Hunk #6 succeeded at 174. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git client/client_stress_test_main.cc client/client_stress_test_main.cc |index a7e74c134..6b3d892a8 100644 |--- client/client_stress_test_main.cc |+++ client/client_stress_test_main.cc -------------------------- Patching file client/client_stress_test_main.cc using Plan A... Hunk #1 succeeded at 41. Hunk #2 succeeded at 54. Hunk #3 succeeded at 78. Hunk #4 succeeded at 110. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git client/ping_server_main.cc client/ping_server_main.cc |index 879191b73..261a2daf6 100644 |--- client/ping_server_main.cc |+++ client/ping_server_main.cc -------------------------- Patching file client/ping_server_main.cc using Plan A... Hunk #1 succeeded at 29. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git client/server_launcher.cc client/server_launcher.cc |index 24e37cd8c..c201c5d0a 100644 |--- client/server_launcher.cc |+++ client/server_launcher.cc -------------------------- Patching file client/server_launcher.cc using Plan A... Hunk #1 succeeded at 132. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git client/server_launcher_main.cc client/server_launcher_main.cc |index 67e045bf7..f3381f500 100644 |--- client/server_launcher_main.cc |+++ client/server_launcher_main.cc -------------------------- Patching file client/server_launcher_main.cc using Plan A... Hunk #1 succeeded at 29. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/BUILD composer/BUILD |index c3a74b721..7d27f0780 100644 |--- composer/BUILD |+++ composer/BUILD -------------------------- Patching file composer/BUILD using Plan A... Hunk #1 succeeded at 49. Hunk #2 succeeded at 65. Hunk #3 succeeded at 145. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/composer.cc composer/composer.cc |index 5c8beb304..077874526 100644 |--- composer/composer.cc |+++ composer/composer.cc -------------------------- Patching file composer/composer.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 45. Hunk #3 succeeded at 208. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/composer_main.cc composer/composer_main.cc |index 51acd415b..d98cfbe0f 100644 |--- composer/composer_main.cc |+++ composer/composer_main.cc -------------------------- Patching file composer/composer_main.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 38. Hunk #3 succeeded at 50. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/composer_test.cc composer/composer_test.cc |index c589c542d..2d365a469 100644 |--- composer/composer_test.cc |+++ composer/composer_test.cc -------------------------- Patching file composer/composer_test.cc using Plan A... Hunk #1 succeeded at 2514. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/internal/BUILD composer/internal/BUILD |index 9ca7887c5..66f0b7130 100644 |--- composer/internal/BUILD |+++ composer/internal/BUILD -------------------------- Patching file composer/internal/BUILD using Plan A... Hunk #1 succeeded at 184. Hunk #2 succeeded at 243. Hunk #3 succeeded at 301. Hunk #4 succeeded at 309. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/internal/char_chunk_test.cc composer/internal/char_chunk_test.cc |index 9b8c9243c..12dac3eda 100644 |--- composer/internal/char_chunk_test.cc |+++ composer/internal/char_chunk_test.cc -------------------------- Patching file composer/internal/char_chunk_test.cc using Plan A... Hunk #1 succeeded at 1026. Hunk #2 succeeded at 1047. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/internal/composition_main.cc composer/internal/composition_main.cc |index 82e63fe84..0fec00464 100644 |--- composer/internal/composition_main.cc |+++ composer/internal/composition_main.cc -------------------------- Patching file composer/internal/composition_main.cc using Plan A... Hunk #1 succeeded at 30. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/internal/converter_main.cc composer/internal/converter_main.cc |index 2c92d0d31..c091f50dd 100644 |--- composer/internal/converter_main.cc |+++ composer/internal/converter_main.cc -------------------------- Patching file composer/internal/converter_main.cc using Plan A... Hunk #1 succeeded at 30. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/internal/transliterator_interface.h composer/internal/transliterator_interface.h |index d335b422e..e112761d4 100644 |--- composer/internal/transliterator_interface.h |+++ composer/internal/transliterator_interface.h -------------------------- Patching file composer/internal/transliterator_interface.h using Plan A... Hunk #1 succeeded at 52. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/internal/transliterators.cc composer/internal/transliterators.cc |index 1f7e52dbb..c57dc3cb0 100644 |--- composer/internal/transliterators.cc |+++ composer/internal/transliterators.cc -------------------------- Patching file composer/internal/transliterators.cc using Plan A... Hunk #1 succeeded at 90. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/internal/transliterators.h composer/internal/transliterators.h |index 650056a4e..e74e3d6ea 100644 |--- composer/internal/transliterators.h |+++ composer/internal/transliterators.h -------------------------- Patching file composer/internal/transliterators.h using Plan A... Hunk #1 succeeded at 55. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/internal/typing_corrector.cc composer/internal/typing_corrector.cc |index da444d9ff..e15b3c041 100644 |--- composer/internal/typing_corrector.cc |+++ composer/internal/typing_corrector.cc -------------------------- Patching file composer/internal/typing_corrector.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 43. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git composer/key_parser_test.cc composer/key_parser_test.cc |index 200a4bb67..68cfa0034 100644 |--- composer/key_parser_test.cc |+++ composer/key_parser_test.cc -------------------------- Patching file composer/key_parser_test.cc using Plan A... Hunk #1 succeeded at 125. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git config/BUILD config/BUILD |index 35e49e053..aaa40f119 100644 |--- config/BUILD |+++ config/BUILD -------------------------- Patching file config/BUILD using Plan A... Hunk #1 succeeded at 67. Hunk #2 succeeded at 76. Hunk #3 succeeded at 108. Hunk #4 succeeded at 152. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git config/character_form_manager.h config/character_form_manager.h |index 65b3528af..36ae66092 100644 |--- config/character_form_manager.h |+++ config/character_form_manager.h -------------------------- Patching file config/character_form_manager.h using Plan A... Hunk #1 succeeded at 130. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git config/character_form_manager_test.cc config/character_form_manager_test.cc |index 8e055f30d..d0ef380f2 100644 |--- config/character_form_manager_test.cc |+++ config/character_form_manager_test.cc -------------------------- Patching file config/character_form_manager_test.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 45. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git config/config_handler.cc config/config_handler.cc |index de8d56ae8..71e01b20d 100644 |--- config/config_handler.cc |+++ config/config_handler.cc -------------------------- Patching file config/config_handler.cc using Plan A... Hunk #1 succeeded at 131. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git config/config_handler_test.cc config/config_handler_test.cc |index 01584d6c2..43dd9a5a8 100644 |--- config/config_handler_test.cc |+++ config/config_handler_test.cc -------------------------- Patching file config/config_handler_test.cc using Plan A... Hunk #1 succeeded at 37. Hunk #2 succeeded at 47. Hunk #3 succeeded at 57. Hunk #4 succeeded at 97. Hunk #5 succeeded at 157. Hunk #6 succeeded at 232. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git config/stats_config_util_test.cc config/stats_config_util_test.cc |index 4efe077c7..1dd968409 100644 |--- config/stats_config_util_test.cc |+++ config/stats_config_util_test.cc -------------------------- Patching file config/stats_config_util_test.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 672. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/BUILD converter/BUILD |index 76c50e178..67c9e4ca2 100644 |--- converter/BUILD |+++ converter/BUILD -------------------------- Patching file converter/BUILD using Plan A... Hunk #1 succeeded at 596. Hunk #2 succeeded at 625. Hunk #3 succeeded at 640. Hunk #4 succeeded at 788. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/candidate_filter.cc converter/candidate_filter.cc |index a0543a08c..0033766b2 100644 |--- converter/candidate_filter.cc |+++ converter/candidate_filter.cc -------------------------- Patching file converter/candidate_filter.cc using Plan A... Hunk #1 succeeded at 65. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/candidate_filter_test.cc converter/candidate_filter_test.cc |index f99174d49..9fbb6aa40 100644 |--- converter/candidate_filter_test.cc |+++ converter/candidate_filter_test.cc -------------------------- Patching file converter/candidate_filter_test.cc using Plan A... Hunk #1 succeeded at 173. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/converter_interface.h converter/converter_interface.h |index 12074f946..2553fc2b2 100644 |--- converter/converter_interface.h |+++ converter/converter_interface.h -------------------------- Patching file converter/converter_interface.h using Plan A... Hunk #1 succeeded at 159. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/converter_main.cc converter/converter_main.cc |index 0f513914b..b9e745a01 100644 |--- converter/converter_main.cc |+++ converter/converter_main.cc -------------------------- Patching file converter/converter_main.cc using Plan A... Hunk #1 succeeded at 36. Hunk #2 succeeded at 55. Hunk #3 succeeded at 93. Hunk #4 succeeded at 238. Hunk #5 succeeded at 271. Hunk #6 succeeded at 441. Hunk #7 succeeded at 499. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/converter_test.cc converter/converter_test.cc |index e4b63f55a..2617035e0 100644 |--- converter/converter_test.cc |+++ converter/converter_test.cc -------------------------- Patching file converter/converter_test.cc using Plan A... Hunk #1 succeeded at 836. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/gen_segmenter_bitarray.cc converter/gen_segmenter_bitarray.cc |index 6de0d6c43..f055857c6 100644 |--- converter/gen_segmenter_bitarray.cc |+++ converter/gen_segmenter_bitarray.cc -------------------------- Patching file converter/gen_segmenter_bitarray.cc using Plan A... Hunk #1 succeeded at 55. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/immutable_converter.cc converter/immutable_converter.cc |index 72b17bc47..9cdd92fe3 100644 |--- converter/immutable_converter.cc |+++ converter/immutable_converter.cc -------------------------- Patching file converter/immutable_converter.cc using Plan A... Hunk #1 succeeded at 332. Hunk #2 succeeded at 469. Hunk #3 succeeded at 545. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/immutable_converter_interface.h converter/immutable_converter_interface.h |index ac34db102..b116d092e 100644 |--- converter/immutable_converter_interface.h |+++ converter/immutable_converter_interface.h -------------------------- Patching file converter/immutable_converter_interface.h using Plan A... Hunk #1 succeeded at 48. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/key_corrector.cc converter/key_corrector.cc |index dc6574b2c..0eaa94a1f 100644 |--- converter/key_corrector.cc |+++ converter/key_corrector.cc -------------------------- Patching file converter/key_corrector.cc using Plan A... Hunk #1 succeeded at 452. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/lattice.h converter/lattice.h |index 3d92b1f47..269d55237 100644 |--- converter/lattice.h |+++ converter/lattice.h -------------------------- Patching file converter/lattice.h using Plan A... Hunk #1 succeeded at 48. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/nbest_generator.cc converter/nbest_generator.cc |index 8d1f56bbd..6014eb3b4 100644 |--- converter/nbest_generator.cc |+++ converter/nbest_generator.cc -------------------------- Patching file converter/nbest_generator.cc using Plan A... Hunk #1 succeeded at 289. Hunk #2 succeeded at 313. Hunk #3 succeeded at 495. Hunk #4 succeeded at 521. Hunk #5 succeeded at 542. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/nbest_generator.h converter/nbest_generator.h |index 1eedd3006..958c892f8 100644 |--- converter/nbest_generator.h |+++ converter/nbest_generator.h -------------------------- Patching file converter/nbest_generator.h using Plan A... Hunk #1 succeeded at 57. Hunk #2 succeeded at 79. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/pos_id_printer_test.cc converter/pos_id_printer_test.cc |index 0d099d6e9..be8a2437f 100644 |--- converter/pos_id_printer_test.cc |+++ converter/pos_id_printer_test.cc -------------------------- Patching file converter/pos_id_printer_test.cc using Plan A... Hunk #1 succeeded at 34. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/quality_regression_main.cc converter/quality_regression_main.cc |index 94b6aa905..0b7cea0b4 100644 |--- converter/quality_regression_main.cc |+++ converter/quality_regression_main.cc -------------------------- Patching file converter/quality_regression_main.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 52. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git converter/segmenter.cc converter/segmenter.cc |index 9d31f8fce..362461e1d 100644 |--- converter/segmenter.cc |+++ converter/segmenter.cc -------------------------- Patching file converter/segmenter.cc using Plan A... Hunk #1 succeeded at 91. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data/images/mac/BUILD data/images/mac/BUILD |index bd6eb9bcc..9fc04923a 100644 |--- data/images/mac/BUILD |+++ data/images/mac/BUILD -------------------------- Patching file data/images/mac/BUILD using Plan A... Hunk #1 succeeded at 30. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data/installer/BUILD data/installer/BUILD |index dcd9e0736..78dc3c546 100644 |--- data/installer/BUILD |+++ data/installer/BUILD -------------------------- Patching file data/installer/BUILD using Plan A... Hunk #1 succeeded at 28. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data/installer/credits_en.html data/installer/credits_en.html |index df694e8ad..ab1796683 100644 |--- data/installer/credits_en.html |+++ data/installer/credits_en.html -------------------------- Patching file data/installer/credits_en.html using Plan A... Hunk #1 succeeded at 47. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data/test/calculator/gen_test.py data/test/calculator/gen_test.py |index 98f99d84b..fa11d6118 100644 |--- data/test/calculator/gen_test.py |+++ data/test/calculator/gen_test.py -------------------------- Patching file data/test/calculator/gen_test.py using Plan A... Hunk #1 succeeded at 47. Hunk #2 succeeded at 287. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data/version/mozc_version_template.bzl data/version/mozc_version_template.bzl |index b60a9ccbb..4c848ce8f 100644 |--- data/version/mozc_version_template.bzl |+++ data/version/mozc_version_template.bzl -------------------------- Patching file data/version/mozc_version_template.bzl using Plan A... Hunk #1 succeeded at 33. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data_manager/BUILD data_manager/BUILD |index 98732e8ff..951241038 100644 |--- data_manager/BUILD |+++ data_manager/BUILD -------------------------- Patching file data_manager/BUILD using Plan A... Hunk #1 succeeded at 172. Hunk #2 succeeded at 189. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data_manager/dataset_writer_main.cc data_manager/dataset_writer_main.cc |index dc279bdda..2ada473b1 100644 |--- data_manager/dataset_writer_main.cc |+++ data_manager/dataset_writer_main.cc -------------------------- Patching file data_manager/dataset_writer_main.cc using Plan A... Hunk #1 succeeded at 47. Hunk #2 succeeded at 87. Hunk #3 succeeded at 105. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data_manager/dataset_writer_test.cc data_manager/dataset_writer_test.cc |index 14a5664ed..c76b537c3 100644 |--- data_manager/dataset_writer_test.cc |+++ data_manager/dataset_writer_test.cc -------------------------- Patching file data_manager/dataset_writer_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 54. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data_manager/mozc_data.bzl data_manager/mozc_data.bzl |index 276158a66..3bd943718 100644 |--- data_manager/mozc_data.bzl |+++ data_manager/mozc_data.bzl -------------------------- Patching file data_manager/mozc_data.bzl using Plan A... Hunk #1 succeeded at 404. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data_manager/oss/gen_oss_segmenter_bitarray_main.cc data_manager/oss/gen_oss_segmenter_bitarray_main.cc |index 6d5675933..7eb971b65 100644 |--- data_manager/oss/gen_oss_segmenter_bitarray_main.cc |+++ data_manager/oss/gen_oss_segmenter_bitarray_main.cc -------------------------- Patching file data_manager/oss/gen_oss_segmenter_bitarray_main.cc using Plan A... Hunk #1 succeeded at 27. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git data_manager/testing/gen_mock_segmenter_bitarray_main.cc data_manager/testing/gen_mock_segmenter_bitarray_main.cc |index 4b4739a2f..15a692a88 100644 |--- data_manager/testing/gen_mock_segmenter_bitarray_main.cc |+++ data_manager/testing/gen_mock_segmenter_bitarray_main.cc -------------------------- Patching file data_manager/testing/gen_mock_segmenter_bitarray_main.cc using Plan A... Hunk #1 succeeded at 27. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/BUILD dictionary/BUILD |index 18655cb58..d14deb922 100644 |--- dictionary/BUILD |+++ dictionary/BUILD -------------------------- Patching file dictionary/BUILD using Plan A... Hunk #1 succeeded at 188. Hunk #2 succeeded at 200. Hunk #3 succeeded at 299. Hunk #4 succeeded at 337. Hunk #5 succeeded at 380. Hunk #6 succeeded at 481. Hunk #7 succeeded at 489. Hunk #8 succeeded at 507. Hunk #9 succeeded at 646. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/file/BUILD dictionary/file/BUILD |index 408609501..69b8cdc9f 100644 |--- dictionary/file/BUILD |+++ dictionary/file/BUILD -------------------------- Patching file dictionary/file/BUILD using Plan A... Hunk #1 succeeded at 84. Hunk #2 succeeded at 166. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/file/codec_test.cc dictionary/file/codec_test.cc |index 44c1721d5..258d816f9 100644 |--- dictionary/file/codec_test.cc |+++ dictionary/file/codec_test.cc -------------------------- Patching file dictionary/file/codec_test.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 40. Hunk #3 succeeded at 49. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/file/dictionary_file_test.cc dictionary/file/dictionary_file_test.cc |index 2ad145f51..4e8e76621 100644 |--- dictionary/file/dictionary_file_test.cc |+++ dictionary/file/dictionary_file_test.cc -------------------------- Patching file dictionary/file/dictionary_file_test.cc using Plan A... Hunk #1 succeeded at 33. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/gen_system_dictionary_data_main.cc dictionary/gen_system_dictionary_data_main.cc |index 81400bf04..e10fc8e28 100644 |--- dictionary/gen_system_dictionary_data_main.cc |+++ dictionary/gen_system_dictionary_data_main.cc -------------------------- Patching file dictionary/gen_system_dictionary_data_main.cc using Plan A... Hunk #1 succeeded at 39. Hunk #2 succeeded at 47. Hunk #3 succeeded at 95. Hunk #4 succeeded at 103. Hunk #5 succeeded at 118. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/suppression_dictionary.cc dictionary/suppression_dictionary.cc |index ed5e6219e..9720aaa03 100644 |--- dictionary/suppression_dictionary.cc |+++ dictionary/suppression_dictionary.cc -------------------------- Patching file dictionary/suppression_dictionary.cc using Plan A... Hunk #1 succeeded at 98. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/suppression_dictionary.h dictionary/suppression_dictionary.h |index 80669eeb6..dd71fa626 100644 |--- dictionary/suppression_dictionary.h |+++ dictionary/suppression_dictionary.h -------------------------- Patching file dictionary/suppression_dictionary.h using Plan A... Hunk #1 succeeded at 46. Hunk #2 succeeded at 67. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/suppression_dictionary_test.cc dictionary/suppression_dictionary_test.cc |index 086d3924a..5e275af51 100644 |--- dictionary/suppression_dictionary_test.cc |+++ dictionary/suppression_dictionary_test.cc -------------------------- Patching file dictionary/suppression_dictionary_test.cc using Plan A... Hunk #1 succeeded at 42. Hunk #2 succeeded at 126. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/system/BUILD dictionary/system/BUILD |index abe03f02e..e7e52dc34 100644 |--- dictionary/system/BUILD |+++ dictionary/system/BUILD -------------------------- Patching file dictionary/system/BUILD using Plan A... Hunk #1 succeeded at 164. Hunk #2 succeeded at 199. Hunk #3 succeeded at 251. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/system/system_dictionary.cc dictionary/system/system_dictionary.cc |index 2cffb3ab1..d0d19a0bd 100644 |--- dictionary/system/system_dictionary.cc |+++ dictionary/system/system_dictionary.cc -------------------------- Patching file dictionary/system/system_dictionary.cc using Plan A... Hunk #1 succeeded at 862. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/system/system_dictionary_builder.cc dictionary/system/system_dictionary_builder.cc |index f4645851e..6ddc84082 100644 |--- dictionary/system/system_dictionary_builder.cc |+++ dictionary/system/system_dictionary_builder.cc -------------------------- Patching file dictionary/system/system_dictionary_builder.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 50. Hunk #3 succeeded at 162. Hunk #4 succeeded at 365. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/system/system_dictionary_test.cc dictionary/system/system_dictionary_test.cc |index c0ceee35f..9409fc597 100644 |--- dictionary/system/system_dictionary_test.cc |+++ dictionary/system/system_dictionary_test.cc -------------------------- Patching file dictionary/system/system_dictionary_test.cc using Plan A... Hunk #1 succeeded at 38. Hunk #2 succeeded at 57. Hunk #3 succeeded at 76. Hunk #4 succeeded at 89. Hunk #5 succeeded at 98. Hunk #6 succeeded at 266. Hunk #7 succeeded at 323. Hunk #8 succeeded at 338. Hunk #9 succeeded at 709. Hunk #10 succeeded at 768. Hunk #11 succeeded at 786. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/text_dictionary_loader.cc dictionary/text_dictionary_loader.cc |index 5aea84a6a..d2b3618ab 100644 |--- dictionary/text_dictionary_loader.cc |+++ dictionary/text_dictionary_loader.cc -------------------------- Patching file dictionary/text_dictionary_loader.cc using Plan A... Hunk #1 succeeded at 40. Hunk #2 succeeded at 48. Hunk #3 succeeded at 168. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/text_dictionary_loader_test.cc dictionary/text_dictionary_loader_test.cc |index 7bf174c6c..2f061f8db 100644 |--- dictionary/text_dictionary_loader_test.cc |+++ dictionary/text_dictionary_loader_test.cc -------------------------- Patching file dictionary/text_dictionary_loader_test.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 89. Hunk #3 succeeded at 214. Hunk #4 succeeded at 242. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/user_dictionary_session.h dictionary/user_dictionary_session.h |index 82d3a251a..2137cdd80 100644 |--- dictionary/user_dictionary_session.h |+++ dictionary/user_dictionary_session.h -------------------------- Patching file dictionary/user_dictionary_session.h using Plan A... Hunk #1 succeeded at 71. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/user_dictionary_session_handler_test.cc dictionary/user_dictionary_session_handler_test.cc |index b45638cc5..c2208ec13 100644 |--- dictionary/user_dictionary_session_handler_test.cc |+++ dictionary/user_dictionary_session_handler_test.cc -------------------------- Patching file dictionary/user_dictionary_session_handler_test.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 42. Hunk #3 succeeded at 68. Hunk #4 succeeded at 89. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/user_dictionary_session_test.cc dictionary/user_dictionary_session_test.cc |index 229117cfc..3b9729aa4 100644 |--- dictionary/user_dictionary_session_test.cc |+++ dictionary/user_dictionary_session_test.cc -------------------------- Patching file dictionary/user_dictionary_session_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 61. Hunk #3 succeeded at 72. Hunk #4 succeeded at 217. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/user_dictionary_storage.h dictionary/user_dictionary_storage.h |index 6d9e7ebb2..dd5b0cd43 100644 |--- dictionary/user_dictionary_storage.h |+++ dictionary/user_dictionary_storage.h -------------------------- Patching file dictionary/user_dictionary_storage.h using Plan A... Hunk #1 succeeded at 113. Hunk #2 succeeded at 166. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/user_dictionary_storage_test.cc dictionary/user_dictionary_storage_test.cc |index 8af3b888c..d153f0fac 100644 |--- dictionary/user_dictionary_storage_test.cc |+++ dictionary/user_dictionary_storage_test.cc -------------------------- Patching file dictionary/user_dictionary_storage_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 42. Hunk #3 succeeded at 66. Hunk #4 succeeded at 76. Hunk #5 succeeded at 217. Hunk #6 succeeded at 432. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git dictionary/user_dictionary_test.cc dictionary/user_dictionary_test.cc |index 1b1ea8b70..da3af7d32 100644 |--- dictionary/user_dictionary_test.cc |+++ dictionary/user_dictionary_test.cc -------------------------- Patching file dictionary/user_dictionary_test.cc using Plan A... Hunk #1 succeeded at 38. Hunk #2 succeeded at 58. Hunk #3 succeeded at 508. Hunk #4 succeeded at 571. Hunk #5 succeeded at 624. Hunk #6 succeeded at 699. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git engine/BUILD engine/BUILD |index 8527861ab..1ca71a3ea 100644 |--- engine/BUILD |+++ engine/BUILD -------------------------- Patching file engine/BUILD using Plan A... Hunk #1 succeeded at 79. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git engine/engine_builder_interface.h engine/engine_builder_interface.h |index 4c635e1b9..8e059e3bd 100644 |--- engine/engine_builder_interface.h |+++ engine/engine_builder_interface.h -------------------------- Patching file engine/engine_builder_interface.h using Plan A... Hunk #1 succeeded at 48. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git engine/engine_builder_test.cc engine/engine_builder_test.cc |index 6a5f65194..a5ff00e1c 100644 |--- engine/engine_builder_test.cc |+++ engine/engine_builder_test.cc -------------------------- Patching file engine/engine_builder_test.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 83. Hunk #3 succeeded at 152. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/BUILD gui/BUILD |index e04879829..7dd39dfb8 100644 |--- gui/BUILD |+++ gui/BUILD -------------------------- Patching file gui/BUILD using Plan A... Hunk #1 succeeded at 28. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/config_dialog/config_dialog.h gui/config_dialog/config_dialog.h |index 14e1e6bf3..3627b9ca8 100644 |--- gui/config_dialog/config_dialog.h |+++ gui/config_dialog/config_dialog.h -------------------------- Patching file gui/config_dialog/config_dialog.h using Plan A... Hunk #1 succeeded at 60. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/config_dialog/generic_table_editor.h gui/config_dialog/generic_table_editor.h |index d59695b66..d44ec03e3 100644 |--- gui/config_dialog/generic_table_editor.h |+++ gui/config_dialog/generic_table_editor.h -------------------------- Patching file gui/config_dialog/generic_table_editor.h using Plan A... Hunk #1 succeeded at 70. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/config_dialog/keybinding_editor.h gui/config_dialog/keybinding_editor.h |index f08006ebc..b5f0d69ff 100644 |--- gui/config_dialog/keybinding_editor.h |+++ gui/config_dialog/keybinding_editor.h -------------------------- Patching file gui/config_dialog/keybinding_editor.h using Plan A... Hunk #1 succeeded at 58. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/config_dialog/keymap_editor.cc gui/config_dialog/keymap_editor.cc |index 8d329c633..48e62463e 100644 |--- gui/config_dialog/keymap_editor.cc |+++ gui/config_dialog/keymap_editor.cc -------------------------- Patching file gui/config_dialog/keymap_editor.cc using Plan A... Hunk #1 succeeded at 104. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/dictionary_tool/BUILD gui/dictionary_tool/BUILD |index f0987c52b..5030263b8 100644 |--- gui/dictionary_tool/BUILD |+++ gui/dictionary_tool/BUILD -------------------------- Patching file gui/dictionary_tool/BUILD using Plan A... Hunk #1 succeeded at 180. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/dictionary_tool/dictionary_tool.h gui/dictionary_tool/dictionary_tool.h |index cc26021ed..0024cae94 100644 |--- gui/dictionary_tool/dictionary_tool.h |+++ gui/dictionary_tool/dictionary_tool.h -------------------------- Patching file gui/dictionary_tool/dictionary_tool.h using Plan A... Hunk #1 succeeded at 126. Hunk #2 succeeded at 137. Hunk #3 succeeded at 155. Hunk #4 succeeded at 192. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/dictionary_tool/dictionary_tool_main.cc gui/dictionary_tool/dictionary_tool_main.cc |index c6701cb7f..cdf445431 100644 |--- gui/dictionary_tool/dictionary_tool_main.cc |+++ gui/dictionary_tool/dictionary_tool_main.cc -------------------------- Patching file gui/dictionary_tool/dictionary_tool_main.cc using Plan A... Hunk #1 succeeded at 27. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/error_message_dialog/BUILD gui/error_message_dialog/BUILD |index abc150ff4..9f85bcdd0 100644 |--- gui/error_message_dialog/BUILD |+++ gui/error_message_dialog/BUILD -------------------------- Patching file gui/error_message_dialog/BUILD using Plan A... Hunk #1 succeeded at 73. Hunk #2 succeeded at 83. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/error_message_dialog/error_message_dialog.cc gui/error_message_dialog/error_message_dialog.cc |index 87b344e60..9acf8fc8a 100644 |--- gui/error_message_dialog/error_message_dialog.cc |+++ gui/error_message_dialog/error_message_dialog.cc -------------------------- Patching file gui/error_message_dialog/error_message_dialog.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 82. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/tool/BUILD gui/tool/BUILD |index a3beece3f..c6a358f72 100644 |--- gui/tool/BUILD |+++ gui/tool/BUILD -------------------------- Patching file gui/tool/BUILD using Plan A... Hunk #1 succeeded at 40. Hunk #2 succeeded at 59. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/tool/mozc_tool.rc gui/tool/mozc_tool.rc |index b98f3a66a..ab446ce43 100644 |Binary files gui/tool/mozc_tool.rc and gui/tool/mozc_tool.rc differ |diff --git gui/tool/mozc_tool_libmain.cc gui/tool/mozc_tool_libmain.cc |index 38cdda7c3..584465cf0 100644 |--- gui/tool/mozc_tool_libmain.cc |+++ gui/tool/mozc_tool_libmain.cc -------------------------- Patching file gui/tool/mozc_tool_libmain.cc using Plan A... Hunk #1 succeeded at 44. Hunk #2 succeeded at 61. Hunk #3 succeeded at 88. Hunk #4 succeeded at 116. Hunk #5 succeeded at 146. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git gui/tool/prelauncher_libmain.cc gui/tool/prelauncher_libmain.cc |index d149eaf8f..39d677c4b 100644 |--- gui/tool/prelauncher_libmain.cc |+++ gui/tool/prelauncher_libmain.cc -------------------------- Patching file gui/tool/prelauncher_libmain.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 39. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ios/BUILD ios/BUILD |index 719fa5e64..7461df3fa 100644 |--- ios/BUILD |+++ ios/BUILD -------------------------- Patching file ios/BUILD using Plan A... Hunk #1 succeeded at 42. Hunk #2 succeeded at 57. Hunk #3 succeeded at 67. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ios/ios_engine.cc ios/ios_engine.cc |index ea915128f..d5314342d 100644 |--- ios/ios_engine.cc |+++ ios/ios_engine.cc -------------------------- Patching file ios/ios_engine.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 45. Hunk #3 succeeded at 169. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ios/ios_engine.h ios/ios_engine.h |index 934ffe398..dd93f1fa7 100644 |--- ios/ios_engine.h |+++ ios/ios_engine.h -------------------------- Patching file ios/ios_engine.h using Plan A... Hunk #1 succeeded at 108. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ios/ios_engine_main.cc ios/ios_engine_main.cc |index 21d6e5e71..d7724c6d5 100644 |--- ios/ios_engine_main.cc |+++ ios/ios_engine_main.cc -------------------------- Patching file ios/ios_engine_main.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 69. Hunk #3 succeeded at 97. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/BUILD ipc/BUILD |index f947ecf33..94fd5a445 100644 |--- ipc/BUILD |+++ ipc/BUILD -------------------------- Patching file ipc/BUILD using Plan A... Hunk #1 succeeded at 130. Hunk #2 succeeded at 137. Hunk #3 succeeded at 174. Hunk #4 succeeded at 221. Hunk #5 succeeded at 268. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/ipc.h ipc/ipc.h |index 296656791..fe4c67128 100644 |--- ipc/ipc.h |+++ ipc/ipc.h -------------------------- Patching file ipc/ipc.h using Plan A... Hunk #1 succeeded at 184. Hunk #2 succeeded at 194. Hunk #3 succeeded at 232. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/ipc_main.cc ipc/ipc_main.cc |index dc81d5eec..60df8b319 100644 |--- ipc/ipc_main.cc |+++ ipc/ipc_main.cc -------------------------- Patching file ipc/ipc_main.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 53. Hunk #3 succeeded at 94. Hunk #4 succeeded at 110. Hunk #5 succeeded at 119. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/ipc_path_manager_main.cc ipc/ipc_path_manager_main.cc |index 3317a812c..8fdf64985 100644 |--- ipc/ipc_path_manager_main.cc |+++ ipc/ipc_path_manager_main.cc -------------------------- Patching file ipc/ipc_path_manager_main.cc using Plan A... Hunk #1 succeeded at 29. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/ipc_path_manager_test.cc ipc/ipc_path_manager_test.cc |index 466bec00f..46f429094 100644 |--- ipc/ipc_path_manager_test.cc |+++ ipc/ipc_path_manager_test.cc -------------------------- Patching file ipc/ipc_path_manager_test.cc using Plan A... Hunk #1 succeeded at 38. Hunk #2 succeeded at 48. Hunk #3 succeeded at 87. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/ipc_test.cc ipc/ipc_test.cc |index a5ed6be6a..25f6c2b40 100644 |--- ipc/ipc_test.cc |+++ ipc/ipc_test.cc -------------------------- Patching file ipc/ipc_test.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 39. Hunk #3 succeeded at 117. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/named_event.h ipc/named_event.h |index 5985c4f0b..77959dc8a 100644 |--- ipc/named_event.h |+++ ipc/named_event.h -------------------------- Patching file ipc/named_event.h using Plan A... Hunk #1 succeeded at 47. Hunk #2 succeeded at 107. Hunk #3 succeeded at 118. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/named_event_main.cc ipc/named_event_main.cc |index bf95251a9..02d87d0de 100644 |--- ipc/named_event_main.cc |+++ ipc/named_event_main.cc -------------------------- Patching file ipc/named_event_main.cc using Plan A... Hunk #1 succeeded at 29. Hunk #2 succeeded at 76. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/named_event_test.cc ipc/named_event_test.cc |index aa7c629f6..a64ea8138 100644 |--- ipc/named_event_test.cc |+++ ipc/named_event_test.cc -------------------------- Patching file ipc/named_event_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 87. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/process_watch_dog_main.cc ipc/process_watch_dog_main.cc |index ee0ef0739..691c75114 100644 |--- ipc/process_watch_dog_main.cc |+++ ipc/process_watch_dog_main.cc -------------------------- Patching file ipc/process_watch_dog_main.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 75. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git ipc/win32_ipc.cc ipc/win32_ipc.cc |index c6f9fc889..d954a0f04 100644 |--- ipc/win32_ipc.cc |+++ ipc/win32_ipc.cc -------------------------- Patching file ipc/win32_ipc.cc using Plan A... Hunk #1 succeeded at 554. Hunk #2 succeeded at 614. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git mac/BUILD mac/BUILD |index 5151898ff..54ee9ec39 100644 |--- mac/BUILD |+++ mac/BUILD -------------------------- Patching file mac/BUILD using Plan A... Hunk #1 succeeded at 28. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git mac/GoogleJapaneseInputControllerInterface.h mac/GoogleJapaneseInputControllerInterface.h |index 62c9a5a8d..7d811ec0b 100644 |--- mac/GoogleJapaneseInputControllerInterface.h |+++ mac/GoogleJapaneseInputControllerInterface.h -------------------------- Patching file mac/GoogleJapaneseInputControllerInterface.h using Plan A... Hunk #1 succeeded at 80. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git mac/GoogleJapaneseInputServer.mm mac/GoogleJapaneseInputServer.mm |index 4a668144e..041c6fa8b 100644 |--- mac/GoogleJapaneseInputServer.mm |+++ mac/GoogleJapaneseInputServer.mm -------------------------- Patching file mac/GoogleJapaneseInputServer.mm using Plan A... Hunk #1 succeeded at 29. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git mac/Uninstaller/Uninstaller_main.mm mac/Uninstaller/Uninstaller_main.mm |index 4e4cd15b1..5d808ac9b 100644 |--- mac/Uninstaller/Uninstaller_main.mm |+++ mac/Uninstaller/Uninstaller_main.mm -------------------------- Patching file mac/Uninstaller/Uninstaller_main.mm using Plan A... Hunk #1 succeeded at 32. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git mac/main.mm mac/main.mm |index c53be5fd3..a16eeb391 100644 |--- mac/main.mm |+++ mac/main.mm -------------------------- Patching file mac/main.mm using Plan A... Hunk #1 succeeded at 38. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git prediction/BUILD prediction/BUILD |index de816004f..e4afa4f2f 100644 |--- prediction/BUILD |+++ prediction/BUILD -------------------------- Patching file prediction/BUILD using Plan A... Hunk #1 succeeded at 77. Hunk #2 succeeded at 98. Hunk #3 succeeded at 117. Hunk #4 succeeded at 136. Hunk #5 succeeded at 153. Hunk #6 succeeded at 175. Hunk #7 succeeded at 194. Hunk #8 succeeded at 229. Hunk #9 succeeded at 242. Hunk #10 succeeded at 330. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git prediction/dictionary_predictor.cc prediction/dictionary_predictor.cc |index c3158b41b..8dd70a92a 100644 |--- prediction/dictionary_predictor.cc |+++ prediction/dictionary_predictor.cc -------------------------- Patching file prediction/dictionary_predictor.cc using Plan A... Hunk #1 succeeded at 40. Hunk #2 succeeded at 60. Hunk #3 succeeded at 233. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git prediction/dictionary_predictor_test.cc prediction/dictionary_predictor_test.cc |index 5d62e295c..d550d9630 100644 |--- prediction/dictionary_predictor_test.cc |+++ prediction/dictionary_predictor_test.cc -------------------------- Patching file prediction/dictionary_predictor_test.cc using Plan A... Hunk #1 succeeded at 37. Hunk #2 succeeded at 75. Hunk #3 succeeded at 362. Hunk #4 succeeded at 2837. Hunk #5 succeeded at 2881. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git prediction/gen_suggestion_filter_main.cc prediction/gen_suggestion_filter_main.cc |index bff0d615d..264e6d57c 100644 |--- prediction/gen_suggestion_filter_main.cc |+++ prediction/gen_suggestion_filter_main.cc -------------------------- Patching file prediction/gen_suggestion_filter_main.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 70. Hunk #3 succeeded at 99. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git prediction/predictor.cc prediction/predictor.cc |index 3937dc836..b7c0e8e28 100644 |--- prediction/predictor.cc |+++ prediction/predictor.cc -------------------------- Patching file prediction/predictor.cc using Plan A... Hunk #1 succeeded at 34. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git prediction/predictor_test.cc prediction/predictor_test.cc |index 702b48d5e..de65565fd 100644 |--- prediction/predictor_test.cc |+++ prediction/predictor_test.cc -------------------------- Patching file prediction/predictor_test.cc using Plan A... Hunk #1 succeeded at 202. Hunk #2 succeeded at 310. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git prediction/user_history_predictor.cc prediction/user_history_predictor.cc |index 4d5b64847..9c6712965 100644 |--- prediction/user_history_predictor.cc |+++ prediction/user_history_predictor.cc -------------------------- Patching file prediction/user_history_predictor.cc using Plan A... Hunk #1 succeeded at 38. Hunk #2 succeeded at 58. Hunk #3 succeeded at 241. Hunk #4 succeeded at 473. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git prediction/user_history_predictor_test.cc prediction/user_history_predictor_test.cc |index 71e56c912..ef2f0bab6 100644 |--- prediction/user_history_predictor_test.cc |+++ prediction/user_history_predictor_test.cc -------------------------- Patching file prediction/user_history_predictor_test.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 56. Hunk #3 succeeded at 207. Hunk #4 succeeded at 926. Hunk #5 succeeded at 979. Hunk #6 succeeded at 2002. Hunk #7 succeeded at 2237. Hunk #8 succeeded at 2256. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git protocol/commands.proto protocol/commands.proto |index 403fdfa01..87f5ab5ad 100644 |--- protocol/commands.proto |+++ protocol/commands.proto -------------------------- Patching file protocol/commands.proto using Plan A... Hunk #1 succeeded at 310. Hunk #2 succeeded at 361. Hunk #3 succeeded at 683. Hunk #4 succeeded at 779. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git protocol/config.proto protocol/config.proto |index 56fd2f23b..8deb5a803 100644 |--- protocol/config.proto |+++ protocol/config.proto -------------------------- Patching file protocol/config.proto using Plan A... Hunk #1 succeeded at 212. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git protocol/engine_builder.proto protocol/engine_builder.proto |index 90b5f3bb3..1b73b0bb4 100644 |--- protocol/engine_builder.proto |+++ protocol/engine_builder.proto -------------------------- Patching file protocol/engine_builder.proto using Plan A... Hunk #1 succeeded at 72. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git protocol/renderer_command.proto protocol/renderer_command.proto |index 80ef98c03..27da46cd8 100644 |--- protocol/renderer_command.proto |+++ protocol/renderer_command.proto -------------------------- Patching file protocol/renderer_command.proto using Plan A... Hunk #1 succeeded at 155. Hunk #2 succeeded at 185. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git protocol/user_dictionary_storage.proto protocol/user_dictionary_storage.proto |index 4fdc7019e..ee47cd554 100644 |--- protocol/user_dictionary_storage.proto |+++ protocol/user_dictionary_storage.proto -------------------------- Patching file protocol/user_dictionary_storage.proto using Plan A... Hunk #1 succeeded at 92. Hunk #2 succeeded at 284. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/BUILD renderer/BUILD |index 0d905fcbf..bf71b05eb 100644 |--- renderer/BUILD |+++ renderer/BUILD -------------------------- Patching file renderer/BUILD using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 42. Hunk #3 succeeded at 101. Hunk #4 succeeded at 112. Hunk #5 succeeded at 128. Hunk #6 succeeded at 135. Hunk #7 succeeded at 310. Hunk #8 succeeded at 364. Hunk #9 succeeded at 384. Hunk #10 succeeded at 447. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/mac/CandidateController.mm renderer/mac/CandidateController.mm |index 587f432e1..f6c6ee741 100644 |--- renderer/mac/CandidateController.mm |+++ renderer/mac/CandidateController.mm -------------------------- Patching file renderer/mac/CandidateController.mm using Plan A... Hunk #1 succeeded at 239. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/mozc_renderer.rc renderer/mozc_renderer.rc |index bf07eb278..962b84b80 100644 |Binary files renderer/mozc_renderer.rc and renderer/mozc_renderer.rc differ |diff --git renderer/mozc_renderer_main.cc renderer/mozc_renderer_main.cc |index 61fa81d7c..4aa5c9bf2 100644 |--- renderer/mozc_renderer_main.cc |+++ renderer/mozc_renderer_main.cc -------------------------- Patching file renderer/mozc_renderer_main.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 65. Hunk #3 succeeded at 92. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/renderer_client.h renderer/renderer_client.h |index 25ca55ef2..4a063c1e0 100644 |--- renderer/renderer_client.h |+++ renderer/renderer_client.h -------------------------- Patching file renderer/renderer_client.h using Plan A... Hunk #1 succeeded at 57. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/renderer_server.cc renderer/renderer_server.cc |index fcbed2d54..b57dec26d 100644 |--- renderer/renderer_server.cc |+++ renderer/renderer_server.cc -------------------------- Patching file renderer/renderer_server.cc using Plan A... Hunk #1 succeeded at 37. Hunk #2 succeeded at 48. Hunk #3 succeeded at 174. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/renderer_server_test.cc renderer/renderer_server_test.cc |index e0540cdcb..8f209a611 100644 |--- renderer/renderer_server_test.cc |+++ renderer/renderer_server_test.cc -------------------------- Patching file renderer/renderer_server_test.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 42. Hunk #3 succeeded at 121. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/unix/candidate_window_test.cc renderer/unix/candidate_window_test.cc |index 3bedcf1f7..506ec1188 100644 |--- renderer/unix/candidate_window_test.cc |+++ renderer/unix/candidate_window_test.cc -------------------------- Patching file renderer/unix/candidate_window_test.cc using Plan A... Hunk #1 succeeded at 60. Hunk #2 succeeded at 1395. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/unix/draw_tool_interface.h renderer/unix/draw_tool_interface.h |index 266d53eee..b9d22d7df 100644 |--- renderer/unix/draw_tool_interface.h |+++ renderer/unix/draw_tool_interface.h -------------------------- Patching file renderer/unix/draw_tool_interface.h using Plan A... Hunk #1 succeeded at 58. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/unix/gtk_window_base_test.cc renderer/unix/gtk_window_base_test.cc |index 35f066367..67b9897ca 100644 |--- renderer/unix/gtk_window_base_test.cc |+++ renderer/unix/gtk_window_base_test.cc -------------------------- Patching file renderer/unix/gtk_window_base_test.cc using Plan A... Hunk #1 succeeded at 44. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/unix/infolist_window.h renderer/unix/infolist_window.h |index fe182534a..e717ac1f9 100644 |--- renderer/unix/infolist_window.h |+++ renderer/unix/infolist_window.h -------------------------- Patching file renderer/unix/infolist_window.h using Plan A... Hunk #1 succeeded at 78. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/unix/infolist_window_test.cc renderer/unix/infolist_window_test.cc |index 540ce2943..98be2cb23 100644 |--- renderer/unix/infolist_window_test.cc |+++ renderer/unix/infolist_window_test.cc -------------------------- Patching file renderer/unix/infolist_window_test.cc using Plan A... Hunk #1 succeeded at 49. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/unix/unix_renderer_test.cc renderer/unix/unix_renderer_test.cc |index fc9f954ae..0c1c98fed 100644 |--- renderer/unix/unix_renderer_test.cc |+++ renderer/unix/unix_renderer_test.cc -------------------------- Patching file renderer/unix/unix_renderer_test.cc using Plan A... Hunk #1 succeeded at 69. Hunk #2 succeeded at 83. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/unix/unix_server.h renderer/unix/unix_server.h |index e152f38da..7a100320f 100644 |--- renderer/unix/unix_server.h |+++ renderer/unix/unix_server.h -------------------------- Patching file renderer/unix/unix_server.h using Plan A... Hunk #1 succeeded at 67. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/unix/unix_server_test.cc renderer/unix/unix_server_test.cc |index 1324a97e2..d11cc3963 100644 |--- renderer/unix/unix_server_test.cc |+++ renderer/unix/unix_server_test.cc -------------------------- Patching file renderer/unix/unix_server_test.cc using Plan A... Hunk #1 succeeded at 29. Hunk #2 succeeded at 46. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/win32/gen_pbgra32_bitmap.cc renderer/win32/gen_pbgra32_bitmap.cc |index fa3376794..58fbf4f6c 100644 |--- renderer/win32/gen_pbgra32_bitmap.cc |+++ renderer/win32/gen_pbgra32_bitmap.cc -------------------------- Patching file renderer/win32/gen_pbgra32_bitmap.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 61. Hunk #3 succeeded at 119. Hunk #4 succeeded at 145. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git renderer/win32/win32_renderer_client.cc renderer/win32/win32_renderer_client.cc |index 400865117..bcfe7f9fb 100644 |--- renderer/win32/win32_renderer_client.cc |+++ renderer/win32/win32_renderer_client.cc -------------------------- Patching file renderer/win32/win32_renderer_client.cc using Plan A... Hunk #1 succeeded at 55. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/BUILD rewriter/BUILD |index 84ca5e340..ae183e7d5 100644 |--- rewriter/BUILD |+++ rewriter/BUILD -------------------------- Patching file rewriter/BUILD using Plan A... Hunk #1 succeeded at 60. Hunk #2 succeeded at 68. Hunk #3 succeeded at 83. Hunk #4 succeeded at 93. Hunk #5 succeeded at 107. Hunk #6 succeeded at 114. Hunk #7 succeeded at 162. Hunk #8 succeeded at 176. Hunk #9 succeeded at 190. Hunk #10 succeeded at 201. Hunk #11 succeeded at 215. Hunk #12 succeeded at 222. Hunk #13 succeeded at 467. Hunk #14 succeeded at 474. Hunk #15 succeeded at 514. Hunk #16 succeeded at 526. Hunk #17 succeeded at 647. Hunk #18 succeeded at 683. Hunk #19 succeeded at 717. Hunk #20 succeeded at 755. Hunk #21 succeeded at 769. Hunk #22 succeeded at 802. Hunk #23 succeeded at 814. Hunk #24 succeeded at 844. Hunk #25 succeeded at 894. Hunk #26 succeeded at 909. Hunk #27 succeeded at 1042. Hunk #28 succeeded at 1056. Hunk #29 succeeded at 1066. Hunk #30 succeeded at 1122. Hunk #31 succeeded at 1129. Hunk #32 succeeded at 1243. Hunk #33 succeeded at 1250. Hunk #34 succeeded at 1278. Hunk #35 succeeded at 1322. Hunk #36 succeeded at 1367. Hunk #37 succeeded at 1380. Hunk #38 succeeded at 1484. Hunk #39 succeeded at 1491. Hunk #40 succeeded at 1532. Hunk #41 succeeded at 1540. Hunk #42 succeeded at 1588. Hunk #43 succeeded at 1600. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/calculator/calculator_test.cc rewriter/calculator/calculator_test.cc |index 299107812..16c50311b 100644 |--- rewriter/calculator/calculator_test.cc |+++ rewriter/calculator/calculator_test.cc -------------------------- Patching file rewriter/calculator/calculator_test.cc using Plan A... Hunk #1 succeeded at 85. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/calculator_rewriter_test.cc rewriter/calculator_rewriter_test.cc |index f34401cf7..01daa68ca 100644 |--- rewriter/calculator_rewriter_test.cc |+++ rewriter/calculator_rewriter_test.cc -------------------------- Patching file rewriter/calculator_rewriter_test.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 47. Hunk #3 succeeded at 116. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/collocation_rewriter.cc rewriter/collocation_rewriter.cc |index 913fac238..ecc3943c9 100644 |--- rewriter/collocation_rewriter.cc |+++ rewriter/collocation_rewriter.cc -------------------------- Patching file rewriter/collocation_rewriter.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 43. Hunk #3 succeeded at 261. Hunk #4 succeeded at 286. Hunk #5 succeeded at 313. Hunk #6 succeeded at 334. Hunk #7 succeeded at 349. Hunk #8 succeeded at 366. Hunk #9 succeeded at 448. Hunk #10 succeeded at 458. Hunk #11 succeeded at 566. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/collocation_rewriter_test.cc rewriter/collocation_rewriter_test.cc |index 62c08f8b4..14295dc04 100644 |--- rewriter/collocation_rewriter_test.cc |+++ rewriter/collocation_rewriter_test.cc -------------------------- Patching file rewriter/collocation_rewriter_test.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 41. Hunk #3 succeeded at 80. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/command_rewriter_test.cc rewriter/command_rewriter_test.cc |index e5b2d7e2c..21c3e26f1 100644 |--- rewriter/command_rewriter_test.cc |+++ rewriter/command_rewriter_test.cc -------------------------- Patching file rewriter/command_rewriter_test.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 39. Hunk #3 succeeded at 73. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/date_rewriter_test.cc rewriter/date_rewriter_test.cc |index d1f4a9eda..d40256b19 100644 |--- rewriter/date_rewriter_test.cc |+++ rewriter/date_rewriter_test.cc -------------------------- Patching file rewriter/date_rewriter_test.cc using Plan A... Hunk #1 succeeded at 269. Hunk #2 succeeded at 282. Hunk #3 succeeded at 303. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/dice_rewriter_test.cc rewriter/dice_rewriter_test.cc |index c1d15baab..69d2c5638 100644 |--- rewriter/dice_rewriter_test.cc |+++ rewriter/dice_rewriter_test.cc -------------------------- Patching file rewriter/dice_rewriter_test.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 111. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/emoticon_rewriter.cc rewriter/emoticon_rewriter.cc |index 32524c842..442447afb 100644 |--- rewriter/emoticon_rewriter.cc |+++ rewriter/emoticon_rewriter.cc -------------------------- Patching file rewriter/emoticon_rewriter.cc using Plan A... Hunk #1 succeeded at 75. Hunk #2 succeeded at 90. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/english_variants_rewriter.cc rewriter/english_variants_rewriter.cc |index f701397a2..b5a15cbd9 100644 |--- rewriter/english_variants_rewriter.cc |+++ rewriter/english_variants_rewriter.cc -------------------------- Patching file rewriter/english_variants_rewriter.cc using Plan A... Hunk #1 succeeded at 120. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/english_variants_rewriter_test.cc rewriter/english_variants_rewriter_test.cc |index f8cb95778..7f803c6dc 100644 |--- rewriter/english_variants_rewriter_test.cc |+++ rewriter/english_variants_rewriter_test.cc -------------------------- Patching file rewriter/english_variants_rewriter_test.cc using Plan A... Hunk #1 succeeded at 32. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/focus_candidate_rewriter.cc rewriter/focus_candidate_rewriter.cc |index 019df99f0..00266bc0b 100644 |--- rewriter/focus_candidate_rewriter.cc |+++ rewriter/focus_candidate_rewriter.cc -------------------------- Patching file rewriter/focus_candidate_rewriter.cc using Plan A... Hunk #1 succeeded at 51. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/focus_candidate_rewriter.h rewriter/focus_candidate_rewriter.h |index b2c1b874b..e592f269c 100644 |--- rewriter/focus_candidate_rewriter.h |+++ rewriter/focus_candidate_rewriter.h -------------------------- Patching file rewriter/focus_candidate_rewriter.h using Plan A... Hunk #1 succeeded at 73. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/focus_candidate_rewriter_test.cc rewriter/focus_candidate_rewriter_test.cc |index df9d47b63..a92d5fcce 100644 |--- rewriter/focus_candidate_rewriter_test.cc |+++ rewriter/focus_candidate_rewriter_test.cc -------------------------- Patching file rewriter/focus_candidate_rewriter_test.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 41. Hunk #3 succeeded at 67. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/fortune_rewriter_test.cc rewriter/fortune_rewriter_test.cc |index 48186d906..00231e504 100644 |--- rewriter/fortune_rewriter_test.cc |+++ rewriter/fortune_rewriter_test.cc -------------------------- Patching file rewriter/fortune_rewriter_test.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 74. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/gen_collocation_data_main.cc rewriter/gen_collocation_data_main.cc |index bcb99debb..b4fe04a03 100644 |--- rewriter/gen_collocation_data_main.cc |+++ rewriter/gen_collocation_data_main.cc -------------------------- Patching file rewriter/gen_collocation_data_main.cc using Plan A... Hunk #1 succeeded at 41. Hunk #2 succeeded at 66. Hunk #3 succeeded at 93. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/gen_collocation_suppression_data_main.cc rewriter/gen_collocation_suppression_data_main.cc |index 0d14199d3..3a44da990 100644 |--- rewriter/gen_collocation_suppression_data_main.cc |+++ rewriter/gen_collocation_suppression_data_main.cc -------------------------- Patching file rewriter/gen_collocation_suppression_data_main.cc using Plan A... Hunk #1 succeeded at 44. Hunk #2 succeeded at 62. Hunk #3 succeeded at 81. Hunk #4 succeeded at 108. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/gen_emoticon_rewriter_data.cc rewriter/gen_emoticon_rewriter_data.cc |index ce866d574..a79f5e12f 100644 |--- rewriter/gen_emoticon_rewriter_data.cc |+++ rewriter/gen_emoticon_rewriter_data.cc -------------------------- Patching file rewriter/gen_emoticon_rewriter_data.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 129. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/gen_single_kanji_noun_prefix_data.cc rewriter/gen_single_kanji_noun_prefix_data.cc |index 0ef651e0f..61df3ab9b 100644 |--- rewriter/gen_single_kanji_noun_prefix_data.cc |+++ rewriter/gen_single_kanji_noun_prefix_data.cc -------------------------- Patching file rewriter/gen_single_kanji_noun_prefix_data.cc using Plan A... Hunk #1 succeeded at 30. Hunk #2 succeeded at 99. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/gen_symbol_rewriter_dictionary_main.cc rewriter/gen_symbol_rewriter_dictionary_main.cc |index bdafb0ecc..790d27387 100644 |--- rewriter/gen_symbol_rewriter_dictionary_main.cc |+++ rewriter/gen_symbol_rewriter_dictionary_main.cc -------------------------- Patching file rewriter/gen_symbol_rewriter_dictionary_main.cc using Plan A... Hunk #1 succeeded at 45. Hunk #2 succeeded at 204. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/gen_usage_rewriter_dictionary_main.cc rewriter/gen_usage_rewriter_dictionary_main.cc |index aaf4c069e..d92504f00 100644 |--- rewriter/gen_usage_rewriter_dictionary_main.cc |+++ rewriter/gen_usage_rewriter_dictionary_main.cc -------------------------- Patching file rewriter/gen_usage_rewriter_dictionary_main.cc using Plan A... Hunk #1 succeeded at 100. Hunk #2 succeeded at 258. Hunk #3 succeeded at 300. Hunk #4 succeeded at 316. Hunk #5 succeeded at 350. Hunk #6 succeeded at 359. Hunk #7 succeeded at 384. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/katakana_promotion_rewriter.h rewriter/katakana_promotion_rewriter.h |index 5c7d4384b..197f2f5fc 100644 |--- rewriter/katakana_promotion_rewriter.h |+++ rewriter/katakana_promotion_rewriter.h -------------------------- Patching file rewriter/katakana_promotion_rewriter.h using Plan A... Hunk #1 succeeded at 30. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/merger_rewriter_test.cc rewriter/merger_rewriter_test.cc |index 828d71709..b47947f2a 100644 |--- rewriter/merger_rewriter_test.cc |+++ rewriter/merger_rewriter_test.cc -------------------------- Patching file rewriter/merger_rewriter_test.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 38. Hunk #3 succeeded at 103. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/normalization_rewriter.cc rewriter/normalization_rewriter.cc |index c95190063..f822bcffa 100644 |--- rewriter/normalization_rewriter.cc |+++ rewriter/normalization_rewriter.cc -------------------------- Patching file rewriter/normalization_rewriter.cc using Plan A... Hunk #1 succeeded at 57. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/normalization_rewriter_test.cc rewriter/normalization_rewriter_test.cc |index 4d1ee86de..e69397b86 100644 |--- rewriter/normalization_rewriter_test.cc |+++ rewriter/normalization_rewriter_test.cc -------------------------- Patching file rewriter/normalization_rewriter_test.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 58. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/number_rewriter.cc rewriter/number_rewriter.cc |index fd2e55856..24ab9acb5 100644 |--- rewriter/number_rewriter.cc |+++ rewriter/number_rewriter.cc -------------------------- Patching file rewriter/number_rewriter.cc using Plan A... Hunk #1 succeeded at 449. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/number_rewriter_test.cc rewriter/number_rewriter_test.cc |index 7e95f7964..6801c2cff 100644 |--- rewriter/number_rewriter_test.cc |+++ rewriter/number_rewriter_test.cc -------------------------- Patching file rewriter/number_rewriter_test.cc using Plan A... Hunk #1 succeeded at 96. Hunk #2 succeeded at 835. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/rewriter.cc rewriter/rewriter.cc |index 0b1c0b7e9..ed5f4dc9d 100644 |--- rewriter/rewriter.cc |+++ rewriter/rewriter.cc -------------------------- Patching file rewriter/rewriter.cc using Plan A... Hunk #1 succeeded at 29. Hunk #2 succeeded at 62. Hunk #3 succeeded at 104. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/rewriter_test.cc rewriter/rewriter_test.cc |index 2ec18ba6e..23609cf05 100644 |--- rewriter/rewriter_test.cc |+++ rewriter/rewriter_test.cc -------------------------- Patching file rewriter/rewriter_test.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 43. Hunk #3 succeeded at 68. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/single_kanji_rewriter_test.cc rewriter/single_kanji_rewriter_test.cc |index 53d3a20ef..c47670f78 100644 |--- rewriter/single_kanji_rewriter_test.cc |+++ rewriter/single_kanji_rewriter_test.cc -------------------------- Patching file rewriter/single_kanji_rewriter_test.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 43. Hunk #3 succeeded at 60. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/symbol_rewriter.cc rewriter/symbol_rewriter.cc |index ab2a417d8..74cfc02ba 100644 |--- rewriter/symbol_rewriter.cc |+++ rewriter/symbol_rewriter.cc -------------------------- Patching file rewriter/symbol_rewriter.cc using Plan A... Hunk #1 succeeded at 170. Hunk #2 succeeded at 181. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/symbol_rewriter_test.cc rewriter/symbol_rewriter_test.cc |index 29f5d9fca..6460c1e8b 100644 |--- rewriter/symbol_rewriter_test.cc |+++ rewriter/symbol_rewriter_test.cc -------------------------- Patching file rewriter/symbol_rewriter_test.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 45. Hunk #3 succeeded at 102. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/unicode_rewriter_test.cc rewriter/unicode_rewriter_test.cc |index e4af2c32f..aaffba108 100644 |--- rewriter/unicode_rewriter_test.cc |+++ rewriter/unicode_rewriter_test.cc -------------------------- Patching file rewriter/unicode_rewriter_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 47. Hunk #3 succeeded at 87. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/usage_rewriter.cc rewriter/usage_rewriter.cc |index 53aec1d9e..f07a18922 100644 |--- rewriter/usage_rewriter.cc |+++ rewriter/usage_rewriter.cc -------------------------- Patching file rewriter/usage_rewriter.cc using Plan A... Hunk #1 succeeded at 139. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/usage_rewriter_test.cc rewriter/usage_rewriter_test.cc |index 197e3f944..f45ddf27a 100644 |--- rewriter/usage_rewriter_test.cc |+++ rewriter/usage_rewriter_test.cc -------------------------- Patching file rewriter/usage_rewriter_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 48. Hunk #3 succeeded at 79. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/user_boundary_history_rewriter_test.cc rewriter/user_boundary_history_rewriter_test.cc |index 5e90260d8..b226c0f8a 100644 |--- rewriter/user_boundary_history_rewriter_test.cc |+++ rewriter/user_boundary_history_rewriter_test.cc -------------------------- Patching file rewriter/user_boundary_history_rewriter_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 42. Hunk #3 succeeded at 83. Hunk #4 succeeded at 114. Hunk #5 succeeded at 227. Hunk #6 succeeded at 250. Hunk #7 succeeded at 273. Hunk #8 succeeded at 296. Hunk #9 succeeded at 322. Hunk #10 succeeded at 346. Hunk #11 succeeded at 370. Hunk #12 succeeded at 393. Hunk #13 succeeded at 417. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/user_dictionary_rewriter_test.cc rewriter/user_dictionary_rewriter_test.cc |index f54ddc22b..7cccdb11d 100644 |--- rewriter/user_dictionary_rewriter_test.cc |+++ rewriter/user_dictionary_rewriter_test.cc -------------------------- Patching file rewriter/user_dictionary_rewriter_test.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 40. Hunk #3 succeeded at 85. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/user_segment_history_rewriter.cc rewriter/user_segment_history_rewriter.cc |index 5d1f0bd24..d4e3448b2 100644 |--- rewriter/user_segment_history_rewriter.cc |+++ rewriter/user_segment_history_rewriter.cc -------------------------- Patching file rewriter/user_segment_history_rewriter.cc using Plan A... Hunk #1 succeeded at 142. Hunk #2 succeeded at 690. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/user_segment_history_rewriter_test.cc rewriter/user_segment_history_rewriter_test.cc |index c3271a7d8..d34069bbe 100644 |--- rewriter/user_segment_history_rewriter_test.cc |+++ rewriter/user_segment_history_rewriter_test.cc -------------------------- Patching file rewriter/user_segment_history_rewriter_test.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 51. Hunk #3 succeeded at 113. Hunk #4 succeeded at 181. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/variants_rewriter.cc rewriter/variants_rewriter.cc |index 51cf50a09..9082b9461 100644 |--- rewriter/variants_rewriter.cc |+++ rewriter/variants_rewriter.cc -------------------------- Patching file rewriter/variants_rewriter.cc using Plan A... Hunk #1 succeeded at 313. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/variants_rewriter_test.cc rewriter/variants_rewriter_test.cc |index 7b92e09ec..78bef9ed5 100644 |--- rewriter/variants_rewriter_test.cc |+++ rewriter/variants_rewriter_test.cc -------------------------- Patching file rewriter/variants_rewriter_test.cc using Plan A... Hunk #1 succeeded at 426. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git rewriter/version_rewriter_test.cc rewriter/version_rewriter_test.cc |index 53ea65640..c7b91c5d1 100644 |--- rewriter/version_rewriter_test.cc |+++ rewriter/version_rewriter_test.cc -------------------------- Patching file rewriter/version_rewriter_test.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 40. Hunk #3 succeeded at 52. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git server/BUILD server/BUILD |index c65968856..af14825f9 100644 |--- server/BUILD |+++ server/BUILD -------------------------- Patching file server/BUILD using Plan A... Hunk #1 succeeded at 64. Hunk #2 succeeded at 84. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git server/cache_service_manager.cc server/cache_service_manager.cc |index 5fcd064f3..48cbf045a 100644 |--- server/cache_service_manager.cc |+++ server/cache_service_manager.cc -------------------------- Patching file server/cache_service_manager.cc using Plan A... Hunk #1 succeeded at 148. Hunk #2 succeeded at 314. Hunk #3 succeeded at 326. Hunk #4 succeeded at 407. Hunk #5 succeeded at 539. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git server/mozc_cache_service.rc server/mozc_cache_service.rc |index aa89ce828..9bb7c8d95 100644 |Binary files server/mozc_cache_service.rc and server/mozc_cache_service.rc differ |diff --git server/mozc_rpc_server_main.cc server/mozc_rpc_server_main.cc |index 296e0373f..6160b6cd2 100644 |--- server/mozc_rpc_server_main.cc |+++ server/mozc_rpc_server_main.cc -------------------------- Patching file server/mozc_rpc_server_main.cc using Plan A... Hunk #1 succeeded at 27. Hunk #2 succeeded at 46. Hunk #3 succeeded at 54. Hunk #4 succeeded at 143. Hunk #5 succeeded at 181. Hunk #6 succeeded at 193. Hunk #7 succeeded at 219. Hunk #8 succeeded at 283. Hunk #9 succeeded at 303. Hunk #10 succeeded at 354. Hunk #11 succeeded at 376. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git server/mozc_server.cc server/mozc_server.cc |index 228344f9d..bd3ecd39c 100644 |--- server/mozc_server.cc |+++ server/mozc_server.cc -------------------------- Patching file server/mozc_server.cc using Plan A... Hunk #1 succeeded at 29. Hunk #2 succeeded at 38. Hunk #3 succeeded at 47. Hunk #4 succeeded at 91. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git server/mozc_server.rc server/mozc_server.rc |index fd97c8767..d78370110 100644 |Binary files server/mozc_server.rc and server/mozc_server.rc differ |diff --git session/BUILD session/BUILD |index cc47ec3cf..07c7cf81e 100644 |--- session/BUILD |+++ session/BUILD -------------------------- Patching file session/BUILD using Plan A... Hunk #1 succeeded at 73. Hunk #2 succeeded at 89. Hunk #3 succeeded at 103. Hunk #4 succeeded at 122. Hunk #5 succeeded at 136. Hunk #6 succeeded at 147. Hunk #7 succeeded at 251. Hunk #8 succeeded at 268. Hunk #9 succeeded at 341. Hunk #10 succeeded at 371. Hunk #11 succeeded at 388. Hunk #12 succeeded at 405. Hunk #13 succeeded at 420. Hunk #14 succeeded at 456. Hunk #15 succeeded at 503. Hunk #16 succeeded at 513. Hunk #17 succeeded at 524. Hunk #18 succeeded at 599. Hunk #19 succeeded at 611. Hunk #20 succeeded at 782. Hunk #21 succeeded at 790. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/ime_switch_util.h session/ime_switch_util.h |index c7246e84e..12e27ab66 100644 |--- session/ime_switch_util.h |+++ session/ime_switch_util.h -------------------------- Patching file session/ime_switch_util.h using Plan A... Hunk #1 succeeded at 51. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/internal/BUILD session/internal/BUILD |index f33e8bb6e..4dfb9019d 100644 |--- session/internal/BUILD |+++ session/internal/BUILD -------------------------- Patching file session/internal/BUILD using Plan A... Hunk #1 succeeded at 187. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/internal/key_event_transformer.cc session/internal/key_event_transformer.cc |index 79ab34c5e..9ed550dd5 100644 |--- session/internal/key_event_transformer.cc |+++ session/internal/key_event_transformer.cc -------------------------- Patching file session/internal/key_event_transformer.cc using Plan A... Hunk #1 succeeded at 157. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/internal/keymap_interface.h session/internal/keymap_interface.h |index 91840a4d6..e2a585c18 100644 |--- session/internal/keymap_interface.h |+++ session/internal/keymap_interface.h -------------------------- Patching file session/internal/keymap_interface.h using Plan A... Hunk #1 succeeded at 102. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/internal/keymap_test.cc session/internal/keymap_test.cc |index 76ed26f1b..90f07e17c 100644 |--- session/internal/keymap_test.cc |+++ session/internal/keymap_test.cc -------------------------- Patching file session/internal/keymap_test.cc using Plan A... Hunk #1 succeeded at 36. Hunk #2 succeeded at 45. Hunk #3 succeeded at 53. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session.cc session/session.cc |index 878f1ec9d..d7d9cc61b 100644 |--- session/session.cc |+++ session/session.cc -------------------------- Patching file session/session.cc using Plan A... Hunk #1 succeeded at 1443. Hunk #2 succeeded at 2289. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session.h session/session.h |index 6d3e09dd8..08748d2c2 100644 |--- session/session.h |+++ session/session.h -------------------------- Patching file session/session.h using Plan A... Hunk #1 succeeded at 266. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_client_main.cc session/session_client_main.cc |index 6b787cbe0..548d336d2 100644 |--- session/session_client_main.cc |+++ session/session_client_main.cc -------------------------- Patching file session/session_client_main.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 43. Hunk #3 succeeded at 94. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_converter.cc session/session_converter.cc |index a0a4e8b0c..77ae3a28e 100644 |--- session/session_converter.cc |+++ session/session_converter.cc -------------------------- Patching file session/session_converter.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 52. Hunk #3 succeeded at 62. Hunk #4 succeeded at 428. Hunk #5 succeeded at 504. Hunk #6 succeeded at 576. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_converter.h session/session_converter.h |index b1ac98895..fe5614e55 100644 |--- session/session_converter.h |+++ session/session_converter.h -------------------------- Patching file session/session_converter.h using Plan A... Hunk #1 succeeded at 395. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_converter_interface.h session/session_converter_interface.h |index 32068a1ce..ba5b7f671 100644 |--- session/session_converter_interface.h |+++ session/session_converter_interface.h -------------------------- Patching file session/session_converter_interface.h using Plan A... Hunk #1 succeeded at 192. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_converter_stress_test.cc session/session_converter_stress_test.cc |index cf112d022..36a4a2f7c 100644 |--- session/session_converter_stress_test.cc |+++ session/session_converter_stress_test.cc -------------------------- Patching file session/session_converter_stress_test.cc using Plan A... Hunk #1 succeeded at 31. Hunk #2 succeeded at 44. Hunk #3 succeeded at 64. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_converter_test.cc session/session_converter_test.cc |index 8133d3dd1..d5c22add4 100644 |--- session/session_converter_test.cc |+++ session/session_converter_test.cc -------------------------- Patching file session/session_converter_test.cc using Plan A... Hunk #1 succeeded at 40. Hunk #2 succeeded at 61. Hunk #3 succeeded at 86. Hunk #4 succeeded at 352. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_handler.cc session/session_handler.cc |index 176e75283..9132ed5eb 100644 |--- session/session_handler.cc |+++ session/session_handler.cc -------------------------- Patching file session/session_handler.cc using Plan A... Hunk #1 succeeded at 38. Hunk #2 succeeded at 66. Hunk #3 succeeded at 147. Hunk #4 succeeded at 493. Hunk #5 succeeded at 610. Hunk #6 succeeded at 649. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_handler.h session/session_handler.h |index 5f6d38912..8351e4e4c 100644 |--- session/session_handler.h |+++ session/session_handler.h -------------------------- Patching file session/session_handler.h using Plan A... Hunk #1 succeeded at 83. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_handler_main.cc session/session_handler_main.cc |index acd9e34cf..a2cc71536 100644 |--- session/session_handler_main.cc |+++ session/session_handler_main.cc -------------------------- Patching file session/session_handler_main.cc using Plan A... Hunk #1 succeeded at 56. Hunk #2 succeeded at 65. Hunk #3 succeeded at 176. Hunk #4 succeeded at 188. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_handler_stress_test.cc session/session_handler_stress_test.cc |index f54e42016..22cf72891 100644 |--- session/session_handler_stress_test.cc |+++ session/session_handler_stress_test.cc -------------------------- Patching file session/session_handler_stress_test.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 41. Hunk #3 succeeded at 52. Hunk #4 succeeded at 71. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_handler_test.cc session/session_handler_test.cc |index 281ef0e90..92abaa457 100644 |--- session/session_handler_test.cc |+++ session/session_handler_test.cc -------------------------- Patching file session/session_handler_test.cc using Plan A... Hunk #1 succeeded at 36. Hunk #2 succeeded at 52. Hunk #3 succeeded at 198. Hunk #4 succeeded at 228. Hunk #5 succeeded at 266. Hunk #6 succeeded at 287. Hunk #7 succeeded at 307. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_handler_test_util.cc session/session_handler_test_util.cc |index ce3a30596..dd94c41d0 100644 |--- session/session_handler_test_util.cc |+++ session/session_handler_test_util.cc -------------------------- Patching file session/session_handler_test_util.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 46. Hunk #3 succeeded at 111. Hunk #4 succeeded at 132. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_regression_test.cc session/session_regression_test.cc |index 2d64e9010..2b806fab3 100644 |--- session/session_regression_test.cc |+++ session/session_regression_test.cc -------------------------- Patching file session/session_regression_test.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 57. Hunk #3 succeeded at 92. Hunk #4 succeeded at 118. Hunk #5 succeeded at 216. Hunk #6 succeeded at 248. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_server_main.cc session/session_server_main.cc |index e9eae5b1c..4956d517d 100644 |--- session/session_server_main.cc |+++ session/session_server_main.cc -------------------------- Patching file session/session_server_main.cc using Plan A... Hunk #1 succeeded at 30. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_server_test.cc session/session_server_test.cc |index 3b1439113..7a64d543f 100644 |--- session/session_server_test.cc |+++ session/session_server_test.cc -------------------------- Patching file session/session_server_test.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 68. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_test.cc session/session_test.cc |index c7c1296bc..2c44228b5 100644 |--- session/session_test.cc |+++ session/session_test.cc -------------------------- Patching file session/session_test.cc using Plan A... Hunk #1 succeeded at 3212. Hunk #2 succeeded at 3687. Hunk #3 succeeded at 8638. Hunk #4 succeeded at 8664. Hunk #5 succeeded at 8890. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_usage_observer.cc session/session_usage_observer.cc |index e78135318..42ac1f3c3 100644 |--- session/session_usage_observer.cc |+++ session/session_usage_observer.cc -------------------------- Patching file session/session_usage_observer.cc using Plan A... Hunk #1 succeeded at 101. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_usage_observer.h session/session_usage_observer.h |index 0667e77d1..ba754fa1e 100644 |--- session/session_usage_observer.h |+++ session/session_usage_observer.h -------------------------- Patching file session/session_usage_observer.h using Plan A... Hunk #1 succeeded at 103. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git session/session_usage_observer_test.cc session/session_usage_observer_test.cc |index 337a910f7..1b858e880 100644 |--- session/session_usage_observer_test.cc |+++ session/session_usage_observer_test.cc -------------------------- Patching file session/session_usage_observer_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 47. Hunk #3 succeeded at 59. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/BUILD storage/BUILD |index 5d55b0a8e..93fa640f1 100644 |--- storage/BUILD |+++ storage/BUILD -------------------------- Patching file storage/BUILD using Plan A... Hunk #1 succeeded at 109. Hunk #2 succeeded at 161. Hunk #3 succeeded at 216. Hunk #4 succeeded at 246. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/encrypted_string_storage_test.cc storage/encrypted_string_storage_test.cc |index 0ddaeb456..c4e0b4d8e 100644 |--- storage/encrypted_string_storage_test.cc |+++ storage/encrypted_string_storage_test.cc -------------------------- Patching file storage/encrypted_string_storage_test.cc using Plan A... Hunk #1 succeeded at 34. Hunk #2 succeeded at 82. Hunk #3 succeeded at 122. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/existence_filter_main.cc storage/existence_filter_main.cc |index e2731b4a0..cfdcda837 100644 |--- storage/existence_filter_main.cc |+++ storage/existence_filter_main.cc -------------------------- Patching file storage/existence_filter_main.cc using Plan A... Hunk #1 succeeded at 29. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/lru_cache_main.cc storage/lru_cache_main.cc |index 61372ec23..e8a8e33e6 100644 |--- storage/lru_cache_main.cc |+++ storage/lru_cache_main.cc -------------------------- Patching file storage/lru_cache_main.cc using Plan A... Hunk #1 succeeded at 30. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/lru_storage.h storage/lru_storage.h |index 03e31af5c..4a85c4502 100644 |--- storage/lru_storage.h |+++ storage/lru_storage.h -------------------------- Patching file storage/lru_storage.h using Plan A... Hunk #1 succeeded at 54. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/lru_storage_main.cc storage/lru_storage_main.cc |index 7dd758ab0..92d5b9276 100644 |--- storage/lru_storage_main.cc |+++ storage/lru_storage_main.cc -------------------------- Patching file storage/lru_storage_main.cc using Plan A... Hunk #1 succeeded at 29. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/lru_storage_test.cc storage/lru_storage_test.cc |index 90f3c189c..37dfd2f1d 100644 |--- storage/lru_storage_test.cc |+++ storage/lru_storage_test.cc -------------------------- Patching file storage/lru_storage_test.cc using Plan A... Hunk #1 succeeded at 38. Hunk #2 succeeded at 137. Hunk #3 succeeded at 245. Hunk #4 succeeded at 288. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/registry_test.cc storage/registry_test.cc |index 4e14d9616..a4c3d11ca 100644 |--- storage/registry_test.cc |+++ storage/registry_test.cc -------------------------- Patching file storage/registry_test.cc using Plan A... Hunk #1 succeeded at 31. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/storage_interface.h storage/storage_interface.h |index c691a733d..3b6524adf 100644 |--- storage/storage_interface.h |+++ storage/storage_interface.h -------------------------- Patching file storage/storage_interface.h using Plan A... Hunk #1 succeeded at 56. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/tiny_storage.h storage/tiny_storage.h |index 6bbcdb8c0..3a9c1c7b7 100644 |--- storage/tiny_storage.h |+++ storage/tiny_storage.h -------------------------- Patching file storage/tiny_storage.h using Plan A... Hunk #1 succeeded at 42. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git storage/tiny_storage_test.cc storage/tiny_storage_test.cc |index e8f5a3a32..755ecca00 100644 |--- storage/tiny_storage_test.cc |+++ storage/tiny_storage_test.cc -------------------------- Patching file storage/tiny_storage_test.cc using Plan A... Hunk #1 succeeded at 37. Hunk #2 succeeded at 80. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git testing/BUILD testing/BUILD |index b840b33c0..2aed40512 100644 |--- testing/BUILD |+++ testing/BUILD -------------------------- Patching file testing/BUILD using Plan A... Hunk #1 succeeded at 77. Hunk #2 succeeded at 154. Hunk #3 succeeded at 173. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git testing/base/internal/googletest.cc testing/base/internal/googletest.cc |index a3610a2f4..e64ce2448 100644 |--- testing/base/internal/googletest.cc |+++ testing/base/internal/googletest.cc -------------------------- Patching file testing/base/internal/googletest.cc using Plan A... Hunk #1 succeeded at 40. Hunk #2 succeeded at 96. Hunk #3 succeeded at 145. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git testing/base/internal/gtest_main.cc testing/base/internal/gtest_main.cc |index b6666ff0d..b753339b3 100644 |--- testing/base/internal/gtest_main.cc |+++ testing/base/internal/gtest_main.cc -------------------------- Patching file testing/base/internal/gtest_main.cc using Plan A... Hunk #1 succeeded at 28. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git testing/base/public/googletest.h testing/base/public/googletest.h |index ed1fa238d..2fa5513aa 100644 |--- testing/base/public/googletest.h |+++ testing/base/public/googletest.h -------------------------- Patching file testing/base/public/googletest.h using Plan A... Hunk #1 succeeded at 30. Hunk #2 succeeded at 39. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git testing/base/public/mozctest.cc testing/base/public/mozctest.cc |index 6e30fc48f..25f42c379 100644 |--- testing/base/public/mozctest.cc |+++ testing/base/public/mozctest.cc -------------------------- Patching file testing/base/public/mozctest.cc using Plan A... Hunk #1 succeeded at 30. Hunk #2 succeeded at 83. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git tools/build_defs/qt.bzl tools/build_defs/qt.bzl |index 0a1ee34e8..14e676b47 100644 |--- tools/build_defs/qt.bzl |+++ tools/build_defs/qt.bzl -------------------------- Patching file tools/build_defs/qt.bzl using Plan A... Hunk #1 succeeded at 117. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git tools/cc_target_os/BUILD tools/cc_target_os/BUILD |index 6a6ac82d2..ee11dd19b 100644 |--- tools/cc_target_os/BUILD |+++ tools/cc_target_os/BUILD -------------------------- Patching file tools/cc_target_os/BUILD using Plan A... Hunk #1 succeeded at 104. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git unix/emacs/BUILD unix/emacs/BUILD |index f73fd970a..bc1224a48 100644 |--- unix/emacs/BUILD |+++ unix/emacs/BUILD -------------------------- Patching file unix/emacs/BUILD using Plan A... Hunk #1 succeeded at 48. Hunk #2 succeeded at 56. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git unix/emacs/mozc_emacs_helper.cc unix/emacs/mozc_emacs_helper.cc |index 562b23221..3416547da 100644 |--- unix/emacs/mozc_emacs_helper.cc |+++ unix/emacs/mozc_emacs_helper.cc -------------------------- Patching file unix/emacs/mozc_emacs_helper.cc using Plan A... Hunk #1 succeeded at 30. Hunk #2 succeeded at 39. Hunk #3 succeeded at 125. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git unix/emacs/mozc_emacs_helper_lib.h unix/emacs/mozc_emacs_helper_lib.h |index 22ecffb08..775e6eb2d 100644 |--- unix/emacs/mozc_emacs_helper_lib.h |+++ unix/emacs/mozc_emacs_helper_lib.h -------------------------- Patching file unix/emacs/mozc_emacs_helper_lib.h using Plan A... Hunk #1 succeeded at 110. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git unix/ibus/BUILD unix/ibus/BUILD |index ea7d08346..62d6f84c3 100644 |--- unix/ibus/BUILD |+++ unix/ibus/BUILD -------------------------- Patching file unix/ibus/BUILD using Plan A... Hunk #1 succeeded at 229. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git unix/ibus/key_translator_test.cc unix/ibus/key_translator_test.cc |index a39d51e57..0664abc0b 100644 |--- unix/ibus/key_translator_test.cc |+++ unix/ibus/key_translator_test.cc -------------------------- Patching file unix/ibus/key_translator_test.cc using Plan A... Hunk #1 succeeded at 216. Hunk #2 succeeded at 507. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git unix/ibus/main.cc unix/ibus/main.cc |index b7852cbb4..6813d131a 100644 |--- unix/ibus/main.cc |+++ unix/ibus/main.cc -------------------------- Patching file unix/ibus/main.cc using Plan A... Hunk #1 succeeded at 27. Hunk #2 succeeded at 120. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git unix/ibus/main_stub.cc unix/ibus/main_stub.cc |index 48bb490da..29214a801 100644 |--- unix/ibus/main_stub.cc |+++ unix/ibus/main_stub.cc -------------------------- Patching file unix/ibus/main_stub.cc using Plan A... Hunk #1 succeeded at 29. Hunk #2 succeeded at 44. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git unix/ibus/mozc_engine.cc unix/ibus/mozc_engine.cc |index be82541b2..8db7fd8c7 100644 |--- unix/ibus/mozc_engine.cc |+++ unix/ibus/mozc_engine.cc -------------------------- Patching file unix/ibus/mozc_engine.cc using Plan A... Hunk #1 succeeded at 40. Hunk #2 succeeded at 57. Hunk #3 succeeded at 69. Hunk #4 succeeded at 221. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git usage_stats/BUILD usage_stats/BUILD |index 4f1ce5116..ffc592f0c 100644 |--- usage_stats/BUILD |+++ usage_stats/BUILD -------------------------- Patching file usage_stats/BUILD using Plan A... Hunk #1 succeeded at 86. Hunk #2 succeeded at 93. Hunk #3 succeeded at 123. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git usage_stats/usage_stats.h usage_stats/usage_stats.h |index 8b71d785a..0729d43f2 100644 |--- usage_stats/usage_stats.h |+++ usage_stats/usage_stats.h -------------------------- Patching file usage_stats/usage_stats.h using Plan A... Hunk #1 succeeded at 80. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git usage_stats/usage_stats_test.cc usage_stats/usage_stats_test.cc |index 4debfd226..f8d0fea70 100644 |--- usage_stats/usage_stats_test.cc |+++ usage_stats/usage_stats_test.cc -------------------------- Patching file usage_stats/usage_stats_test.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 41. Hunk #3 succeeded at 49. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git usage_stats/usage_stats_uploader_test.cc usage_stats/usage_stats_uploader_test.cc |index 9586135c5..fe376c631 100644 |--- usage_stats/usage_stats_uploader_test.cc |+++ usage_stats/usage_stats_uploader_test.cc -------------------------- Patching file usage_stats/usage_stats_uploader_test.cc using Plan A... Hunk #1 succeeded at 35. Hunk #2 succeeded at 42. Hunk #3 succeeded at 63. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/base/accessible_object_info.h win32/base/accessible_object_info.h |index ade941773..52e69ff85 100644 |--- win32/base/accessible_object_info.h |+++ win32/base/accessible_object_info.h -------------------------- Patching file win32/base/accessible_object_info.h using Plan A... Hunk #1 succeeded at 40. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/base/browser_info.cc win32/base/browser_info.cc |index 1bccec4e2..4fb1bb0bf 100644 |--- win32/base/browser_info.cc |+++ win32/base/browser_info.cc -------------------------- Patching file win32/base/browser_info.cc using Plan A... Hunk #1 succeeded at 113. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/base/focus_hierarchy_observer.h win32/base/focus_hierarchy_observer.h |index faa5173a0..beb3e438c 100644 |--- win32/base/focus_hierarchy_observer.h |+++ win32/base/focus_hierarchy_observer.h -------------------------- Patching file win32/base/focus_hierarchy_observer.h using Plan A... Hunk #1 succeeded at 46. Hunk #2 succeeded at 57. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/base/input_dll.h win32/base/input_dll.h |index 4cbaf28e4..4c7204bed 100644 |--- win32/base/input_dll.h |+++ win32/base/input_dll.h -------------------------- Patching file win32/base/input_dll.h using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 183. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/base/keyevent_handler.cc win32/base/keyevent_handler.cc |index a627b386f..8913706a9 100644 |--- win32/base/keyevent_handler.cc |+++ win32/base/keyevent_handler.cc -------------------------- Patching file win32/base/keyevent_handler.cc using Plan A... Hunk #1 succeeded at 521. Hunk #2 succeeded at 924. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/base/keyevent_handler_test.cc win32/base/keyevent_handler_test.cc |index e3e326522..86d779c59 100644 |--- win32/base/keyevent_handler_test.cc |+++ win32/base/keyevent_handler_test.cc -------------------------- Patching file win32/base/keyevent_handler_test.cc using Plan A... Hunk #1 succeeded at 27. Hunk #2 succeeded at 38. Hunk #3 succeeded at 49. Hunk #4 succeeded at 246. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/base/string_util.h win32/base/string_util.h |index cbedd8c50..49d640e4f 100644 |--- win32/base/string_util.h |+++ win32/base/string_util.h -------------------------- Patching file win32/base/string_util.h using Plan A... Hunk #1 succeeded at 58. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/base/surrogate_pair_observer.h win32/base/surrogate_pair_observer.h |index 911071cc3..702e4932e 100644 |--- win32/base/surrogate_pair_observer.h |+++ win32/base/surrogate_pair_observer.h -------------------------- Patching file win32/base/surrogate_pair_observer.h using Plan A... Hunk #1 succeeded at 44. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/base/uninstall_helper.h win32/base/uninstall_helper.h |index dda9d7960..3d9ac63e0 100644 |--- win32/base/uninstall_helper.h |+++ win32/base/uninstall_helper.h -------------------------- Patching file win32/base/uninstall_helper.h using Plan A... Hunk #1 succeeded at 79. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/broker/ime_switcher.cc win32/broker/ime_switcher.cc |index 40d4abea4..e8a6218ff 100644 |--- win32/broker/ime_switcher.cc |+++ win32/broker/ime_switcher.cc -------------------------- Patching file win32/broker/ime_switcher.cc using Plan A... Hunk #1 succeeded at 33. Hunk #2 succeeded at 44. Hunk #3 succeeded at 144. Hunk #4 succeeded at 183. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/broker/mozc_broker.rc win32/broker/mozc_broker.rc |index 7f625b4e1..8448fbe59 100644 |Binary files win32/broker/mozc_broker.rc and win32/broker/mozc_broker.rc differ |diff --git win32/broker/mozc_broker_main.cc win32/broker/mozc_broker_main.cc |index 954c30042..6abd2343d 100644 |--- win32/broker/mozc_broker_main.cc |+++ win32/broker/mozc_broker_main.cc -------------------------- Patching file win32/broker/mozc_broker_main.cc using Plan A... Hunk #1 succeeded at 32. Hunk #2 succeeded at 66. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/custom_action/custom_action.h win32/custom_action/custom_action.h |index b4f461d4f..8633c32d6 100644 |--- win32/custom_action/custom_action.h |+++ win32/custom_action/custom_action.h -------------------------- Patching file win32/custom_action/custom_action.h using Plan A... Hunk #1 succeeded at 96. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/custom_action/custom_action.rc win32/custom_action/custom_action.rc |index a395f6ee2..5f818c8ce 100644 |Binary files win32/custom_action/custom_action.rc and win32/custom_action/custom_action.rc differ |diff --git win32/ime/GoogleIMEJa.rc win32/ime/GoogleIMEJa.rc |index fac32bb7c..5cd73c21f 100644 |Binary files win32/ime/GoogleIMEJa.rc and win32/ime/GoogleIMEJa.rc differ |diff --git win32/ime/ime_candidate_info_test.cc win32/ime/ime_candidate_info_test.cc |index 32a2d73f1..2b5c11495 100644 |--- win32/ime/ime_candidate_info_test.cc |+++ win32/ime/ime_candidate_info_test.cc -------------------------- Patching file win32/ime/ime_candidate_info_test.cc using Plan A... Hunk #1 succeeded at 104. Hunk #2 succeeded at 133. Hunk #3 succeeded at 529. Hunk #4 succeeded at 558. Hunk #5 succeeded at 573. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/ime/ime_composition_string.cc win32/ime/ime_composition_string.cc |index ed1a22fc7..0bdcf5c9c 100644 |--- win32/ime/ime_composition_string.cc |+++ win32/ime/ime_composition_string.cc -------------------------- Patching file win32/ime/ime_composition_string.cc using Plan A... Hunk #1 succeeded at 116. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/ime/ime_composition_string.h win32/ime/ime_composition_string.h |index 746eca7a2..50daeec00 100644 |--- win32/ime/ime_composition_string.h |+++ win32/ime/ime_composition_string.h -------------------------- Patching file win32/ime/ime_composition_string.h using Plan A... Hunk #1 succeeded at 99. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/ime/ime_composition_string_test.cc win32/ime/ime_composition_string_test.cc |index 68762a37a..0d3cf4e16 100644 |--- win32/ime/ime_composition_string_test.cc |+++ win32/ime/ime_composition_string_test.cc -------------------------- Patching file win32/ime/ime_composition_string_test.cc using Plan A... Hunk #1 succeeded at 555. Hunk #2 succeeded at 666. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/ime/ime_core.cc win32/ime/ime_core.cc |index e16785268..4cd9cb8c5 100644 |--- win32/ime/ime_core.cc |+++ win32/ime/ime_core.cc -------------------------- Patching file win32/ime/ime_core.cc using Plan A... Hunk #1 succeeded at 626. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/ime/ime_core.h win32/ime/ime_core.h |index 6c998ada7..7be02c79f 100644 |--- win32/ime/ime_core.h |+++ win32/ime/ime_core.h -------------------------- Patching file win32/ime/ime_core.h using Plan A... Hunk #1 succeeded at 217. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/ime/ime_language_bar.cc win32/ime/ime_language_bar.cc |index 8a4ca264d..ba5334cbe 100644 |--- win32/ime/ime_language_bar.cc |+++ win32/ime/ime_language_bar.cc -------------------------- Patching file win32/ime/ime_language_bar.cc using Plan A... Hunk #1 succeeded at 47. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/ime/ime_language_bar_menu.cc win32/ime/ime_language_bar_menu.cc |index ee1c3ad02..7e2ad5c23 100644 |--- win32/ime/ime_language_bar_menu.cc |+++ win32/ime/ime_language_bar_menu.cc -------------------------- Patching file win32/ime/ime_language_bar_menu.cc using Plan A... Hunk #1 succeeded at 139. Hunk #2 succeeded at 260. Hunk #3 succeeded at 271. Hunk #4 succeeded at 295. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/ime/ime_ui_visibility_tracker_test.cc win32/ime/ime_ui_visibility_tracker_test.cc |index 7be77ae70..08be7fd0e 100644 |--- win32/ime/ime_ui_visibility_tracker_test.cc |+++ win32/ime/ime_ui_visibility_tracker_test.cc -------------------------- Patching file win32/ime/ime_ui_visibility_tracker_test.cc using Plan A... Hunk #1 succeeded at 124. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/ime/ime_ui_window.cc win32/ime/ime_ui_window.cc |index b4506aa27..ba37b8e7e 100644 |--- win32/ime/ime_ui_window.cc |+++ win32/ime/ime_ui_window.cc -------------------------- Patching file win32/ime/ime_ui_window.cc using Plan A... Hunk #1 succeeded at 82. Hunk #2 succeeded at 979. Hunk #3 succeeded at 992. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/tip/tip_candidate_list_test.cc win32/tip/tip_candidate_list_test.cc |index 689a502b7..2cd3c60ed 100644 |--- win32/tip/tip_candidate_list_test.cc |+++ win32/tip/tip_candidate_list_test.cc -------------------------- Patching file win32/tip/tip_candidate_list_test.cc using Plan A... Hunk #1 succeeded at 108. Hunk #2 succeeded at 127. Hunk #3 succeeded at 144. Hunk #4 succeeded at 177. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/tip/tip_edit_session_impl.cc win32/tip/tip_edit_session_impl.cc |index 6ad73ed71..e8fcee526 100644 |--- win32/tip/tip_edit_session_impl.cc |+++ win32/tip/tip_edit_session_impl.cc -------------------------- Patching file win32/tip/tip_edit_session_impl.cc using Plan A... Hunk #1 succeeded at 154. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/tip/tip_lang_bar_menu.cc win32/tip/tip_lang_bar_menu.cc |index 0edc32198..2c715660f 100644 |--- win32/tip/tip_lang_bar_menu.cc |+++ win32/tip/tip_lang_bar_menu.cc -------------------------- Patching file win32/tip/tip_lang_bar_menu.cc using Plan A... Hunk #1 succeeded at 138. Hunk #2 succeeded at 267. Hunk #3 succeeded at 278. Hunk #4 succeeded at 371. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/tip/tip_reconvert_function.cc win32/tip/tip_reconvert_function.cc |index 77d408a9c..6f0231153 100644 |--- win32/tip/tip_reconvert_function.cc |+++ win32/tip/tip_reconvert_function.cc -------------------------- Patching file win32/tip/tip_reconvert_function.cc using Plan A... Hunk #1 succeeded at 134. Hunk #2 succeeded at 142. Hunk #3 succeeded at 160. Hunk #4 succeeded at 168. Hunk #5 succeeded at 176. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/tip/tip_resource.rc win32/tip/tip_resource.rc |index d9b24ea7e..640277e0d 100644 |Binary files win32/tip/tip_resource.rc and win32/tip/tip_resource.rc differ |diff --git win32/tip/tip_surrounding_text.cc win32/tip/tip_surrounding_text.cc |index d42c065c0..ed5f9235d 100644 |--- win32/tip/tip_surrounding_text.cc |+++ win32/tip/tip_surrounding_text.cc -------------------------- Patching file win32/tip/tip_surrounding_text.cc using Plan A... Hunk #1 succeeded at 148. Hunk #2 succeeded at 241. Hunk #3 succeeded at 256. Hunk #4 succeeded at 278. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/tip/tip_surrounding_text.h win32/tip/tip_surrounding_text.h |index 2c11604ed..86cd131bb 100644 |--- win32/tip/tip_surrounding_text.h |+++ win32/tip/tip_surrounding_text.h -------------------------- Patching file win32/tip/tip_surrounding_text.h using Plan A... Hunk #1 succeeded at 86. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/tip/tip_text_service.cc win32/tip/tip_text_service.cc |index eea0b3fe1..8bccab402 100644 |--- win32/tip/tip_text_service.cc |+++ win32/tip/tip_text_service.cc -------------------------- Patching file win32/tip/tip_text_service.cc using Plan A... Hunk #1 succeeded at 88. Hunk #2 succeeded at 877. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/tip/tip_ui_element_immersive.cc win32/tip/tip_ui_element_immersive.cc |index 336991bbf..9a2e4ab00 100644 |--- win32/tip/tip_ui_element_immersive.cc |+++ win32/tip/tip_ui_element_immersive.cc -------------------------- Patching file win32/tip/tip_ui_element_immersive.cc using Plan A... Hunk #1 succeeded at 108. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git win32/tip/tip_ui_handler_immersive.cc win32/tip/tip_ui_handler_immersive.cc |index f96a01138..4bdeed54e 100644 |--- win32/tip/tip_ui_handler_immersive.cc |+++ win32/tip/tip_ui_handler_immersive.cc -------------------------- Patching file win32/tip/tip_ui_handler_immersive.cc using Plan A... Hunk #1 succeeded at 69. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_base.gyp => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_base.gyp Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_base.gyp,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- base/base.gyp.orig 2017-11-02 13:32:45.000000000 +0000 |+++ base/base.gyp -------------------------- Patching file base/base.gyp using Plan A... Hunk #1 succeeded at 137 (offset -4 lines). done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_clock.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_clock.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_clock.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- base/clock.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ base/clock.cc -------------------------- Patching file base/clock.cc using Plan A... Hunk #1 succeeded at 116. Hunk #2 succeeded at 133. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_cpu__stats.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_cpu__stats.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_cpu__stats.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- base/cpu_stats.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ base/cpu_stats.cc -------------------------- Patching file base/cpu_stats.cc using Plan A... Hunk #1 succeeded at 122. Hunk #2 succeeded at 175. Hunk #3 succeeded at 206. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_logging.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_logging.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_logging.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |--- base/logging.cc.orig 2021-02-17 12:18:42.000000000 +0000 |+++ base/logging.cc -------------------------- Patching file base/logging.cc using Plan A... Hunk #1 succeeded at 53. Hunk #2 succeeded at 116. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_mutex.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_mutex.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_mutex.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- base/mutex.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ base/mutex.cc -------------------------- Patching file base/mutex.cc using Plan A... Hunk #1 succeeded at 148. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_password__manager.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_password__manager.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_password__manager.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- base/password_manager.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ base/password_manager.cc -------------------------- Patching file base/password_manager.cc using Plan A... Hunk #1 succeeded at 264. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_port.h => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_port.h Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_port.h,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |--- base/port.h.orig 2021-02-15 05:04:33.000000000 +0000 |+++ base/port.h -------------------------- Patching file base/port.h using Plan A... Hunk #1 succeeded at 69. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_process.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_process.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_process.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- base/process.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ base/process.cc -------------------------- Patching file base/process.cc using Plan A... Hunk #1 succeeded at 46. Hunk #2 succeeded at 98. Hunk #3 succeeded at 185. Hunk #4 succeeded at 208. Hunk #5 succeeded at 383. Hunk #6 succeeded at 392. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_run__level.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_run__level.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_run__level.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- base/run_level.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ base/run_level.cc -------------------------- Patching file base/run_level.cc using Plan A... Hunk #1 succeeded at 38. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_system__util.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_system__util.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_system__util.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |--- base/system_util.cc.orig 2021-02-15 05:04:33.000000000 +0000 |+++ base/system_util.cc -------------------------- Patching file base/system_util.cc using Plan A... Hunk #1 succeeded at 275. Hunk #2 succeeded at 422. Hunk #3 succeeded at 499. Hunk #4 succeeded at 662. Hunk #5 succeeded at 862. Hunk #6 succeeded at 904. Hunk #7 succeeded at 917. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_thread.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-base_thread.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-base_thread.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* tweak for NetBSD pthread_setname_np(3) | |--- base/thread.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ base/thread.cc -------------------------- Patching file base/thread.cc using Plan A... Hunk #1 succeeded at 145. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-build__mozc.py => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-build__mozc.py Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-build__mozc.py,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- build_mozc.py.orig 2021-02-15 03:48:53.000000000 +0000 |+++ build_mozc.py -------------------------- Patching file build_mozc.py using Plan A... Hunk #1 succeeded at 55. Hunk #2 succeeded at 97. Hunk #3 succeeded at 157. Hunk #4 succeeded at 184. Hunk #5 succeeded at 273. Hunk #6 succeeded at 451. Hunk #7 succeeded at 493. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-build__tools_mozc__version.py => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-build__tools_mozc__version.py Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-build__tools_mozc__version.py,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- build_tools/mozc_version.py.orig 2021-02-15 03:48:53.000000000 +0000 |+++ build_tools/mozc_version.py -------------------------- Patching file build_tools/mozc_version.py using Plan A... Hunk #1 succeeded at 69. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-build__tools_util.py => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-build__tools_util.py Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-build__tools_util.py,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- build_tools/util.py.orig 2016-05-15 08:11:10.000000000 +0000 |+++ build_tools/util.py -------------------------- Patching file build_tools/util.py using Plan A... Hunk #1 succeeded at 61 (offset 2 lines). done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-client_client.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-client_client.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-client_client.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- client/client.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ client/client.cc -------------------------- Patching file client/client.cc using Plan A... Hunk #1 succeeded at 867. Hunk #2 succeeded at 877. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-config.bzl => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-config.bzl Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-config.bzl,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* For pkgsrc layout. | |--- config.bzl.orig 2021-02-15 05:04:34.000000000 +0000 |+++ config.bzl -------------------------- Patching file config.bzl using Plan A... Hunk #1 succeeded at 30. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-config_stats__config__util__test.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-config_stats__config__util__test.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-config_stats__config__util__test.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- config/stats_config_util_test.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ config/stats_config_util_test.cc -------------------------- Patching file config/stats_config_util_test.cc using Plan A... Hunk #1 succeeded at 685. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_config__dialog_config__dialog.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_config__dialog_config__dialog.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- gui/config_dialog/config_dialog.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ gui/config_dialog/config_dialog.cc -------------------------- Patching file gui/config_dialog/config_dialog.cc using Plan A... Hunk #1 succeeded at 104. Hunk #2 succeeded at 280. Hunk #3 succeeded at 290. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_config__dialog_keybinding__editor.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_config__dialog_keybinding__editor.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gui_config__dialog_keybinding__editor.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- gui/config_dialog/keybinding_editor.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ gui/config_dialog/keybinding_editor.cc -------------------------- Patching file gui/config_dialog/keybinding_editor.cc using Plan A... Hunk #1 succeeded at 381. Hunk #2 succeeded at 478. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_dictionary__tool_dictionary__tool.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_dictionary__tool_dictionary__tool.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- gui/dictionary_tool/dictionary_tool.cc.orig 2014-05-21 10:51:22.000000000 +0000 |+++ gui/dictionary_tool/dictionary_tool.cc -------------------------- Patching file gui/dictionary_tool/dictionary_tool.cc using Plan A... Hunk #1 succeeded at 358 (offset 11 lines). done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_qt__libraries.gypi => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_qt__libraries.gypi Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gui_qt__libraries.gypi,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- gui/qt_libraries.gypi.orig 2017-11-02 13:32:47.000000000 +0000 |+++ gui/qt_libraries.gypi -------------------------- Patching file gui/qt_libraries.gypi using Plan A... Hunk #1 succeeded at 98. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_qt__moc.gypi => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_qt__moc.gypi Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gui_qt__moc.gypi,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- gui/qt_moc.gypi.orig 2017-11-02 13:32:47.000000000 +0000 |+++ gui/qt_moc.gypi -------------------------- Patching file gui/qt_moc.gypi using Plan A... Hunk #1 succeeded at 33. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_qt__rcc.gypi => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_qt__rcc.gypi Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gui_qt__rcc.gypi,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- gui/qt_rcc.gypi.orig 2017-11-02 13:32:47.000000000 +0000 |+++ gui/qt_rcc.gypi -------------------------- Patching file gui/qt_rcc.gypi using Plan A... Hunk #1 succeeded at 33. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_qt__uic.gypi => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_qt__uic.gypi Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gui_qt__uic.gypi,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- gui/qt_uic.gypi.orig 2017-11-02 13:32:47.000000000 +0000 |+++ gui/qt_uic.gypi -------------------------- Patching file gui/qt_uic.gypi using Plan A... Hunk #1 succeeded at 33. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_word__register__dialog_word__register__dialog.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gui_word__register__dialog_word__register__dialog.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gui_word__register__dialog_word__register__dialog.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support |* Fix from https://github.com/google/mozc/issues/460 | |--- gui/word_register_dialog/word_register_dialog.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ gui/word_register_dialog/word_register_dialog.cc -------------------------- Patching file gui/word_register_dialog/word_register_dialog.cc using Plan A... Hunk #1 succeeded at 97. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_common.gypi => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_common.gypi Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gyp_common.gypi,v 1.3 2021/02/27 19:13:27 ryoon Exp $ | |* NetBSD support | |--- gyp/common.gypi.orig 2021-02-15 05:04:33.000000000 +0000 |+++ gyp/common.gypi -------------------------- Patching file gyp/common.gypi using Plan A... Hunk #1 succeeded at 93. Hunk #2 succeeded at 136. Hunk #3 succeeded at 332. Hunk #4 succeeded at 442. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_directories.gypi => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-gyp_directories.gypi Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-gyp_directories.gypi,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |--- gyp/directories.gypi.orig 2021-02-15 05:04:33.000000000 +0000 |+++ gyp/directories.gypi -------------------------- Patching file gyp/directories.gypi using Plan A... Hunk #1 succeeded at 43. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-ipc_ipc__path__manager.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-ipc_ipc__path__manager.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-ipc_ipc__path__manager.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- ipc/ipc_path_manager.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ ipc/ipc_path_manager.cc -------------------------- Patching file ipc/ipc_path_manager.cc using Plan A... Hunk #1 succeeded at 53. Hunk #2 succeeded at 430. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-ipc_ipc__path__manager__test.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-ipc_ipc__path__manager__test.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-ipc_ipc__path__manager__test.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- ipc/ipc_path_manager_test.cc.orig 2013-07-17 02:37:50.000000000 +0000 |+++ ipc/ipc_path_manager_test.cc -------------------------- Patching file ipc/ipc_path_manager_test.cc using Plan A... Hunk #1 succeeded at 104 (offset 1 line). done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-ipc_named__event.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-ipc_named__event.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-ipc_named__event.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* sem_open(..., 0) is not supported for NetBSD at least. | |--- ipc/named_event.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ ipc/named_event.cc -------------------------- Patching file ipc/named_event.cc using Plan A... Hunk #1 succeeded at 325. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-ipc_unix__ipc.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-ipc_unix__ipc.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-ipc_unix__ipc.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- ipc/unix_ipc.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ ipc/unix_ipc.cc -------------------------- Patching file ipc/unix_ipc.cc using Plan A... Hunk #1 succeeded at 28. Hunk #2 succeeded at 125. Hunk #3 succeeded at 141. Hunk #4 succeeded at 484. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-protobuf_protobuf.gyp => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-protobuf_protobuf.gyp Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-protobuf_protobuf.gyp,v 1.1 2021/02/27 04:19:46 ryoon Exp $ | |* Pass LDFLAGS from pkgsrc. | Fix -lprotobuf is not found error. | |--- protobuf/protobuf.gyp.orig 2021-02-15 05:04:33.000000000 +0000 |+++ protobuf/protobuf.gyp -------------------------- Patching file protobuf/protobuf.gyp using Plan A... Hunk #1 succeeded at 156. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-renderer_renderer.gyp => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-renderer_renderer.gyp Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-renderer_renderer.gyp,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* Support NetBSD. | |--- renderer/renderer.gyp.orig 2021-02-15 05:04:33.000000000 +0000 |+++ renderer/renderer.gyp -------------------------- Patching file renderer/renderer.gyp using Plan A... Hunk #1 succeeded at 193. Hunk #2 succeeded at 518. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-session_session.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-session_session.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-session_session.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- session/session.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ session/session.cc -------------------------- Patching file session/session.cc using Plan A... Hunk #1 succeeded at 230. Hunk #2 succeeded at 964. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-session_session__test.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-session_session__test.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-session_session__test.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* NetBSD support | |--- session/session_test.cc.orig 2021-02-15 03:48:53.000000000 +0000 |+++ session/session_test.cc -------------------------- Patching file session/session_test.cc using Plan A... Hunk #1 succeeded at 1974. Hunk #2 succeeded at 2149. Hunk #3 succeeded at 2159. Hunk #4 succeeded at 2177. Hunk #5 succeeded at 2187. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-third__party_abseil-cpp_absl_base_config.h => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-third__party_abseil-cpp_absl_base_config.h Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-third__party_abseil-cpp_absl_base_config.h,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* Support NetBSD. | |--- third_party/abseil-cpp/absl/base/config.h.orig 2021-02-15 05:04:34.000000000 +0000 |+++ third_party/abseil-cpp/absl/base/config.h -------------------------- Patching file third_party/abseil-cpp/absl/base/config.h using Plan A... Hunk #1 succeeded at 364. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-third__party_protobuf_post__process__dist.sh => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-third__party_protobuf_post__process__dist.sh Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-third__party_protobuf_post__process__dist.sh,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* appease pkglint | |--- third_party/protobuf/post_process_dist.sh.orig 2017-11-02 13:35:43.000000000 +0000 |+++ third_party/protobuf/post_process_dist.sh -------------------------- Patching file third_party/protobuf/post_process_dist.sh using Plan A... Hunk #1 succeeded at 15. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-unix_ibus_ibus.gyp => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-unix_ibus_ibus.gyp Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-unix_ibus_ibus.gyp,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* use ${PREFIX} paths | |--- unix/ibus/ibus.gyp.orig 2017-11-02 13:32:47.000000000 +0000 |+++ unix/ibus/ibus.gyp -------------------------- Patching file unix/ibus/ibus.gyp using Plan A... Hunk #1 succeeded at 31. done => Verifying /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-unix_ibus_path__util.cc => Applying pkgsrc patch /amd/pkgsrc/CHROOT/P/pkgsrc/inputmethod/fcitx5-mozc/patches/patch-unix_ibus_path__util.cc Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |$NetBSD: patch-unix_ibus_path__util.cc,v 1.1 2021/02/17 15:29:51 ryoon Exp $ | |* use ${PREFIX} path | |--- unix/ibus/path_util.cc.orig 2017-11-02 13:32:47.000000000 +0000 |+++ unix/ibus/path_util.cc -------------------------- Patching file unix/ibus/path_util.cc using Plan A... Hunk #1 succeeded at 30. done ===> Creating toolchain wrappers for fcitx5-mozc-2.26.4276.100nb24 ===> Configuring for fcitx5-mozc-2.26.4276.100nb24 => Fix gyp defaults /bin/rm /tmp/inputmethod/fcitx5-mozc/work/fcitx-mozc-2.26.4276.100/src/unix/fcitx/fcitx.gyp => Generating pkg-config files for builtin xz package. => Generating pkg-config file for builtin expat package. => Checking for portability problems in extracted files cd /tmp/inputmethod/fcitx5-mozc/work/fcitx-mozc-2.26.4276.100/src && /usr/bin/env USETOOLS=no PTHREAD_CFLAGS=\ -pthread\ PTHREAD_LDFLAGS=\ -pthread PTHREAD_LIBS= PTHREADBASE=/usr QTDIR=/usr/pkg/qt5 MOC="/usr/pkg/qt5/bin/moc" LINK=c++ PYTHON=/usr/pkg/bin/python3.11 CC=gcc CFLAGS=-O2\ -I/usr/pkg/include\ -I/usr/pkg/include/glib-2.0\ -I/usr/pkg/include/gio-unix-2.0\ -I/usr/pkg/lib/glib-2.0/include\ -I/usr/include\ -I/usr/include/krb5\ -I/usr/X11R7/include\ -I/usr/pkg/include/freetype2\ -I/usr/pkg/include/harfbuzz\ -I/usr/pkg/qt5/include\ -I/usr/X11R7/include/libdrm CPPFLAGS=-I/usr/pkg/include\ -I/usr/pkg/include/glib-2.0\ -I/usr/pkg/include/gio-unix-2.0\ -I/usr/pkg/lib/glib-2.0/include\ -I/usr/include\ -I/usr/include/krb5\ -I/usr/X11R7/include\ -I/usr/pkg/include/freetype2\ -I/usr/pkg/include/harfbuzz\ -I/usr/pkg/qt5/include\ -I/usr/X11R7/include/libdrm CXX=c++ CXXFLAGS=-O2\ -I/usr/pkg/include\ -I/usr/pkg/include/glib-2.0\ -I/usr/pkg/include/gio-unix-2.0\ -I/usr/pkg/lib/glib-2.0/include\ -I/usr/include\ -I/usr/include/krb5\ -I/usr/X11R7/include\ -I/usr/pkg/include/freetype2\ -I/usr/pkg/include/harfbuzz\ -I/usr/pkg/qt5/include\ -I/usr/X11R7/include/libdrm COMPILER_RPATH_FLAG=-Wl,-R F77=gfortran FC=gfortran FFLAGS=-O LANG=C LC_ALL=C LC_COLLATE=C LC_CTYPE=C LC_MESSAGES=C LC_MONETARY=C LC_NUMERIC=C LC_TIME=C LDFLAGS=-Wl,-zrelro\ -L/usr/pkg/lib\ -Wl,-R/usr/pkg/lib\ -L/usr/lib\ -Wl,-R/usr/lib\ -L/usr/X11R7/lib\ -Wl,-R/usr/X11R7/lib\ -L/usr/pkg/qt5/lib\ -L/usr/pkg/qt5/plugins\ -Wl,-R/usr/pkg/qt5/lib\ -Wl,-R/usr/pkg/qt5/plugins LINKER_RPATH_FLAG=-R PATH=/tmp/inputmethod/fcitx5-mozc/work/.cwrapper/bin:/tmp/inputmethod/fcitx5-mozc/work/.buildlink/bin:/tmp/inputmethod/fcitx5-mozc/work/.gcc/bin:/tmp/inputmethod/fcitx5-mozc/work/.tools/bin:/usr/pkg/bin:/usr/bin:/bin:/usr/pkg/bin:/usr/local/bin:/usr/pkg/bin:/usr/X11R7/bin PREFIX=/usr/pkg MAKELEVEL=0 CONFIG_SITE= PKG_SYSCONFDIR=/usr/pkg/etc HOME=/tmp/inputmethod/fcitx5-mozc/work/.home CWRAPPERS_CONFIG_DIR=/tmp/inputmethod/fcitx5-mozc/work/.cwrapper/config CPP=cpp LOCALBASE=/usr/pkg X11BASE=/usr/X11R7 PKGMANDIR=man PKGINFODIR=info PKGGNUDIR=gnu/ MAKECONF=/dev/null OBJECT_FMT=ELF USETOOLS=no BSD_INSTALL_PROGRAM=/usr/bin/install\ -c\ -s\ -o\ makoto\ -g\ wheel\ -m\ 755 BSD_INSTALL_SCRIPT=/usr/bin/install\ -c\ -o\ makoto\ -g\ wheel\ -m\ 755 BSD_INSTALL_LIB=/usr/bin/install\ -c\ -o\ makoto\ -g\ wheel\ -m\ 755 BSD_INSTALL_DATA=/usr/bin/install\ -c\ -o\ makoto\ -g\ wheel\ -m\ 644 BSD_INSTALL_MAN=/usr/bin/install\ -c\ -o\ makoto\ -g\ wheel\ -m\ 644 BSD_INSTALL=/usr/bin/install BSD_INSTALL_PROGRAM_DIR=/usr/bin/install\ -d\ -o\ makoto\ -g\ wheel\ -m\ 755 BSD_INSTALL_SCRIPT_DIR=/usr/bin/install\ -d\ -o\ makoto\ -g\ wheel\ -m\ 755 BSD_INSTALL_LIB_DIR=/usr/bin/install\ -d\ -o\ makoto\ -g\ wheel\ -m\ 755 BSD_INSTALL_DATA_DIR=/usr/bin/install\ -d\ -o\ makoto\ -g\ wheel\ -m\ 755 BSD_INSTALL_MAN_DIR=/usr/bin/install\ -d\ -o\ makoto\ -g\ wheel\ -m\ 755 BSD_INSTALL_GAME=/usr/bin/install\ -c\ -s\ -o\ makoto\ -g\ wheel\ -m\ 2555 BSD_INSTALL_GAME_DATA=/usr/bin/install\ -c\ -o\ makoto\ -g\ wheel\ -m\ 664 BSD_INSTALL_GAME_DIR=/usr/bin/install\ -d\ -o\ makoto\ -g\ wheel\ -m\ 775 INSTALL_INFO= MAKEINFO=/tmp/inputmethod/fcitx5-mozc/work/.tools/bin/makeinfo FLEX= BISON= ITSTOOL=/tmp/inputmethod/fcitx5-mozc/work/.tools/bin/itstool GDBUS_CODEGEN=/tmp/inputmethod/fcitx5-mozc/work/.tools/bin/gdbus-codegen PKG_CONFIG=/tmp/inputmethod/fcitx5-mozc/work/.tools/bin/pkg-config PKG_CONFIG_LIBDIR=/tmp/inputmethod/fcitx5-mozc/work/.buildlink/lib/pkgconfig:/tmp/inputmethod/fcitx5-mozc/work/.buildlink/share/pkgconfig PKG_CONFIG_LOG=/tmp/inputmethod/fcitx5-mozc/work/.pkg-config.log PKG_CONFIG_PATH= KRB5_CONFIG=/usr/bin/krb5-config CWRAPPERS_CONFIG_DIR=/tmp/inputmethod/fcitx5-mozc/work/.cwrapper/config GYP_DEFINES="use_libprotobuf=1" /usr/pkg/bin/python3.11 build_mozc.py gyp --gypdir=/usr/pkg/bin INFO: Generating version definition file... INFO: Version string is 2.26.4282.108 INFO: Running: pkg-config --exists ibus-1.0 >= 1.4.1 INFO: pkg-config --exists ibus-1.0 >= 1.4.1 failed INFO: removing ibus.gyp. INFO: Building GYP command line... INFO: Running: pkg-config --exists Qt5Core Qt5Gui Qt5Widgets INFO: Running GYP... INFO: Running: /usr/pkg/bin/gyp --depth=. --include=./gyp/common.gypi -D abs_depth=/tmp/inputmethod/fcitx5-mozc/work/fcitx-mozc-2.26.4276.100/src -D ext_third_party_dir=/tmp/inputmethod/fcitx5-mozc/work/fcitx-mozc-2.26.4276.100/src/third_party -D python=/usr/pkg/bin/python3.11 ./base/absl.gyp ./base/base.gyp ./base/base_test.gyp ./client/client.gyp ./client/client_test.gyp ./composer/composer.gyp ./composer/composer_test.gyp ./config/config.gyp ./config/config_test.gyp ./converter/converter.gyp ./converter/converter_base.gyp ./converter/converter_main.gyp ./converter/converter_test.gyp ./data/test/session/scenario/scenario.gyp ./data/test/session/scenario/usage_stats/usage_stats.gyp ./data_manager/data_manager.gyp ./data_manager/data_manager_base.gyp ./data_manager/data_manager_test.gyp ./data_manager/oss/oss_data_manager.gyp ./data_manager/oss/oss_data_manager_base.gyp ./data_manager/oss/oss_data_manager_test.gyp ./data_manager/testing/mock_data_manager.gyp ./data_manager/testing/mock_data_manager_base.gyp ./data_manager/testing/mock_data_manager_test.gyp ./dictionary/dictionary.gyp ./dictionary/dictionary_base.gyp ./dictionary/dictionary_test.gyp ./dictionary/file/dictionary_file.gyp ./dictionary/file/dictionary_file_test.gyp ./dictionary/system/system_dictionary.gyp ./dictionary/system/system_dictionary_test.gyp ./engine/engine.gyp ./engine/engine_test.gyp ./gui/gui.gyp ./gyp/tests.gyp ./ios/ios.gyp ./ipc/ipc.gyp ./mac/mac.gyp ./net/jsoncpp.gyp ./net/net.gyp ./net/net_test.gyp ./prediction/prediction.gyp ./prediction/prediction_base.gyp ./prediction/prediction_test.gyp ./protobuf/protobuf.gyp ./protocol/protocol.gyp ./renderer/renderer.gyp ./request/request.gyp ./rewriter/calculator/calculator.gyp ./rewriter/rewriter.gyp ./rewriter/rewriter_base.gyp ./rewriter/rewriter_test.gyp ./server/server.gyp ./session/session.gyp ./session/session_base.gyp ./session/session_test.gyp ./storage/storage.gyp ./storage/storage_test.gyp ./testing/testing.gyp ./transliteration/transliteration.gyp ./transliteration/transliteration_test.gyp ./unix/emacs/emacs.gyp ./unix/fcitx5/fcitx5.gyp ./usage_stats/usage_stats_base.gyp ./usage_stats/usage_stats_test.gyp -D branding=Mozc -D use_qt=YES -D qt_dir= -D use_wix=NO -D build_base=/tmp/inputmethod/fcitx5-mozc/work/fcitx-mozc-2.26.4276.100/src/out_bsd -D build_short_base=out_bsd -D warn_as_error=0 -D channel_dev=1 -D target_platform=NetBSD --generator-output=. -G output_dir=out_bsd INFO: Done