pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/inputmethod Update to 1.11.1502.102.
details: https://anonhg.NetBSD.org/pkgsrc/rev/29806863a5a5
branches: trunk
changeset: 621872:29806863a5a5
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sat Jul 20 04:34:53 2013 +0000
description:
Update to 1.11.1502.102.
* ibus-mozc depends on mozc-server and mozc-tool.
* Add CFLAGS+=-std=c++0x in gyp/common.gypi.
Changelog:
r163 2013-07-17 1.11.1502.102
Fixes cursor movement issue on Emacs 24 ( Issue 168 )
Support numpad keys in mozc.el ( Issue 170 )
Fix build failure on Windows ( Issue 185 , Issue 191)
Support GCC 4.8.0 ( Issue 186 )
Fix build failure when use_libprotobuf=1 is specified ( Issue 189 )
Support Emacs 24 in mozc.el ( Issue 190 )
Development of ibus-mozc is now in maintenance mode (Issue 194)
Intorduce Mode Indicator for Windows
Support per-user input mode for Windows 8 (TSF-mozc)
Support InputScope for Windows 8 (TSF-mozc)
Support surrounding text on Windows, Mac, LInux and NaCl
Enable a developer to configure document directory and/or Zinnia model file path at build time for GNU/Linux build. See the build instruction about how to customize them.
Dictionary update
diffstat:
inputmethod/ibus-mozc/Makefile | 5 +-
inputmethod/mozc-elisp/Makefile | 3 +-
inputmethod/mozc-server/Makefile | 3 +-
inputmethod/mozc-server/Makefile.common | 13 +-
inputmethod/mozc-server/distinfo | 58 ++++----
inputmethod/mozc-server/patches/patch-DEPS | 17 --
inputmethod/mozc-server/patches/patch-base_base.gyp | 10 +-
inputmethod/mozc-server/patches/patch-base_const.h | 13 --
inputmethod/mozc-server/patches/patch-base_logging.cc | 12 +-
inputmethod/mozc-server/patches/patch-base_mutex.cc | 18 +-
inputmethod/mozc-server/patches/patch-base_process.cc | 10 +-
inputmethod/mozc-server/patches/patch-base_system__util.cc | 37 ++++-
inputmethod/mozc-server/patches/patch-base_thread.h | 14 +-
inputmethod/mozc-server/patches/patch-base_util.cc | 18 ++-
inputmethod/mozc-server/patches/patch-build__mozc.py | 61 +++------
inputmethod/mozc-server/patches/patch-build__tools_util.py | 9 +-
inputmethod/mozc-server/patches/patch-gui_base_locale__util.cc | 18 ++-
inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc | 12 +-
inputmethod/mozc-server/patches/patch-gui_config__dialog_keymap__editor.cc | 13 +-
inputmethod/mozc-server/patches/patch-gui_word__register__dialog_word__register__dialog.cc | 11 +-
inputmethod/mozc-server/patches/patch-gyp_common.gypi | 33 ++++-
inputmethod/mozc-server/patches/patch-handwriting_handwriting.gyp | 24 ++-
inputmethod/mozc-server/patches/patch-handwriting_zinnia__handwriting.cc | 12 +-
inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc | 12 +-
inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager__test.cc | 6 +-
inputmethod/mozc-server/patches/patch-ipc_unix__ipc.cc | 18 +-
inputmethod/mozc-server/patches/patch-protobuf_genproto.gypi | 27 +---
inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp | 6 +-
inputmethod/mozc-server/patches/patch-session_session.cc | 8 +-
inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py | 4 +-
inputmethod/mozc-server/patches/patch-unix_ibus_mozc__engine.cc | 22 +-
inputmethod/mozc-tool/Makefile | 3 +-
32 files changed, 268 insertions(+), 262 deletions(-)
diffs (truncated from 1123 to 300 lines):
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/ibus-mozc/Makefile
--- a/inputmethod/ibus-mozc/Makefile Sat Jul 20 04:03:47 2013 +0000
+++ b/inputmethod/ibus-mozc/Makefile Sat Jul 20 04:34:53 2013 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2013/06/06 12:54:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2013/07/20 04:34:53 ryoon Exp $
PKGNAME= ibus-${DISTNAME}
-PKGREVISION= 3
INSTALLATION_DIRS+= libexec share/ibus share/icons share/ibus/component \
share/ibus-mozc
DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
+DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server
+DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool
do-build:
cd ${WRKSRC} && env ${MAKE_ENV} \
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-elisp/Makefile
--- a/inputmethod/mozc-elisp/Makefile Sat Jul 20 04:03:47 2013 +0000
+++ b/inputmethod/mozc-elisp/Makefile Sat Jul 20 04:34:53 2013 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2013/06/06 12:54:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2013/07/20 04:34:53 ryoon Exp $
#
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
-PKGREVISION= 3
CATEGORIES= inputmethod editors
EMACS_MODULES= base leim
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-server/Makefile
--- a/inputmethod/mozc-server/Makefile Sat Jul 20 04:03:47 2013 +0000
+++ b/inputmethod/mozc-server/Makefile Sat Jul 20 04:34:53 2013 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/06/06 12:54:38 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2013/07/20 04:34:53 ryoon Exp $
PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION= 3
INSTALLATION_DIRS+= libexec
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-server/Makefile.common
--- a/inputmethod/mozc-server/Makefile.common Sat Jul 20 04:03:47 2013 +0000
+++ b/inputmethod/mozc-server/Makefile.common Sat Jul 20 04:34:53 2013 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.1 2013/04/29 09:52:16 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.2 2013/07/20 04:34:53 ryoon Exp $
# used by inputmethod/ibus-mozc/Makefile
# used by inputmethod/mozc-elisp/Makefile
# used by inputmethod/mozc-server/Makefile
# used by inputmethod/mozc-tool/Makefile
#
-DISTNAME= mozc-1.10.1390.102
+DISTNAME= mozc-1.11.1502.102
CATEGORIES= inputmethod
MASTER_SITES= http://mozc.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
@@ -37,15 +37,10 @@
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+= handwriting/zinnia_handwriting.cc
SUBST_FILES.gyp+= unix/ibus/gen_mozc_xml.py
-SUBST_FILES.gyp+= gui/qt_rcc.gypi
-SUBST_FILES.gyp+= gui/qt_moc.gypi
-SUBST_FILES.gyp+= gui/qt_uic.gypi
-SUBST_FILES.gyp+= gui/qt_libraries.gypi
-SUBST_FILES.gyp+= base/const.h
-SUBST_FILES.gyp+= build_mozc.py
-SUBST_FILES.gyp+= protobuf/genproto.gypi
+SUBST_FILES.gyp+= gyp/common.gypi
SUBST_VARS.gyp+= OPENSSL_CFLAGS OPENSSL_INC OPENSSL_LDFLAGS OPENSSL_LIBS
SUBST_VARS.gyp+= PREFIX QTDIR
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-server/distinfo
--- a/inputmethod/mozc-server/distinfo Sat Jul 20 04:03:47 2013 +0000
+++ b/inputmethod/mozc-server/distinfo Sat Jul 20 04:34:53 2013 +0000
@@ -1,52 +1,50 @@
-$NetBSD: distinfo,v 1.1 2013/04/29 09:52:16 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2013/07/20 04:34:53 ryoon Exp $
-SHA1 (mozc-1.10.1390.102.tar.bz2) = d6ae2cf93eeecad93565f4bb9b51a32ce94ac9d6
-RMD160 (mozc-1.10.1390.102.tar.bz2) = 430aba0d282525bf6e760c276de3ed596e8f8608
-Size (mozc-1.10.1390.102.tar.bz2) = 57879881 bytes
-SHA1 (patch-DEPS) = 266c19178c08d610f1cd3b8c8ab905697a889ff7
-SHA1 (patch-base_base.gyp) = 03ad0f11f392d24b6b40cafa0a80741bddd4708c
-SHA1 (patch-base_const.h) = 30f4fcccc5ba9bdb969697b807ec548d53fd6c60
+SHA1 (mozc-1.11.1502.102.tar.bz2) = 72c06d409da957d6696bbe1341c118ba4c267877
+RMD160 (mozc-1.11.1502.102.tar.bz2) = 6cee5948fb7e0ab6dc49022caa51a55611ece179
+Size (mozc-1.11.1502.102.tar.bz2) = 58777653 bytes
+SHA1 (patch-base_base.gyp) = 329bd8614282aca28fcba30b2e593f488801118d
SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191
SHA1 (patch-base_crash__report__handler.cc) = 210d3750b5252f19e030c1b235d8e8b65ea38fab
SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b
-SHA1 (patch-base_logging.cc) = 56036110c3c2ba21e6fcb35ea2faac83896f4a83
-SHA1 (patch-base_mutex.cc) = 0fe135b4e6f15017c59a13ba7c4019123559c31b
+SHA1 (patch-base_logging.cc) = 62259820d980bb7e6ddf81b6d168348a46371b40
+SHA1 (patch-base_mutex.cc) = 3a002e5d2430bc62c29950d3602255503753608c
SHA1 (patch-base_mutex.h) = 6c3c8f0845f0fdad815c4877026894000d5eac2c
SHA1 (patch-base_password__manager.cc) = cb11b9b707ab0c361c969eefd4d7c805c0b4b06a
-SHA1 (patch-base_process.cc) = fcdc1e078023c330f172409f0e26203411b4b0e1
+SHA1 (patch-base_process.cc) = 0979686b20ea4b2e77ffb1bda8fd955baa25d7e1
SHA1 (patch-base_run__level.cc) = 8aa169a8be51674898906740cb8f6103b99021b4
-SHA1 (patch-base_system__util.cc) = c01144fdee9fd9e2a19c7014316377b1e88dafd8
-SHA1 (patch-base_thread.h) = b0560c13b2670dc645f3587cfd56ecab0a7fe850
-SHA1 (patch-base_util.cc) = 57a59d9c6c721d28b8de3203f8b5dea71bc54664
-SHA1 (patch-build__mozc.py) = 9106a7c8b3000eba582aec065e777b2311c86bda
+SHA1 (patch-base_system__util.cc) = 5866a8c83f81f060eebf5ec3b67aa4491fdb6dd0
+SHA1 (patch-base_thread.h) = 8aaacbb1421cf0e886f3b58dfd2c653f3d82ef70
+SHA1 (patch-base_util.cc) = db13648d8127e94ec9575752692f31bf81bac68d
+SHA1 (patch-build__mozc.py) = 377294ac8c8ccf6b55a63632e9a512f15c479989
SHA1 (patch-build__tools_mozc__version.py) = 47460ca750d8d28652c5c55e5df9b786af4d33c7
-SHA1 (patch-build__tools_util.py) = de5e8be9b06b1a26a79314c469024dd2dd3fb119
+SHA1 (patch-build__tools_util.py) = 1700f2c061bd2501dc78370198cded8cfe7c851a
SHA1 (patch-client_client.cc) = 7ca43dde3f207331005599653c6520667e3ca93c
SHA1 (patch-config_stats__config__util__test.cc) = db51e6619c5c04ac8fa50890825206ea922dccf2
-SHA1 (patch-gui_base_locale__util.cc) = a501c01d20bb633f8dda9752c7c2175a64b84e91
-SHA1 (patch-gui_config__dialog_config__dialog.cc) = c26c735ebe49c27a0aa170ee01a11b9dce6dad08
+SHA1 (patch-gui_base_locale__util.cc) = 7d1e9cf3c2c36590298496471a97b8c32010a30b
+SHA1 (patch-gui_config__dialog_config__dialog.cc) = e8d1f9adeb9dbc9f25deee82e4ace692d92eeb46
SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 00a6e4bb2c07e3340e188f108f0285a3aa2aceb9
-SHA1 (patch-gui_config__dialog_keymap__editor.cc) = c2439e59756a6c10cfad21d0998952912a2379bd
+SHA1 (patch-gui_config__dialog_keymap__editor.cc) = a78a4fb5c484e672b0cfecf38c6713cf74007cb5
SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = d08cc3a91794d0f8eb59a105d0c94eb3f02c0133
SHA1 (patch-gui_gui.gyp) = a27d0a0a3fb6893a691450917cf2798ace1647ed
SHA1 (patch-gui_qt__libraries.gypi) = 9faaac9b9fc891050e27b4be0fd899265f4a1173
-SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = eca90653e3276509818690355246841211c95171
+SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 34a7cd2a99a0082f490c3f623c7c6a856c984f8b
SHA1 (patch-gui_zinnia.gyp) = 0eaad35b829d2c25e751ce6e99207781306934d5
-SHA1 (patch-gyp_common.gypi) = c79b7602fa4ed286eace10707ca4bbe8df7115fc
-SHA1 (patch-handwriting_handwriting.gyp) = 3084cc6615d89b24bcf074717f102642100bb587
-SHA1 (patch-handwriting_zinnia__handwriting.cc) = 9f6a857571a6d13f722d0503e232943d8dd2915e
-SHA1 (patch-ipc_ipc__path__manager.cc) = 6e92a71e1a616525120760397467955de1cd6156
-SHA1 (patch-ipc_ipc__path__manager__test.cc) = 29c4cd860c8261346bd5c20b214f967134049800
+SHA1 (patch-gyp_common.gypi) = 3a90f34d6f1a34d264abbf59891fd363dbd00848
+SHA1 (patch-handwriting_handwriting.gyp) = 608e45f7bc4edcd434929d9e3a5cb05cee723abc
+SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2
+SHA1 (patch-ipc_ipc__path__manager.cc) = a424e9eabdfa9cb66492fc85ecf9c2659c8e35f9
+SHA1 (patch-ipc_ipc__path__manager__test.cc) = 90ea81daef93dc1ad5cee792ced26a9a2939fbdf
SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
-SHA1 (patch-ipc_unix__ipc.cc) = bfb07eda02415cd1d4ce9303d960d614458476a5
+SHA1 (patch-ipc_unix__ipc.cc) = 5b314ca3eaa0a0036796b98c47d791451688002d
SHA1 (patch-languages_chewing_chewing.gyp) = 26fa18398911609a53cff003943436f003772e64
SHA1 (patch-languages_hangul_hangul.gyp) = 685964cd31e91c96f0d41e729441b17ed9ac24f8
SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea
-SHA1 (patch-protobuf_genproto.gypi) = ccab78f72fbf0cd58ef043637e38f7eba9a3b183
-SHA1 (patch-protobuf_protobuf.gyp) = 247c16bf86287ce2b57da2653be17929692c3710
-SHA1 (patch-session_session.cc) = 485c434a0bf7119f247494bf14f3856573475e11
+SHA1 (patch-protobuf_genproto.gypi) = c547573192c666607c26d999f60153283c794208
+SHA1 (patch-protobuf_protobuf.gyp) = 41c7fd41e89e163b02b40d4b44947604b3730b79
+SHA1 (patch-session_session.cc) = 1ca8d62e9bff202cbaaec1bd3503c6df4843b13e
SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465
SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95
SHA1 (patch-third__party_gyp_buildbot_buildbot__run.py) = 21375df1c6c19233c66b24da4dc23ddad5515b72
-SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 978d883a41a5dd823f94d22d62202b5210c1207e
-SHA1 (patch-unix_ibus_mozc__engine.cc) = 0ae1220c1253c4d5d0d5eb97e584c12ea38b5c96
+SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 58f6347e8ff448895d2e5996066c8d0d91ffe7ae
+SHA1 (patch-unix_ibus_mozc__engine.cc) = 2ce0a680a0fad1abdc646737b6b5a4c3a9e87e6e
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-server/patches/patch-DEPS
--- a/inputmethod/mozc-server/patches/patch-DEPS Sat Jul 20 04:03:47 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-DEPS,v 1.1 2013/04/29 09:52:16 ryoon Exp $
-
---- DEPS.orig 2013-03-29 04:33:25.000000000 +0000
-+++ DEPS
-@@ -88,6 +88,12 @@ deps_os = {
- Var("zinnia_revision"),
- },
- "unix": {
-+ "netbsd": {
-+ "src/third_party/clang/scripts":
-+ "https://src.chromium.org/chrome/trunk/src/tools/clang/scripts@"; +
-+ Var("clang_helper_in_chromium_revision"),
-+ },
-+}
- "src/third_party/clang/scripts":
- "https://src.chromium.org/chrome/trunk/src/tools/clang/scripts@"; +
- Var("clang_helper_in_chromium_revision"),
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-server/patches/patch-base_base.gyp
--- a/inputmethod/mozc-server/patches/patch-base_base.gyp Sat Jul 20 04:03:47 2013 +0000
+++ b/inputmethod/mozc-server/patches/patch-base_base.gyp Sat Jul 20 04:34:53 2013 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-base_base.gyp,v 1.1 2013/04/29 09:52:16 ryoon Exp $
+$NetBSD: patch-base_base.gyp,v 1.2 2013/07/20 04:34:53 ryoon Exp $
---- base/base.gyp.orig 2013-03-29 04:33:43.000000000 +0000
+--- base/base.gyp.orig 2013-07-17 02:38:04.000000000 +0000
+++ base/base.gyp
-@@ -85,7 +85,7 @@
+@@ -86,7 +86,7 @@
# shared among *host* binaries and *target* binaries. This means that
# you should implement *host* binaries by using limited libraries
# which are also available on NDK.
@@ -11,9 +11,9 @@
'not (target_platform=="NaCl" and _toolset=="target")', {
'defines': [
'HAVE_LIBRT=1',
-@@ -262,23 +262,23 @@
+@@ -287,23 +287,23 @@
],
- }
+ },
}],
- ['OS=="linux" and target_platform!="Android" and '
+ ['OS=="netbsd" or (OS=="linux" and target_platform!="Android") and '
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-server/patches/patch-base_const.h
--- a/inputmethod/mozc-server/patches/patch-base_const.h Sat Jul 20 04:03:47 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_const.h,v 1.1 2013/04/29 09:52:16 ryoon Exp $
-
---- base/const.h.orig 2012-08-31 05:37:06.000000000 +0000
-+++ base/const.h
-@@ -146,7 +146,7 @@ const char kMozcTool[] = "mozc_tool";
- #ifdef MOZC_SERVER_DIRECTORY
- const char kMozcServerDirectory[] = MOZC_SERVER_DIRECTORY;
- #else
--const char kMozcServerDirectory[] = "/usr/lib/mozc";
-+const char kMozcServerDirectory[] = "@PREFIX@/libexec";
- #endif // MOZC_SERVER_DIRECTORY
- #ifdef OS_ANDROID
- #ifndef MOZC_ANDROID_APPLICATION_ID
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-server/patches/patch-base_logging.cc
--- a/inputmethod/mozc-server/patches/patch-base_logging.cc Sat Jul 20 04:03:47 2013 +0000
+++ b/inputmethod/mozc-server/patches/patch-base_logging.cc Sat Jul 20 04:34:53 2013 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-base_logging.cc,v 1.1 2013/04/29 09:52:17 ryoon Exp $
+$NetBSD: patch-base_logging.cc,v 1.2 2013/07/20 04:34:53 ryoon Exp $
---- base/logging.cc.orig 2013-03-29 04:33:43.000000000 +0000
+--- base/logging.cc.orig 2013-07-17 02:38:04.000000000 +0000
+++ base/logging.cc
@@ -61,6 +61,10 @@
#include "base/system_util.h"
@@ -18,11 +18,11 @@
#if defined(__native_client__)
"%p",
-#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined (OS_NETBSD)
++#elif defined(OS_LINUX) || defined(OS_NETBSD)
"%lu",
- #else // = OS_WIN or OS_MACOSX
- "%u",
-@@ -131,6 +135,9 @@ string Logging::GetLogMessageHeader() {
+ #elif defined(OS_MACOSX) && defined(__LP64__)
+ "%llu",
+@@ -137,6 +141,9 @@ string Logging::GetLogMessageHeader() {
::getpid(),
// pthread_self() returns __nc_basic_thread_data*.
static_cast<void*>(pthread_self())
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-server/patches/patch-base_mutex.cc
--- a/inputmethod/mozc-server/patches/patch-base_mutex.cc Sat Jul 20 04:03:47 2013 +0000
+++ b/inputmethod/mozc-server/patches/patch-base_mutex.cc Sat Jul 20 04:34:53 2013 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-base_mutex.cc,v 1.1 2013/04/29 09:52:17 ryoon Exp $
+$NetBSD: patch-base_mutex.cc,v 1.2 2013/07/20 04:34:53 ryoon Exp $
---- base/mutex.cc.orig 2013-03-29 04:33:43.000000000 +0000
+--- base/mutex.cc.orig 2013-07-17 02:38:04.000000000 +0000
+++ base/mutex.cc
@@ -61,7 +61,7 @@ namespace mozc {
@@ -20,16 +20,16 @@
// Use OSAtomicCompareAndSwapInt on Mac OSX
// http://developer.apple.com/iphone/library/documentation/
-@@ -91,7 +91,7 @@ inline int InterlockedCompareExchange(vo
- int new_value,
- int old_value) {
+@@ -93,7 +93,7 @@ inline int InterlockedCompareExchange(vo
return OSAtomicCompareAndSwapInt(old_value, new_value, target)
-- ? old_value : *target;
-+ ? old_value : *target; || OS_NETBSD
+ ? old_value : *target;
}
- #endif // OX_MACOSX
+-#endif // OX_MACOSX
++#endif // OS_MACOSX
-@@ -296,7 +296,7 @@ Mutex::Mutex() {
+ } // namespace
+
+@@ -300,7 +300,7 @@ Mutex::Mutex() {
// PTHREAD_MUTEX_RECURSIVE_NP but Mac OS X 10.5 does not
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
diff -r 6f42e25dbd79 -r 29806863a5a5 inputmethod/mozc-server/patches/patch-base_process.cc
--- a/inputmethod/mozc-server/patches/patch-base_process.cc Sat Jul 20 04:03:47 2013 +0000
+++ b/inputmethod/mozc-server/patches/patch-base_process.cc Sat Jul 20 04:34:53 2013 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-base_process.cc,v 1.1 2013/04/29 09:52:17 ryoon Exp $
+$NetBSD: patch-base_process.cc,v 1.2 2013/07/20 04:34:53 ryoon Exp $
---- base/process.cc.orig 2013-03-29 04:33:43.000000000 +0000
Home |
Main Index |
Thread Index |
Old Index