pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/inputmethod mozc: Update to 2.26.4282.100
details: https://anonhg.NetBSD.org/pkgsrc/rev/b84420f41f13
branches: trunk
changeset: 447066:b84420f41f13
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Mon Feb 15 14:50:22 2021 +0000
description:
mozc: Update to 2.26.4282.100
* Use internal protobuf to fix build (more works required).
Changelog:
Not available.
diffstat:
inputmethod/ibus-mozc/Makefile | 3 +-
inputmethod/mozc-elisp/Makefile | 3 +-
inputmethod/mozc-renderer/Makefile | 3 +-
inputmethod/mozc-server/Makefile | 3 +-
inputmethod/mozc-server/Makefile.common | 13 +-
inputmethod/mozc-server/distinfo | 76 +--
inputmethod/mozc-server/patches/patch-base_clock.cc | 24 +-
inputmethod/mozc-server/patches/patch-base_cpu__stats.cc | 48 +-
inputmethod/mozc-server/patches/patch-base_logging.cc | 45 +-
inputmethod/mozc-server/patches/patch-base_mutex.cc | 39 +-
inputmethod/mozc-server/patches/patch-base_mutex.h | 18 -
inputmethod/mozc-server/patches/patch-base_password__manager.cc | 15 +-
inputmethod/mozc-server/patches/patch-base_port.h | 26 +-
inputmethod/mozc-server/patches/patch-base_process.cc | 56 +-
inputmethod/mozc-server/patches/patch-base_run__level.cc | 16 +-
inputmethod/mozc-server/patches/patch-base_system__util.cc | 110 +++-
inputmethod/mozc-server/patches/patch-base_thread.cc | 22 +-
inputmethod/mozc-server/patches/patch-build__mozc.py | 104 +---
inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py | 16 +-
inputmethod/mozc-server/patches/patch-client_client.cc | 20 +-
inputmethod/mozc-server/patches/patch-config.bzl | 19 +
inputmethod/mozc-server/patches/patch-config_stats__config__util__test.cc | 14 +-
inputmethod/mozc-server/patches/patch-dictionary_user__dictionary.cc | 15 -
inputmethod/mozc-server/patches/patch-dictionary_user__dictionary__session.cc | 204 ---------
inputmethod/mozc-server/patches/patch-dictionary_user__dictionary__session__test.cc | 66 ---
inputmethod/mozc-server/patches/patch-dictionary_user__dictionary__storage.cc | 197 ---------
inputmethod/mozc-server/patches/patch-dictionary_user__dictionary__storage.h | 25 -
inputmethod/mozc-server/patches/patch-dictionary_user__dictionary__storage__test.cc | 176 --------
inputmethod/mozc-server/patches/patch-dictionary_user__dictionary__test.cc | 212 ----------
inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc | 22 +-
inputmethod/mozc-server/patches/patch-gui_config__dialog_keybinding__editor.cc | 30 +-
inputmethod/mozc-server/patches/patch-gui_word__register__dialog_word__register__dialog.cc | 29 +-
inputmethod/mozc-server/patches/patch-gyp_common.gypi | 31 +-
inputmethod/mozc-server/patches/patch-gyp_directories.gypi | 17 +-
inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp | 15 -
inputmethod/mozc-server/patches/patch-handwriting_zinnia__handwriting.cc | 15 -
inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc | 10 +-
inputmethod/mozc-server/patches/patch-ipc_named__event.cc | 12 +-
inputmethod/mozc-server/patches/patch-ipc_unix__ipc.cc | 20 +-
inputmethod/mozc-server/patches/patch-net_net.gyp | 15 -
inputmethod/mozc-server/patches/patch-prediction_user__history__predictor.cc | 78 ---
inputmethod/mozc-server/patches/patch-prediction_user__history__predictor.h | 23 -
inputmethod/mozc-server/patches/patch-prediction_user__history__predictor__test.cc | 24 -
inputmethod/mozc-server/patches/patch-renderer_renderer.gyp | 24 +
inputmethod/mozc-server/patches/patch-rewriter_usage__rewriter__test.cc | 24 -
inputmethod/mozc-server/patches/patch-session_session.cc | 34 +-
inputmethod/mozc-server/patches/patch-session_session__test.cc | 50 +-
inputmethod/mozc-server/patches/patch-third__party_abseil-cpp_absl_base_config.h | 15 +
inputmethod/mozc-tool/Makefile | 3 +-
49 files changed, 449 insertions(+), 1630 deletions(-)
diffs (truncated from 2803 to 300 lines):
diff -r 2fb09d02eb1d -r b84420f41f13 inputmethod/ibus-mozc/Makefile
--- a/inputmethod/ibus-mozc/Makefile Mon Feb 15 14:49:41 2021 +0000
+++ b/inputmethod/ibus-mozc/Makefile Mon Feb 15 14:50:22 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2020/11/05 09:08:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2021/02/15 14:50:22 ryoon Exp $
PKGNAME= ibus-${DISTNAME}
-PKGREVISION= 27
INSTALLATION_DIRS+= libexec share/ibus share/ibus/component \
share/ibus-mozc
diff -r 2fb09d02eb1d -r b84420f41f13 inputmethod/mozc-elisp/Makefile
--- a/inputmethod/mozc-elisp/Makefile Mon Feb 15 14:49:41 2021 +0000
+++ b/inputmethod/mozc-elisp/Makefile Mon Feb 15 14:50:22 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2020/11/05 09:08:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.53 2021/02/15 14:50:23 ryoon Exp $
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION= 26
CATEGORIES= inputmethod editors
EMACS_MODULES= base leim
diff -r 2fb09d02eb1d -r b84420f41f13 inputmethod/mozc-renderer/Makefile
--- a/inputmethod/mozc-renderer/Makefile Mon Feb 15 14:49:41 2021 +0000
+++ b/inputmethod/mozc-renderer/Makefile Mon Feb 15 14:50:22 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2020/11/05 09:08:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2021/02/15 14:50:23 ryoon Exp $
PKGNAME= ${DISTNAME:S/mozc-/mozc-renderer-/}
-PKGREVISION= 27
CONFLICTS+= ibus-mozc<=1.13.1651.102
diff -r 2fb09d02eb1d -r b84420f41f13 inputmethod/mozc-server/Makefile
--- a/inputmethod/mozc-server/Makefile Mon Feb 15 14:49:41 2021 +0000
+++ b/inputmethod/mozc-server/Makefile Mon Feb 15 14:50:22 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2020/11/05 09:08:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2021/02/15 14:50:23 ryoon Exp $
PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION= 27
INSTALLATION_DIRS+= libexec
diff -r 2fb09d02eb1d -r b84420f41f13 inputmethod/mozc-server/Makefile.common
--- a/inputmethod/mozc-server/Makefile.common Mon Feb 15 14:49:41 2021 +0000
+++ b/inputmethod/mozc-server/Makefile.common Mon Feb 15 14:50:22 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2020/05/25 05:30:31 rillig Exp $
+# $NetBSD: Makefile.common,v 1.29 2021/02/15 14:50:23 ryoon Exp $
# used by inputmethod/ibus-mozc/Makefile
# used by inputmethod/mozc-elisp/Makefile
# used by inputmethod/mozc-server/Makefile
@@ -7,7 +7,7 @@
# used by inputmethod/uim-mozc/Makefile
#
-DISTNAME= mozc-2.20.2673.102
+DISTNAME= mozc-2.26.4282.100
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.xz
@@ -28,9 +28,8 @@
DISTINFO_FILE= ${.CURDIR}/../../inputmethod/mozc-server/distinfo
PATCHDIR= ${.CURDIR}/../../inputmethod/mozc-server/patches
-PYTHON_VERSIONS_ACCEPTED= 27 # gyp
-
BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
+BUILD_DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
USE_LANGUAGES= c c++
@@ -46,9 +45,9 @@
SUBST_CLASSES+= gyp
SUBST_STAGE.gyp= pre-configure
SUBST_MESSAGE.gyp= Fix gyp defaults
+SUBST_FILES.gyp+= config.bzl
SUBST_FILES.gyp+= base/process.cc
SUBST_FILES.gyp+= gyp/directories.gypi
-SUBST_FILES.gyp+= handwriting/zinnia_handwriting.cc
SUBST_FILES.gyp+= unix/ibus/ibus.gyp
SUBST_FILES.gyp+= unix/ibus/path_util.cc
SUBST_VARS.gyp+= OPENSSL_CFLAGS OPENSSL_INC OPENSSL_LDFLAGS OPENSSL_LIBS
@@ -64,6 +63,7 @@
OSDEST.NetBSD= bsd
MOZC_BUILD_MODE= Release # or Debug
+MOZC_BUILD_MODE= Debug
# In file included from src/dictionary/system/system_dictionary.h:43:0,
# from ../../dictionary/system/system_dictionary.cc:47:
@@ -75,13 +75,12 @@
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- GYP_DEFINES="use_libprotobuf=1" \
${PYTHONBIN} build_mozc.py \
gyp \
--gypdir=${LOCALBASE}/bin
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/protobuf/buildlink3.mk"
+#.include "../../devel/protobuf/buildlink3.mk"
# gmock is not used yet...
#.include "../../devel/gmock/buildlink3.mk"
.include "../../inputmethod/zinnia/buildlink3.mk"
diff -r 2fb09d02eb1d -r b84420f41f13 inputmethod/mozc-server/distinfo
--- a/inputmethod/mozc-server/distinfo Mon Feb 15 14:49:41 2021 +0000
+++ b/inputmethod/mozc-server/distinfo Mon Feb 15 14:50:22 2021 +0000
@@ -1,60 +1,48 @@
-$NetBSD: distinfo,v 1.22 2020/06/19 05:45:30 taca Exp $
+$NetBSD: distinfo,v 1.23 2021/02/15 14:50:23 ryoon Exp $
-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 (mozc-2.26.4282.100.tar.xz) = aacec607aec52145ba66c993f9c02ae2d1a5948c
+RMD160 (mozc-2.26.4282.100.tar.xz) = b2f9f6fc129811b25640d4ae5582ab324b6bf2a4
+SHA512 (mozc-2.26.4282.100.tar.xz) = 236ec8ece076aea04480cb9aee30076699a30db88356c8bd9eb0694d86716a89748a6d33d66f5ba831e95bd0d16260e3111a9c75fded9e34df35e1785980cf12
+Size (mozc-2.26.4282.100.tar.xz) = 38346468 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_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) = 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-base_clock.cc) = bac420650fed0450cf82b5071703a1c60e974a93
+SHA1 (patch-base_cpu__stats.cc) = 9c18fb2543f352951969822e0095f01f0e8d3bcd
+SHA1 (patch-base_logging.cc) = 65938bf4f4d414a0c3bcaffe9615d976dcab2254
+SHA1 (patch-base_mutex.cc) = c52761be5ef60af35685a4de18ef18a083b1d0b9
+SHA1 (patch-base_password__manager.cc) = 6b669b7c2cf15b1a85e648265dfca0f34e86d00d
+SHA1 (patch-base_port.h) = 73b76a61759e32dcb7edcbb70b5cff6ad091a15c
+SHA1 (patch-base_process.cc) = 9b838e6178d7dd64012c94b9c55a201d096e4680
+SHA1 (patch-base_run__level.cc) = b26b0c8a457b9feb9a4de0abd7d5aae5bcd9e491
+SHA1 (patch-base_system__util.cc) = bdd468c5a22fe8ecc3de57168162944afd0bb20d
+SHA1 (patch-base_thread.cc) = 5e62c41beedc57dec004d100753bae4c77289762
+SHA1 (patch-build__mozc.py) = c0ef43010c0f048550ed4a5e9bb7b29c8a24ac77
+SHA1 (patch-build__tools_mozc__version.py) = 133f6b17d9dc811284901513e4e4ae3711710082
SHA1 (patch-build__tools_util.py) = 5ca614adf2453fcc33c18cda74c0d9b2e4f6bc21
-SHA1 (patch-client_client.cc) = f1eb1860c41a97c82a338f74acdcf0ed3477b6da
-SHA1 (patch-config_stats__config__util__test.cc) = 3514f04a921908795c03d0e8685135297dc9e2af
-SHA1 (patch-dictionary_user__dictionary.cc) = 34147edfd4d0c09637ab285584b4fad4e7ee95ff
-SHA1 (patch-dictionary_user__dictionary__session.cc) = 13270d72fcdd11a3d7fd6992613a8b562f7e51d0
-SHA1 (patch-dictionary_user__dictionary__session__test.cc) = 2c3fb20f3bd8c4f7e870e978f51a6e707d4a366d
-SHA1 (patch-dictionary_user__dictionary__storage.cc) = d2ac32d6606b835d93422e925bb1b82e62b46ab8
-SHA1 (patch-dictionary_user__dictionary__storage.h) = df3da7bf5a31f030d0202051befb70cf7afac519
-SHA1 (patch-dictionary_user__dictionary__storage__test.cc) = 1f11ecc89326af675f252ead82bcd4afb65cec2e
-SHA1 (patch-dictionary_user__dictionary__test.cc) = 5ca305cae59163f1e1779e77e608f3087aae0190
-SHA1 (patch-gui_config__dialog_config__dialog.cc) = de2750a6bf99c4e38983cf5322adae8c46ca45d6
-SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 529e902c146907d3a91181bad3822bbbec69b6b7
+SHA1 (patch-client_client.cc) = c11341d48ce55af0aea440800da4a53a62a436c1
+SHA1 (patch-config.bzl) = 5f959d46741f2f3fbf0fbbe38aa8fa1baafadb27
+SHA1 (patch-config_stats__config__util__test.cc) = f1af7403f8e06faadc5c46267d2d8b26a60c8f8d
+SHA1 (patch-gui_config__dialog_config__dialog.cc) = f3349d6ed2bee63f7bb92bc71f9d8a8ab1316b74
+SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 09c03f57031306b5cca8f1e546719db936159e2d
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) = 213b087d4cd5f22ee2b202963a7b7b3325baafb0
-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-gui_word__register__dialog_word__register__dialog.cc) = 218e3706b819855814ba8871504fc7ccb4e40b23
+SHA1 (patch-gyp_common.gypi) = 18e03490d6758ce49f4b79eb1259409cd440faba
+SHA1 (patch-gyp_directories.gypi) = eea985113aac5b99bf3c12267ad754817eef5dcc
+SHA1 (patch-ipc_ipc__path__manager.cc) = cd1352bd5333f1ed755dcf6221f931fcd0a936d3
SHA1 (patch-ipc_ipc__path__manager__test.cc) = 1b83b513383f184f5ab5a56cce734b7934998533
-SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
-SHA1 (patch-ipc_unix__ipc.cc) = 25107c2e84844ecaa3445efb48cc3f2795579dec
-SHA1 (patch-net_net.gyp) = 61353724533f9239f4c58fa37f0a8fb2eb5552c3
-SHA1 (patch-prediction_user__history__predictor.cc) = 66cf79206663d35f64a0cbee63be04c8faa99903
-SHA1 (patch-prediction_user__history__predictor.h) = 50ee05871b01864b71e4682f712c3eb662b0be94
-SHA1 (patch-prediction_user__history__predictor__test.cc) = 7fbcbfcb6bcaa236bc94fd8a9c1cd97051ffa222
-SHA1 (patch-rewriter_usage__rewriter__test.cc) = 0ceba47a833574d4eeac3e38ed2fca5ba5ba0c0c
-SHA1 (patch-session_session.cc) = 773017ac54e79239f6734a124f457b0b81bb1ced
-SHA1 (patch-session_session__test.cc) = 99165b29555844a40d30cf5554cc5c66773b70ed
+SHA1 (patch-ipc_named__event.cc) = 8be0b1e5c4675e5b238e07b63e395dbed3c2d125
+SHA1 (patch-ipc_unix__ipc.cc) = d5d86910ca610015103a309bba8d6392d96f6ce6
+SHA1 (patch-renderer_renderer.gyp) = 83493259d6b8cd9ab6871512bebc9616d72132d1
+SHA1 (patch-session_session.cc) = 3ae2c8dd056aae4c92d9dbfdac53d9c45261aad2
+SHA1 (patch-session_session__test.cc) = 7396e2f4931257d8a33087b1bed5418a038fefa1
+SHA1 (patch-third__party_abseil-cpp_absl_base_config.h) = e996fad886e0763c7be7b79735819e668159fd82
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 -r 2fb09d02eb1d -r b84420f41f13 inputmethod/mozc-server/patches/patch-base_clock.cc
--- a/inputmethod/mozc-server/patches/patch-base_clock.cc Mon Feb 15 14:49:41 2021 +0000
+++ b/inputmethod/mozc-server/patches/patch-base_clock.cc Mon Feb 15 14:50:22 2021 +0000
@@ -1,24 +1,24 @@
-$NetBSD: patch-base_clock.cc,v 1.2 2017/12/17 14:15:43 tsutsui Exp $
+$NetBSD: patch-base_clock.cc,v 1.3 2021/02/15 14:50:23 ryoon Exp $
* NetBSD support
---- base/clock.cc.orig 2016-05-15 08:11:10.000000000 +0000
+--- base/clock.cc.orig 2021-02-15 03:48:53.000000000 +0000
+++ base/clock.cc
-@@ -124,7 +124,7 @@ class ClockImpl : public ClockInterface
+@@ -116,7 +116,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 static_cast<uint64>(1.0e9 * timebase_info.denom /
+ timebase_info.numer);
+-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WASM)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WASM) || defined(OS_NETBSD)
return 1000000uLL;
- #else // platforms (OS_WIN, OS_MACOSX, OS_LINUX, ...)
+ #else // platforms (OS_WIN, __APPLE__, OS_LINUX, ...)
#error "Not supported platform"
-@@ -141,7 +141,7 @@ class ClockImpl : public ClockInterface
+@@ -133,7 +133,7 @@ class ClockImpl : public ClockInterface
return static_cast<uint64>(timestamp.QuadPart);
- #elif defined(OS_MACOSX)
+ #elif defined(__APPLE__)
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)
+-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WASM)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WASM) || defined(OS_NETBSD)
uint64 sec;
uint32 usec;
GetTimeOfDay(&sec, &usec);
diff -r 2fb09d02eb1d -r b84420f41f13 inputmethod/mozc-server/patches/patch-base_cpu__stats.cc
--- a/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc Mon Feb 15 14:49:41 2021 +0000
+++ b/inputmethod/mozc-server/patches/patch-base_cpu__stats.cc Mon Feb 15 14:50:22 2021 +0000
@@ -1,48 +1,48 @@
-$NetBSD: patch-base_cpu__stats.cc,v 1.3 2017/12/17 14:15:43 tsutsui Exp $
+$NetBSD: patch-base_cpu__stats.cc,v 1.4 2021/02/15 14:50:23 ryoon Exp $
* NetBSD support
---- base/cpu_stats.cc.orig 2016-05-15 08:11:10.000000000 +0000
+--- base/cpu_stats.cc.orig 2021-02-15 03:48:53.000000000 +0000
+++ base/cpu_stats.cc
-@@ -123,13 +123,13 @@ float CPUStats::GetSystemCPULoad() {
+@@ -122,13 +122,13 @@ float CPUStats::GetSystemCPULoad() {
- #endif // OS_MACOSX
+ #endif // __APPLE__
--#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_NETBSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WASM)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WASM) || 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 || OS_ANDROID || OS_NACL
-+#endif // OS_LINUX || OS_ANDROID || OS_NACL || OS_NETBSD
+-#endif // OS_LINUX || OS_ANDROID || OS_WASM
++#endif // OS_LINUX || OS_ANDROID || OS_WASM || OS_NETBSD
- return UpdateCPULoad(total_times,
- cpu_times,
-@@ -178,11 +178,11 @@ float CPUStats::GetCurrentProcessCPULoad
- TimeValueTToInt64(task_times_info.system_time);
- #endif // OS_MACOSX
+ return UpdateCPULoad(total_times, cpu_times, &prev_system_total_times_,
+ &prev_system_cpu_times_);
+@@ -175,11 +175,11 @@ float CPUStats::GetCurrentProcessCPULoad
+ TimeValueTToInt64(task_times_info.system_time);
+ #endif // __APPLE__
--#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_NETBSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WASM)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WASM) || defined(OS_NETBSD)
// not implemented
const uint64 total_times = 0;
const uint64 cpu_times = 0;
--#endif // OS_LINUX || OS_ANDROID || OS_NACL
-+#endif // OS_LINUX || OS_ANDROID || OS_NACL || OS_NETBSD
+-#endif // OS_LINUX || OS_ANDROID || OS_WASM
Home |
Main Index |
Thread Index |
Old Index