mozc: update to 2.20.2673.102.

pkgsrc changes: - switch to using qt5 (to follow upstream) - handle ${PREFIX} in more places - fix package COMMENT (remove "for IBus") - GCC_REQD 4.7 for c++11 - add patch comments See PR pkg/52689 for more details. Upstream changes: (from https://github.com/google/mozc/blob/master/docs/release_history.md) Summary of changes between 2.19.2644.102 and 2.20.2673.102 as follows. Third party libraries: None. Build related changes: --qtver GYP build option was removed (280e38f). Mozc for macOS now uses macOS 10.11 SDK by default (b2a74bb). Major changes: src/data/installer/credits_ja.html was removed (2ec6c8f). Mozc for macOS now generates 64-bit executables. 32-bit machine is no longer supported on macOS. Mozc for Android now has more translations (d914458). Fixed issues: TritonDataCenter#187: build_mozc.py always generates 32 bit binaries on 64 bit OSX TritonDataCenter#327: Switch to Qt5 from Qt4 TritonDataCenter#348: DirectWrite may fail to render text in certain enviromnents TritonDataCenter#391: ImportError: gen_zip_code_seed.py TritonDataCenter#399: OK/Cancel buttons on Mozc key binding editor dialog cannot be clicked on Windows TritonDataCenter#400: Close icon on GUI dialogs do not work on Windows Total commits: 30 commits. Summary of changes between 2.18.2613.102 and 2.19.2643.102 as follows. Third party libraries: protobuf: e8ae137 -> c44ca26 Dropped dependency on fonttools Build related changes: --qtver=5 GYP build option is implicitly assumed on macOS and Linux builds (f76c304). On Windows, --qtver=4 is still the default. Major changes: Mozc for macOS now supports 10.12 as a runtime environment. Mozc for Android now uses on-device font to render keytop icons (f5dcad). Fixed issues: TritonDataCenter#263: Incorrect position in voiced sound marks on the key pad in Android TritonDataCenter#384: HUAWEI P9 lite does not show MozcView. TritonDataCenter#388: Having multiple abbreviation user dictionary entries with the same reading should be supported TritonDataCenter#389: Emoticon user dictionary entry should not be treated a content word Total commits: 39 commits. Summary of changes between 2.17.2532.102 and 2.18.2612.102 as follows. Third party libraries: protobuf: d5fb408 -> e8ae137 GYP: e2e928b -> 4ec6c4e breakpad: d2904bb -> 85b27e4 Dropped dependency on zlib Build related changes: Renamed src/mozc_version_template.txt to src/data/version/mozc_version_template.bzl Reference build environment now uses Ubuntu 14.04.5 (a7cbf72) Reference build environment now uses Ninja 1.7.1 (d2bc62b) Removed --android_compiler GYP option (5ce7fa6) Android build requires Android NDK r12b (5ce7fa6) Major changes: Improved Store Apps compatibility on Windows (0488082) Fixed issues: NPE in UserDictionaryToolActivity.onPostResume on Android (09b47c3) TritonDataCenter#273: Compilation errors in Android arm64 and mips64 build TritonDataCenter#373: Unexpected size bloat of the APK TritonDataCenter#374: Duplicate candidates after Undo TritonDataCenter#375: 90- is suggested from 090- TritonDataCenter#376: Suggestion-only user dictionary entry may not work TritonDataCenter#377: Abbreviation user dictionary entry may not work TritonDataCenter#378: Suppression word may not work TritonDataCenter#379: Single character noun user dictionary entry may not work TritonDataCenter#380: Dependency on dictionary/pos_matcher.h from session/session_server.cc is missing in GYP rules TritonDataCenter#382: Fix typo Total commits: 84 commits. Summary of changes between 2.17.2405.102 and 2.17.2531.102 as follows. Third party libraries: protobuf: 1a59a71 -> d5fb408 Build related changes: Building Mozc for Windows requires Visual Studio 2015 update 3. --qtdir option is no longer supported in Linux desktop build (d003076). Major changes: Updated system dictionary. Removed several Shift-JIS-based normalizations on Windows (26241b0). Mozc for Windows requires SSE2 even on 32-bit environment. Mozc for Windows supports Windows 7 SP1 and later only. Mozc for macOS supports macOS 10.9 and later only. Mozc for desktop platforms (Windows, macOS, desktop Linux) supports Qt5 behind --qtver=5 GYP option. Fixed issues: Fix OOM when importing too large dictionary file on Android (5c859ae) TritonDataCenter#298: Fix NPE on Samsung devices on showing toast TritonDataCenter#315: Switch to Visual C++ 2015 TritonDataCenter#372: Discontinue the support of Windows Vista Total commits: 128 commits. Summary of changes between 2.17.2355.102 and 2.17.2404.102 as follows. Third party libraries: protobuf: 172019c -> 1a59a71 Build related changes: Building Mozc requires protobuf 3.0 or later. --android_stl GYP option is removed in Android build. You cannot use GNU STL to build Mozc for Android anymore. Major changes: None. Fixed issues: TritonDataCenter#369: Unexpected software keyboard layout can be chosen TritonDataCenter#370: Mozc keeps crashing on Android N Developer Preview 5 TritonDataCenter#371: Shortcut word in personal dictionary should not be used for multi segment conversion Total commits: 50 commits. Summary of changes between 2.17.2323.102 and 2.17.2354.102 as follows. Third party libraries: None. Build related changes: None. Major changes: 2.17.2323.102 and later commits in OSS repository preserve the original CL commit date in Google internal repository. Consider to specify --topo-order option to git log to see commits in the actual commit order. Multiple performance improvements in Android. Fixed issues: None. Total commits: 32 commits. Summary of changes between 2.17.2314.102 and 2.17.2322.102 as follows. Third party libraries: googletest: 1d53731 -> 82b11b8 WTL: 9.0.4140 -> 9.1.5321 Build related changes: Building macOS binaries now requires Ninja instead of xcodebuild. Major changes: None. Fixed issues: TritonDataCenter#247: Use ninja to build Mac binaries TritonDataCenter#355: Native resource leak due to the missing pthread_detach call in mozc::Thread::Detach TritonDataCenter#361: ImmSetCandidateWindow() with CFS_EXCLUDE isn't supported on Win Vista and Win7 Total commits: 15 commits.
wiedi · Dec 17, 2017 · e213ab1 · e213ab1
1 parent f890e4b
commit e213ab1
Show file tree

Hide file tree

Showing 48 changed files with 400 additions and 293 deletions.
diff --git a/inputmethod/ibus-mozc/Makefile b/inputmethod/ibus-mozc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.36 2017/12/17 14:15:44 tsutsui Exp $
 
 PKGNAME=	ibus-${DISTNAME}
-PKGREVISION=	7
 
 INSTALLATION_DIRS+=	libexec share/ibus share/ibus/component \
 			share/ibus-mozc

diff --git a/inputmethod/mozc-elisp/Makefile b/inputmethod/mozc-elisp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.26 2017/12/17 14:15:43 tsutsui Exp $
 #
 
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION=	7
 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.16 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.17 2017/12/17 14:15:43 tsutsui Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-renderer-/}
-PKGREVISION=	7
 
 CONFLICTS+=	ibus-mozc<=1.13.1651.102
 

diff --git a/inputmethod/mozc-server/Makefile b/inputmethod/mozc-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2017/08/24 20:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.34 2017/12/17 14:15:43 tsutsui Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION=	7
 
 INSTALLATION_DIRS+=	libexec
 

diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2016/07/09 13:03:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.26 2017/12/17 14:15:43 tsutsui Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -7,14 +7,14 @@
 # used by inputmethod/uim-mozc/Makefile
 #
 
-DISTNAME=	mozc-2.17.2313.102
+DISTNAME=	mozc-2.20.2673.102
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	https://github.com/google/mozc/
-COMMENT=	Japanese inputmethod Mozc engine for IBus
+COMMENT=	Japanese inputmethod Mozc engine
 LICENSE=	modified-bsd
 
 UIM_MOZC=	uim-mozc-321.3ea28b1
@@ -34,6 +34,7 @@ BUILD_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	gmake pkg-config
+GCC_REQD+=	4.7	# for c++11
 
 OPENSSL_CFLAGS=		-I${BUILDLINK_PREFIX.openssl}/include
 OPENSSL_INC=		-I${BUILDLINK_PREFIX.openssl}/include
@@ -43,15 +44,13 @@ OPENSSL_LIBS=		-lssl -lcrypto
 SUBST_CLASSES+=		gyp
 SUBST_STAGE.gyp=	pre-configure
 SUBST_MESSAGE.gyp=	Fix gyp defaults
-SUBST_FILES.gyp+=	base/base.gyp
 SUBST_FILES.gyp+=	base/process.cc
-SUBST_FILES.gyp+=	base/system_util.cc
+SUBST_FILES.gyp+=	gyp/directories.gypi
 SUBST_FILES.gyp+=	handwriting/zinnia_handwriting.cc
-SUBST_FILES.gyp+=	unix/ibus/gen_mozc_xml.py
 SUBST_FILES.gyp+=	unix/ibus/ibus.gyp
-SUBST_FILES.gyp+=	gyp/common.gypi
+SUBST_FILES.gyp+=	unix/ibus/path_util.cc
 SUBST_VARS.gyp+=	OPENSSL_CFLAGS OPENSSL_INC OPENSSL_LDFLAGS OPENSSL_LIBS
-SUBST_VARS.gyp+=	PREFIX QTDIR
+SUBST_VARS.gyp+=	PREFIX
 
 # To disable flock(1) in link stage.
 ALL_ENV+=	LINK=${CXX}
@@ -78,7 +77,7 @@ do-configure:
 .include "../../inputmethod/zinnia/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/mozc-server/distinfo b/inputmethod/mozc-server/distinfo
@@ -1,45 +1,49 @@
-$NetBSD: distinfo,v 1.19 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: distinfo,v 1.20 2017/12/17 14:15:43 tsutsui Exp $
 
-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 (mozc-2.20.2673.102.tar.xz) = 9cedf4d392593e04755fa44afd79cd40bb80b9d1
+RMD160 (mozc-2.20.2673.102.tar.xz) = 723fef550d88c5a4dc33f2ec9c8d7ee694e60d64
+SHA512 (mozc-2.20.2673.102.tar.xz) = 06ce43b0fa6d5a696cddafc97cd84bfa4482204ffb3793a6d3811dd50c4ed859289394ee471987b20fd637768bdfcc2f0289993b88e24c141c93514229dfc402
+Size (mozc-2.20.2673.102.tar.xz) = 44187096 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_base.gyp) = d8d9abc0da196f0573ad645937812710c7c67746
+SHA1 (patch-base_clock.cc) = 0fa3f4b3bcd34283870a317032172745dcf90eaa
+SHA1 (patch-base_cpu__stats.cc) = c55ee389eced767e875553937a80c8ba6c6abd2d
+SHA1 (patch-base_logging.cc) = 5dddcbbf4445e91e6f8ab41999c938e0491c05c4
+SHA1 (patch-base_mutex.cc) = 9563ff1563eef8dc73417454b2ba06322a2cd76d
 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) = 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_qt__libraries.gypi) = e92be78947dcf66211c80169b864b7c9d057b3db
-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-base_password__manager.cc) = 8216bc58d398fae4935e99fe5d11febbee380644
+SHA1 (patch-base_port.h) = 775b8a5afe2336218fc936d009bae9f6b13a4379
+SHA1 (patch-base_process.cc) = 1cba930ffdf14694fa55e473c2e94ee2cf523de4
+SHA1 (patch-base_run__level.cc) = 849a6a6727463305c2fdca4eed0fb4a4cac10567
+SHA1 (patch-base_system__util.cc) = c4d81bb3d4633a11d969520af610c3e10417ab4e
+SHA1 (patch-base_thread.cc) = 2cc63c1d369f842a29e07311364c2a3537f3b428
+SHA1 (patch-build__mozc.py) = 5fd1e328c9a35cc01a507566afeda1179657e685
+SHA1 (patch-build__tools_mozc__version.py) = 7130eac051d0d4f78da887aedd669fc4713dbd62
+SHA1 (patch-build__tools_util.py) = 5ca614adf2453fcc33c18cda74c0d9b2e4f6bc21
+SHA1 (patch-client_client.cc) = f1eb1860c41a97c82a338f74acdcf0ed3477b6da
+SHA1 (patch-config_stats__config__util__test.cc) = 3514f04a921908795c03d0e8685135297dc9e2af
+SHA1 (patch-gui_config__dialog_config__dialog.cc) = de2750a6bf99c4e38983cf5322adae8c46ca45d6
+SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 529e902c146907d3a91181bad3822bbbec69b6b7
+SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = cae617cc8e324b0f93adc1e76632a018530cd2c7
+SHA1 (patch-gui_qt__libraries.gypi) = ceb8d5b15d4cd5b2d907406f02413290bd4ab652
+SHA1 (patch-gui_qt__moc.gypi) = e3d42e61b35012cda10da13aa03cee67786e171c
+SHA1 (patch-gui_qt__rcc.gypi) = d38a849fe8e81672eb441a41936f454d8e45ff5c
+SHA1 (patch-gui_qt__uic.gypi) = 7dd69ee109e81f0e70f2866b77555412518b4844
+SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 6e247fcab5d570b733365b57c5a5d72a021dd16f
+SHA1 (patch-gyp_common.gypi) = 13cd5010a6f3ed314a94248144657955f8bbbe72
+SHA1 (patch-gyp_directories.gypi) = 6504d8b43f83be3908b39a5e51598c2aba0dffd9
+SHA1 (patch-handwriting_zinnia.gyp) = b59e546cb9b8b91dcd627885e1853e8ba8dead46
+SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd87817aabcd290c9fb25f3ebe4f36ce670ae44b
+SHA1 (patch-ipc_ipc__path__manager.cc) = 533d37b3802385873450ebeef561425aef7d9c63
+SHA1 (patch-ipc_ipc__path__manager__test.cc) = 1b83b513383f184f5ab5a56cce734b7934998533
 SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
-SHA1 (patch-ipc_unix__ipc.cc) = 112397bc3fb6b04a816677f891f75e4c67eb59c1
-SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea
-SHA1 (patch-protobuf_protobuf.gyp) = 35059f0e24a9d47ca5224a892de84890d72acdf4
-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
+SHA1 (patch-ipc_unix__ipc.cc) = 25107c2e84844ecaa3445efb48cc3f2795579dec
+SHA1 (patch-net_net.gyp) = 61353724533f9239f4c58fa37f0a8fb2eb5552c3
+SHA1 (patch-session_session.cc) = 773017ac54e79239f6734a124f457b0b81bb1ced
+SHA1 (patch-session_session__test.cc) = 99165b29555844a40d30cf5554cc5c66773b70ed
+SHA1 (patch-third__party_protobuf_post__process__dist.sh) = 8adc79d5d7eed3cbf406ebcfbd5832b7a050ced6
+SHA1 (patch-unix_ibus_ibus.gyp) = aa2077cf3c379bf9ce33e97abe478540346782ad
+SHA1 (patch-unix_ibus_path__util.cc) = a6aa368d9ce8926e200602fdc370c13e35d5a8cf
diff --git a/inputmethod/mozc-server/patches/patch-base_base.gyp b/inputmethod/mozc-server/patches/patch-base_base.gyp
@@ -0,0 +1,15 @@
+$NetBSD: patch-base_base.gyp,v 1.7 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
+
+--- base/base.gyp.orig	2017-11-02 13:32:45.000000000 +0000
++++ base/base.gyp
+@@ -141,7 +141,7 @@
+             },
+           },
+         }],
+-        ['target_platform=="Linux" and server_dir!=""', {
++        ['(target_platform=="Linux" or target_platform=="NetBSD") and server_dir!=""', {
+           'defines': [
+             'MOZC_SERVER_DIRECTORY="<(server_dir)"',
+           ],
diff --git a/inputmethod/mozc-server/patches/patch-base_clock.cc b/inputmethod/mozc-server/patches/patch-base_clock.cc
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_clock.cc,v 1.1 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_clock.cc,v 1.2 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/clock.cc.orig	2016-05-15 08:11:10.000000000 +0000
 +++ base/clock.cc

diff --git a/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc b/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_cpu__stats.cc,v 1.2 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_cpu__stats.cc,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/cpu_stats.cc.orig	2016-05-15 08:11:10.000000000 +0000
 +++ base/cpu_stats.cc

diff --git a/inputmethod/mozc-server/patches/patch-base_logging.cc b/inputmethod/mozc-server/patches/patch-base_logging.cc
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_logging.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_logging.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/logging.cc.orig	2016-05-15 08:11:10.000000000 +0000
 +++ base/logging.cc

diff --git a/inputmethod/mozc-server/patches/patch-base_mutex.cc b/inputmethod/mozc-server/patches/patch-base_mutex.cc
@@ -1,6 +1,8 @@
-$NetBSD: patch-base_mutex.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_mutex.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
 
---- base/mutex.cc.orig	2016-05-15 08:11:10.000000000 +0000
+* NetBSD support
+
+--- base/mutex.cc.orig	2017-11-02 13:32:45.000000000 +0000
 +++ base/mutex.cc
 @@ -53,7 +53,7 @@ namespace mozc {
 
@@ -19,8 +21,8 @@
 +#endif  // OS_LINUX || OS_ANDROID || OS_NACL || OS_NETBSD
 
  // Use OSAtomicCompareAndSwapInt on Mac OSX
- // http://developer.apple.com/iphone/library/documentation/
-@@ -85,7 +85,7 @@ inline int InterlockedCompareExchange(vo
+ // https://developer.apple.com/library/prerelease/mac/documentation/Darwin/Reference/ManPages/man3/OSAtomicCompareAndSwapInt.3.html
+@@ -84,7 +84,7 @@ inline int InterlockedCompareExchange(vo
    return OSAtomicCompareAndSwapInt(old_value, new_value, target)
        ? old_value : *target;
  }
@@ -29,7 +31,7 @@
 
  }  // namespace
 
-@@ -183,7 +183,7 @@ Mutex::Mutex() {
+@@ -182,7 +182,7 @@ Mutex::Mutex() {
    // PTHREAD_MUTEX_RECURSIVE_NP but Mac OS X 10.5 does not
    pthread_mutexattr_t attr;
    pthread_mutexattr_init(&attr);

diff --git a/inputmethod/mozc-server/patches/patch-base_password__manager.cc b/inputmethod/mozc-server/patches/patch-base_password__manager.cc
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_password__manager.cc,v 1.3 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_password__manager.cc,v 1.4 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/password_manager.cc.orig	2016-05-15 08:11:10.000000000 +0000
 +++ base/password_manager.cc

diff --git a/inputmethod/mozc-server/patches/patch-base_port.h b/inputmethod/mozc-server/patches/patch-base_port.h
@@ -1,19 +1,21 @@
-$NetBSD: patch-base_port.h,v 1.3 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_port.h,v 1.4 2017/12/17 14:15:43 tsutsui Exp $
 
---- base/port.h.orig	2016-05-15 08:11:10.000000000 +0000
+* NetBSD support
+* kludge to build with gcc45
+
+--- base/port.h.orig	2017-11-02 13:32:45.000000000 +0000
 +++ base/port.h
-@@ -56,6 +56,10 @@
+@@ -56,6 +56,9 @@
  #endif  // !OS_ANDROID && !OS_NACL
  #endif  // OS_LINUX
 
 +#ifdef OS_NETBSD
 +#define MOZC_OS_DEFINED
 +#endif  // OS_NETBSD
-+
+ 
  #ifndef MOZC_OS_DEFINED
  #error "OS_XXX (e.g., OS_WIN) must be defined."
- #endif  // !MOZC_OS_DEFINED
-@@ -157,4 +161,9 @@ static const  int64 kint64max  = (( int6
+@@ -154,4 +157,9 @@ static const  int64 kint64max  = (( int6
  #define AS_STRING(x)   AS_STRING_INTERNAL(x)
  #define AS_STRING_INTERNAL(x)   #x
 

diff --git a/inputmethod/mozc-server/patches/patch-base_process.cc b/inputmethod/mozc-server/patches/patch-base_process.cc
@@ -1,8 +1,10 @@
-$NetBSD: patch-base_process.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_process.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
 
---- base/process.cc.orig	2016-05-15 08:11:10.000000000 +0000
+* NetBSD support
+
+--- base/process.cc.orig	2017-11-02 13:32:45.000000000 +0000
 +++ base/process.cc
-@@ -46,12 +46,12 @@
+@@ -44,12 +44,12 @@
  #include "base/mac_process.h"
  #endif  // OS_MACOSX
 
@@ -17,8 +19,8 @@
 
  #include <cstdlib>
  #include <memory>
-@@ -125,12 +125,12 @@ bool Process::OpenBrowser(const string &
-   return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW);
+@@ -96,12 +96,12 @@ bool Process::OpenBrowser(const string &
+   return WinUtil::ShellExecuteInSystemDir(L"open", wurl.c_str(), nullptr);
  #endif
 
 -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
@@ -33,7 +35,7 @@
 
  #ifdef OS_MACOSX
    return MacProcess::OpenBrowserForMac(url);
-@@ -209,7 +209,7 @@ bool Process::SpawnProcess(const string 
+@@ -180,7 +180,7 @@ bool Process::SpawnProcess(const string 
    }
  #endif
 
@@ -42,7 +44,7 @@
    // Do not call posix_spawn() for obviously bad path.
    if (!S_ISREG(statbuf.st_mode)) {
      LOG(ERROR) << "Not a regular file: " << path;
-@@ -232,7 +232,7 @@ bool Process::SpawnProcess(const string 
+@@ -203,7 +203,7 @@ bool Process::SpawnProcess(const string 
    // (www.gnu.org/software/libc/manual/html_node/Heap-Consistency-Checking.html)
    const int kOverwrite = 0;  // Do not overwrite.
    ::setenv("MALLOC_CHECK_", "2", kOverwrite);
@@ -51,7 +53,7 @@
    pid_t tmp_pid = 0;
 
    // Spawn new process.
-@@ -403,7 +403,7 @@ bool Process::LaunchErrorMessageDialog(c
+@@ -374,7 +374,7 @@ bool Process::LaunchErrorMessageDialog(c
    }
  #endif  // OS_WIN
 
@@ -60,7 +62,7 @@
    const char kMozcTool[] = "mozc_tool";
    const string arg = "--mode=error_message_dialog --error_type=" + error_type;
    size_t pid = 0;
-@@ -411,7 +411,7 @@ bool Process::LaunchErrorMessageDialog(c
+@@ -382,7 +382,7 @@ bool Process::LaunchErrorMessageDialog(c
      LOG(ERROR) << "cannot launch " << kMozcTool;
      return false;
    }

diff --git a/inputmethod/mozc-server/patches/patch-base_run__level.cc b/inputmethod/mozc-server/patches/patch-base_run__level.cc
@@ -1,4 +1,6 @@
-$NetBSD: patch-base_run__level.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $
+$NetBSD: patch-base_run__level.cc,v 1.5 2017/12/17 14:15:43 tsutsui Exp $
+
+* NetBSD support
 
 --- base/run_level.cc.orig	2016-05-15 08:11:10.000000000 +0000
 +++ base/run_level.cc