Update to 2.17.2313.102

Changelog: 2.17.2288.102 - 2.17.2313.102 / 2016-01-03 - 2016-01-10 Summary of changes between 2.17.2288.102 and 2.17.2313.102 as follows. Third party libraries: None. Build related changes: None. Major changes: Update system dictionary. Status icons for OS X are updated with Noto font. Fixed issues: #344: Support icon_prop_key entry in ibus-mozc #345: Mozc for Android keeps crashing #347: Software keyboard is not rendered correctly on Android 6 if non-material theme is selected #350: Status icon is not updated when using Windows Store Apps in desktop mode on Windows 10 #351: Mozc cannot be activated in the search box on the task bar when configured to be the default IME on Windows 10 Following issues are not completely fixed yet, but at least worked around. #348: DirectWrite may fail to render text in certain enviromnents #349: Word suggestion can be unexpectedly suppressed on Chromium Total commits: 29 commits. 2.17.2285.102 - 2.17.2287.102 / 2016-01-01 - 2016-01-02 Summary of changes between 2.17.2285.102 and 2.17.2287.102 as follows. Third party libraries: None. Build related changes: None. Major changes: None. Fixed issues: None. Total commits: 4 commits. 2.17.2241.102 - 2.17.2284.102 / 2015-11-15 - 2015-12-31 Summary of changes between 2.17.2241.102 and 2.17.2284.102 as follows. Third party libraries: fontTools: 5ba7d98 -> 8724513 Build related changes: Reference Dockerfile for Fedora now uses Fedora 23 base image. Default SDKROOT for OS X build is switched from macosx10.8 to macosx10.9. Major changes: CalculatorRewriter is now triggered not only by inputs end with = but also by inputs start with =. For instance, now =1+1 triggers CalculatorRewriter. See the commit message of 5d423b0b and its unittests as for how it works. Performance improvements in LOUDS. See commits 3591f5e7 and cac14650 for details. Fixed issues: #317: session_handler_scenario_test is flaky in Linux build on Travis-CI #341: 1d*= should not trigger language-aware rewriter Total commits: 48 commits.
TritonDataCenter · May 16, 2016 · bd9148d · bd9148d
1 parent 3a93d0c
commit bd9148d
Show file tree

Hide file tree

Showing 41 changed files with 409 additions and 560 deletions.
diff --git a/inputmethod/ibus-mozc/Makefile b/inputmethod/ibus-mozc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2016/03/05 11:28:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2016/05/16 11:51:49 ryoon Exp $
 
 PKGNAME=	ibus-${DISTNAME}
-PKGREVISION=	2
 
 INSTALLATION_DIRS+=	libexec share/ibus share/ibus/component \
 			share/ibus-mozc
@@ -13,7 +12,7 @@ DEPENDS+=	mozc-tool-[0-9]*:../../inputmethod/mozc-tool
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
+		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \
 			unix/ibus/ibus.gyp:ibus_mozc_lib \
 			unix/ibus/ibus.gyp:ibus_mozc
 

diff --git a/inputmethod/mozc-elisp/Makefile b/inputmethod/mozc-elisp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2016/03/05 11:28:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2016/05/16 11:51:49 ryoon Exp $
 #
 
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION=	2
 CATEGORIES=	inputmethod editors
 
 EMACS_MODULES=	base leim

diff --git a/inputmethod/mozc-renderer/Makefile b/inputmethod/mozc-renderer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2016/03/05 11:28:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2016/05/16 11:51:49 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-renderer-/}
-PKGREVISION=	2
 
 CONFLICTS+=	ibus-mozc<=1.13.1651.102
 
@@ -12,7 +11,7 @@ DEPENDS+=	mozc-server-[0-9]*:../../inputmethod/mozc-server
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
+		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \
 			renderer/renderer.gyp:mozc_renderer
 
 do-install:

diff --git a/inputmethod/mozc-server/Makefile b/inputmethod/mozc-server/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.25 2016/03/05 11:28:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.26 2016/05/16 11:51:49 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION=	2
 
 INSTALLATION_DIRS+=	libexec
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \
-		${_MAKE_JOBS} \
+		${PYTHONBIN} build_mozc.py build \
+		-c ${MOZC_BUILD_MODE} \
 			server/server.gyp:mozc_server
 
 do-install:

diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2016/02/25 13:43:53 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.24 2016/05/16 11:51:49 ryoon Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -7,27 +7,23 @@
 # used by inputmethod/uim-mozc/Makefile
 #
 
-DISTNAME=	mozc-2.17.2116.102
+DISTNAME=	mozc-2.17.2313.102
 CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
-GITHUB_PROJECT=	mozc
-GITHUB_TAG=	fd0f5b347d35fe287f4cc9be49f650c87f82ba03
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://github.com/google/mozc/
 COMMENT=	Japanese inputmethod Mozc engine for IBus
 LICENSE=	modified-bsd
 
-USAGE_DICT=	usage_dict-rev10.txt
-UIM_MOZC=	uim-mozc-318.0562676
-DISTFILES+=	${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} \
-		${USAGE_DICT} \
+UIM_MOZC=	uim-mozc-321.3ea28b1
+DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} \
 		${UIM_MOZC}.tar.xz
-SITES.${USAGE_DICT}=		${MASTER_SITE_LOCAL}
 SITES.${UIM_MOZC}.tar.xz=	${MASTER_SITE_SOURCEFORGE:=pnsft-aur/}
 
 EXTRACT_USING=	bsdtar
-WRKSRC=		${WRKDIR}/mozc-${GITHUB_TAG}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/mozc-server/distinfo
 PATCHDIR=	${.CURDIR}/../../inputmethod/mozc-server/patches
@@ -70,11 +66,6 @@ OSDEST.NetBSD=	bsd
 
 MOZC_BUILD_MODE=	Release # or Debug
 
-pre-configure:
-	mkdir -p ${WRKSRC}/third_party/japanese_usage_dictionary
-	cp ${WRKDIR}/${USAGE_DICT} \
-		${WRKSRC}/third_party/japanese_usage_dictionary/usage_dict.txt
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		GYP_DEFINES="use_libprotobuf=1" \

diff --git a/inputmethod/mozc-server/distinfo b/inputmethod/mozc-server/distinfo
@@ -1,53 +1,45 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 22:13:37 agc Exp $
+$NetBSD: distinfo,v 1.19 2016/05/16 11:51:49 ryoon Exp $
 
-SHA1 (mozc-2.17.2116.102-fd0f5b347d35fe287f4cc9be49f650c87f82ba03.tar.gz) = bb35db84e85bbcf413c36dc2a0d05d8af3f483e2
-RMD160 (mozc-2.17.2116.102-fd0f5b347d35fe287f4cc9be49f650c87f82ba03.tar.gz) = d24b1e1caf00a919620bf6da0855d137a41cb82e
-SHA512 (mozc-2.17.2116.102-fd0f5b347d35fe287f4cc9be49f650c87f82ba03.tar.gz) = 30869120056e470d01af09e99ac095812aaa1a514c1f92208f0fca89af7d69e6778315bf1aa49c7f1912792b9e710f802d6a7fb06bb022f53ad48091951911a2
-Size (mozc-2.17.2116.102-fd0f5b347d35fe287f4cc9be49f650c87f82ba03.tar.gz) = 59322409 bytes
-SHA1 (uim-mozc-318.0562676.tar.xz) = 5cd298aaac5afd7ff8882453e3e8fa698c2c5aa1
-RMD160 (uim-mozc-318.0562676.tar.xz) = 7b93efa2ed2710d5098b1b6b81c0fd195645857b
-SHA512 (uim-mozc-318.0562676.tar.xz) = 85585f9acfb3636bf0a0a903f3da812a3f739a3fe50e7d8a7172fe85218bb5e599d22c08fd31aed2c9279d8cd36a2c177c3543e33272423a2881a403eb1b34b3
-Size (uim-mozc-318.0562676.tar.xz) = 24316 bytes
-SHA1 (usage_dict-rev10.txt) = 174fd3073422deb5f7b3740b1c8ea6d52a077c25
-RMD160 (usage_dict-rev10.txt) = 2c70d0c6c46bff422108e3ce617a6eebc311843d
-SHA512 (usage_dict-rev10.txt) = 2032cfcd8f985c9d2a4fab12bc0e6e505d30bf94eee3df930a57bb35ebc037684d238ab9a0d1dc1625acb950f626cd0201c5f599a852115c23e582b81f171d4a
-Size (usage_dict-rev10.txt) = 219146 bytes
-SHA1 (patch-base_base.gyp) = 437fa7ef6c84448a2a8fb049af773ab9df64dc81
-SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191
-SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b
-SHA1 (patch-base_logging.cc) = 96ee9d1426ef1cf946a00fb15c9754603ab15bb8
-SHA1 (patch-base_mutex.cc) = aed8588d4ff7b057fed072097ef09ddbc2696d31
-SHA1 (patch-base_mutex.h) = 6c3c8f0845f0fdad815c4877026894000d5eac2c
-SHA1 (patch-base_password__manager.cc) = f16982447f54e397d1aa103260d8f4d10aa76f96
-SHA1 (patch-base_port.h) = 953b1f0d6101d31eded3bba9665824b726d36b58
-SHA1 (patch-base_process.cc) = abdd6a955e87506972e7f71fd4bc3a300f49b304
-SHA1 (patch-base_run__level.cc) = ead96536246093bd3d44f59a80085da2f39904e8
-SHA1 (patch-base_system__util.cc) = f3ef575a15cd518fe7d29264b39f775ccf502802
-SHA1 (patch-base_util.cc) = c473cb595535075b53c9c235fc28f5e7da26d087
-SHA1 (patch-build__mozc.py) = 2e5448bb1bc07cdf9410ce1adf918416a1302db4
+SHA1 (mozc-2.17.2313.102.tar.xz) = c4a010b0a5ca47b589af4dbd1c4056e26989286a
+RMD160 (mozc-2.17.2313.102.tar.xz) = 59eabd43ec34926750c00e184eefd1a4dff98b48
+SHA512 (mozc-2.17.2313.102.tar.xz) = 96492296d168496c3c21228c7b374aa3dc55d42399455cd52eab06d8ea4ed2a25d34dabb484de98edd55db2a8b4321158bfd0cb9be68a2216e1ed5e239aae3fb
+Size (mozc-2.17.2313.102.tar.xz) = 47600492 bytes
+SHA1 (uim-mozc-321.3ea28b1.tar.xz) = 22b7c2a5b0a7fef778ee72ebe5873a75e879d26b
+RMD160 (uim-mozc-321.3ea28b1.tar.xz) = 30d160d02a39065e4bc34968fbe6232018b0b202
+SHA512 (uim-mozc-321.3ea28b1.tar.xz) = b28f4d207a52c208694371dbc550ac5022a29c5870b8d856bca8052106d8be88ab8d066bdc6d895ac6fa9f350ce6be16d638603e46058f9528691f97cb86d054
+Size (uim-mozc-321.3ea28b1.tar.xz) = 24400 bytes
+SHA1 (patch-base_clock.cc) = 996d2ca52301d53ff0b23b1d1ee8a7370621782a
+SHA1 (patch-base_cpu__stats.cc) = c5c22b9aecadfc92832f990115879ef4625d6b37
+SHA1 (patch-base_logging.cc) = 2a119d02f959da09792af142e2cd6d1341750333
+SHA1 (patch-base_mutex.cc) = 0aaf0e317b2110008d1e331eff760ea532fbe0c0
+SHA1 (patch-base_mutex.h) = cf12a1574d28dd612820578560a76b3b8ab6e27d
+SHA1 (patch-base_password__manager.cc) = 4883771e3942864d26a5c7c6f3b8fce6bf61c9f0
+SHA1 (patch-base_port.h) = 89ff9a614a86cb53c7047c244fb491a7bce3e64c
+SHA1 (patch-base_process.cc) = b6a9cbb24a481364f3fea1c900f6d455a2e55d10
+SHA1 (patch-base_run__level.cc) = 3475e4a8ce01237fd9abda86f6f495def0e42d3b
+SHA1 (patch-base_system__util.cc) = 6ea56e6a8c05ff705e702a475f3eefce57d3ab94
+SHA1 (patch-build__mozc.py) = 72740d9adbd8728ad88affe30f5201f71805111c
 SHA1 (patch-build__tools_mozc__version.py) = a6ff8a82b1328086b7d758f73a7d3c31e87bccc9
-SHA1 (patch-build__tools_util.py) = 6416884ba288d60eb8e558e8c5de7ef6e538b82e
-SHA1 (patch-client_client.cc) = 7ca43dde3f207331005599653c6520667e3ca93c
-SHA1 (patch-config_stats__config__util__test.cc) = db51e6619c5c04ac8fa50890825206ea922dccf2
-SHA1 (patch-gui_base_locale__util.cc) = 7d1e9cf3c2c36590298496471a97b8c32010a30b
-SHA1 (patch-gui_config__dialog_config__dialog.cc) = aae18b7ea36fd5ff5758625875a04634ffdfd68a
-SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 00a6e4bb2c07e3340e188f108f0285a3aa2aceb9
+SHA1 (patch-build__tools_util.py) = c7daafd5ee0f8f5dcb1130a6d230f9821c3a3a12
+SHA1 (patch-client_client.cc) = 014ab13164e17a490896303bd2ad2eab2589eae9
+SHA1 (patch-config_stats__config__util__test.cc) = 0d1fc3b9050f489a615dd0ad42c41faf2096c282
+SHA1 (patch-gui_base_locale__util.cc) = 67159274882110f2e54953ab5d059c8357aeadec
+SHA1 (patch-gui_config__dialog_config__dialog.cc) = 643f777be01c29070d317a179caf3b646a95033a
+SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 462ff2b33303c63709d72ff5cfabc5fe2f4e383a
 SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 3652713857d03f847108952f2994ee44bfe62608
-SHA1 (patch-gui_gui.gyp) = 82377e902935e1fccb79056fa94dd4ad4f8ff29d
 SHA1 (patch-gui_qt__libraries.gypi) = e92be78947dcf66211c80169b864b7c9d057b3db
-SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 34a7cd2a99a0082f490c3f623c7c6a856c984f8b
-SHA1 (patch-gyp_common.gypi) = 64d8c387f5afbce02b30a42b27ade76f75224f05
-SHA1 (patch-handwriting_handwriting.gyp) = 0261aef287b34f4a3c8424fb1af44720ae00a85c
-SHA1 (patch-handwriting_zinnia.gyp) = d09ac17d17dabdbfdcb7c623193a5c72dbcacfbc
-SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2
+SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = bd9db643c207f9810d33d596e050453c18593497
+SHA1 (patch-gyp_common.gypi) = bad5e98e6a110e4b04a8c2f8dcb813d9ccf626e5
+SHA1 (patch-handwriting_zinnia.gyp) = 8e0a5d398124666000c3fb84c50616460ddb5b33
+SHA1 (patch-handwriting_zinnia__handwriting.cc) = 8d7950a9c98408df9e78550515aa9471eb277bbf
 SHA1 (patch-ipc_ipc__path__manager.cc) = c96fbac6d1d81ddd7f999c30bdc2539ee2df2564
 SHA1 (patch-ipc_ipc__path__manager__test.cc) = 90ea81daef93dc1ad5cee792ced26a9a2939fbdf
 SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
-SHA1 (patch-ipc_unix__ipc.cc) = d821deb2f38bf77bf6b364eb31d419c0a86c1a7f
+SHA1 (patch-ipc_unix__ipc.cc) = 112397bc3fb6b04a816677f891f75e4c67eb59c1
 SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea
 SHA1 (patch-protobuf_protobuf.gyp) = 35059f0e24a9d47ca5224a892de84890d72acdf4
-SHA1 (patch-session_session.cc) = 0562f8646dc6f68e180d8ae98f00eeb0364fc473
-SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465
-SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95
-SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 566d567ae4f911766309e035697a23350f24bbf5
+SHA1 (patch-session_session.cc) = 21ce71225ea6885bff7160aed832974ef34876f2
+SHA1 (patch-session_session__test.cc) = a3e208c37078b223d4ea0fb6fb8a603f2f5fee19
+SHA1 (patch-third__party_protobuf_post__process__dist.sh) = 790c167c3c62a1f8360d130accf7ed7280baf9b5
+SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 1ac5fb40b774dc751c2d01a13ca55b6a995eed34
 SHA1 (patch-unix_ibus_ibus.gyp) = 2fc9309216270846f7ce33d1854d9d76e65e6e96
diff --git a/inputmethod/mozc-server/patches/patch-base_base.gyp b/inputmethod/mozc-server/patches/patch-base_base.gyp
diff --git a/inputmethod/mozc-server/patches/patch-base_clock.cc b/inputmethod/mozc-server/patches/patch-base_clock.cc
@@ -0,0 +1,22 @@
+$NetBSD: patch-base_clock.cc,v 1.1 2016/05/16 11:51:49 ryoon Exp $
+
+--- base/clock.cc.orig	2016-05-15 08:11:10.000000000 +0000
++++ base/clock.cc
+@@ -124,7 +124,7 @@ class ClockImpl : public ClockInterface 
+     mach_timebase_info(&timebase_info);
+     return static_cast<uint64>(
+         1.0e9 * timebase_info.denom / timebase_info.numer);
+-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_NETBSD)
+     return 1000000uLL;
+ #else  // platforms (OS_WIN, OS_MACOSX, OS_LINUX, ...)
+ #error "Not supported platform"
+@@ -141,7 +141,7 @@ class ClockImpl : public ClockInterface 
+     return static_cast<uint64>(timestamp.QuadPart);
+ #elif defined(OS_MACOSX)
+     return static_cast<uint64>(mach_absolute_time());
+-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_NETBSD)
+     uint64 sec;
+     uint32 usec;
+     GetTimeOfDay(&sec, &usec);
diff --git a/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc b/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc
@@ -1,46 +1,46 @@
-$NetBSD: patch-base_cpu__stats.cc,v 1.1 2013/04/29 09:52:16 ryoon Exp $
+$NetBSD: patch-base_cpu__stats.cc,v 1.2 2016/05/16 11:51:49 ryoon Exp $
 
---- base/cpu_stats.cc.orig	2012-08-31 05:37:06.000000000 +0000
+--- base/cpu_stats.cc.orig	2016-05-15 08:11:10.000000000 +0000
 +++ base/cpu_stats.cc
 @@ -123,13 +123,13 @@ float CPUStats::GetSystemCPULoad() {
 
  #endif  // OS_MACOSX
 
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_NETBSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_NETBSD)
    // NOT IMPLEMENTED
    // TODO(taku): implement Linux version
    // can take the info from /proc/stats
    const uint64 total_times = 0;
    const uint64 cpu_times = 0;
--#endif  // OS_LINUX
-+#endif  // OS_LINUX || OS_NETBSD
+-#endif  // OS_LINUX || OS_ANDROID || OS_NACL
++#endif  // OS_LINUX || OS_ANDROID || OS_NACL || OS_NETBSD
 
    return UpdateCPULoad(total_times,
                         cpu_times,
 @@ -178,11 +178,11 @@ float CPUStats::GetCurrentProcessCPULoad
        TimeValueTToInt64(task_times_info.system_time);
  #endif  // OS_MACOSX
 
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_NETBSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_NETBSD)
    // not implemented
    const uint64 total_times = 0;
    const uint64 cpu_times = 0;
--#endif  // OS_LINUX
-+#endif  // OS_LINUX || OS_NETBSD
+-#endif  // OS_LINUX || OS_ANDROID || OS_NACL
++#endif  // OS_LINUX || OS_ANDROID || OS_NACL || OS_NETBSD
 
    return UpdateCPULoad(total_times,
                         cpu_times,
 @@ -210,9 +210,9 @@ size_t CPUStats::GetNumberOfProcessors()
    return static_cast<size_t>(basic_info.avail_cpus);
  #endif  // OS_MACOSX
 
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_NETBSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_NETBSD)
    // Not implemented
    return 1;
 -#endif  // OS_LINUX
-+#endif  // OS_LINUX || OS_NETBSD
++#endif  // OS_LINUX || OS_ANDROID || OS_NACL || OS_NETBSD
  }
  }  // namespace mozc
diff --git a/inputmethod/mozc-server/patches/patch-base_iconv.cc b/inputmethod/mozc-server/patches/patch-base_iconv.cc
diff --git a/inputmethod/mozc-server/patches/patch-base_logging.cc b/inputmethod/mozc-server/patches/patch-base_logging.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-base_logging.cc,v 1.3 2013/09/15 12:30:23 joerg Exp $
+$NetBSD: patch-base_logging.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
 
---- base/logging.cc.orig	2013-08-28 05:26:13.000000000 +0000
+--- base/logging.cc.orig	2016-05-15 08:11:10.000000000 +0000
 +++ base/logging.cc
 @@ -61,6 +61,10 @@
- #include "base/system_util.h"
- #include "base/util.h"
+ #include "base/mutex.h"
+ #include "base/singleton.h"
 
 +#if defined(OS_NETBSD)
 +#include <lwp.h>
@@ -13,22 +13,22 @@
  DEFINE_bool(colored_log, true, "Enables colored log messages on tty devices");
  DEFINE_bool(logtostderr,
              false,
-@@ -110,7 +114,7 @@ string Logging::GetLogMessageHeader() {
+@@ -102,7 +106,7 @@ string Logging::GetLogMessageHeader() {
             "%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d %u "
- #if defined(__native_client__)
+ #if defined(OS_NACL)
             "%p",
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_NETBSD)
             "%lu",
  #elif defined(OS_MACOSX) && defined(__LP64__)
             "%llu",
-@@ -137,6 +141,9 @@ string Logging::GetLogMessageHeader() {
+@@ -129,6 +133,9 @@ string Logging::GetLogMessageHeader() {
             ::getpid(),
             // pthread_self() returns __nc_basic_thread_data*.
             static_cast<void*>(pthread_self())
 +#elif defined(OS_NETBSD)
-+	   ::getpid(),
-+	   (unsigned long)_lwp_self()
++          ::getpid(),
++          (unsigned long)_lwp_self()
  #else  // = OS_LINUX
             ::getpid(),
             // It returns unsigned long.