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.13.1651.102
details: https://anonhg.NetBSD.org/pkgsrc/rev/a45b8eb3103d
branches: trunk
changeset: 629245:a45b8eb3103d
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sun Jan 19 01:18:50 2014 +0000
description:
Update to 1.13.1651.102
* This version requires -std=c++11, then set GCC_REQD=4.7
Changelog:
r185 2014-01-06 1.13.1651.102
FIX: Refactor placeholder management ( Issue 147 )
FIX: Specify _NET_WM_WINDOW_TYPE to mozc_renderer ( Issue 195 )
FIX: header-line-format breaks candidate window on Emacs 24 ( Issue 196 )
Support Android NDK r9b.
diffstat:
inputmethod/ibus-mozc/Makefile | 3 +-
inputmethod/mozc-server/Makefile | 3 +-
inputmethod/mozc-server/Makefile.common | 9 +-
inputmethod/mozc-server/distinfo | 33 +-
inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc | 14 +-
inputmethod/mozc-server/patches/patch-base_password__manager.cc | 12 +-
inputmethod/mozc-server/patches/patch-build__mozc.py | 114 +++------
inputmethod/mozc-server/patches/patch-build__tools_mozc__version.py | 8 +-
inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc | 24 +-
inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc | 10 +-
inputmethod/mozc-server/patches/patch-gyp_common.gypi | 49 +--
inputmethod/mozc-server/patches/patch-handwriting_handwriting.gyp | 6 +-
inputmethod/mozc-server/patches/patch-handwriting_zinnia.gyp | 13 +
inputmethod/mozc-server/patches/patch-ipc_ipc__path__manager.cc | 8 +-
inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp | 12 +-
inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py | 33 +-
inputmethod/mozc-tool/Makefile | 3 +-
17 files changed, 163 insertions(+), 191 deletions(-)
diffs (truncated from 758 to 300 lines):
diff -r 1150b1a32510 -r a45b8eb3103d inputmethod/ibus-mozc/Makefile
--- a/inputmethod/ibus-mozc/Makefile Sun Jan 19 00:49:06 2014 +0000
+++ b/inputmethod/ibus-mozc/Makefile Sun Jan 19 01:18:50 2014 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2013/10/23 12:50:02 obache Exp $
+# $NetBSD: Makefile,v 1.15 2014/01/19 01:18:50 ryoon Exp $
PKGNAME= ibus-${DISTNAME}
-PKGREVISION= 2
INSTALLATION_DIRS+= libexec share/ibus share/icons share/ibus/component \
share/ibus-mozc
diff -r 1150b1a32510 -r a45b8eb3103d inputmethod/mozc-server/Makefile
--- a/inputmethod/mozc-server/Makefile Sun Jan 19 00:49:06 2014 +0000
+++ b/inputmethod/mozc-server/Makefile Sun Jan 19 01:18:50 2014 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2013/10/10 14:42:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2014/01/19 01:18:50 ryoon Exp $
PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/}
-PKGREVISION= 1
INSTALLATION_DIRS+= libexec
diff -r 1150b1a32510 -r a45b8eb3103d inputmethod/mozc-server/Makefile.common
--- a/inputmethod/mozc-server/Makefile.common Sun Jan 19 00:49:06 2014 +0000
+++ b/inputmethod/mozc-server/Makefile.common Sun Jan 19 01:18:50 2014 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.3 2013/09/07 18:42:14 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.4 2014/01/19 01:18:50 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.11.1522.102
+DISTNAME= mozc-1.13.1651.102
CATEGORIES= inputmethod
MASTER_SITES= http://mozc.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
@@ -21,6 +21,9 @@
BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
USE_LANGUAGES= c c++
+# nullptr requires -std=c++11, and -std=c++11 requires gcc 4.7 or later
+GCC_REQD= 4.7
+CXXFLAGS+= -std=c++11
USE_TOOLS+= gmake pkg-config
@@ -59,7 +62,7 @@
do-configure:
cd ${WRKSRC} && env ${MAKE_ENV} \
GYP_DEFINES="use_libprotobuf=1" \
- ${PYTHONBIN} build_mozc.py gyp --os=${LOWER_OPSYS} \
+ ${PYTHONBIN} build_mozc.py gyp \
--gypdir=${GYPDIR}/bin && \
${PYTHONBIN} build_mozc.py build_tools -c ${MOZC_BUILD_MODE} \
${_MAKE_JOBS}
diff -r 1150b1a32510 -r a45b8eb3103d inputmethod/mozc-server/distinfo
--- a/inputmethod/mozc-server/distinfo Sun Jan 19 00:49:06 2014 +0000
+++ b/inputmethod/mozc-server/distinfo Sun Jan 19 01:18:50 2014 +0000
@@ -1,48 +1,47 @@
-$NetBSD: distinfo,v 1.4 2013/09/15 12:30:23 joerg Exp $
+$NetBSD: distinfo,v 1.5 2014/01/19 01:18:50 ryoon Exp $
-SHA1 (mozc-1.11.1522.102.tar.bz2) = 0859efcbc6ddb93d9cf5a6e0d27ab8da0a72a1ee
-RMD160 (mozc-1.11.1522.102.tar.bz2) = fa08b2433cf42bbb346a19414b268ccb695ed541
-Size (mozc-1.11.1522.102.tar.bz2) = 58418005 bytes
+SHA1 (mozc-1.13.1651.102.tar.bz2) = 24680b3d350e5332f2235b9c1342127f6ef0fd63
+RMD160 (mozc-1.13.1651.102.tar.bz2) = 260a23c2f9f3b909aefe63c865f3b87013d2fb53
+Size (mozc-1.13.1651.102.tar.bz2) = 31635636 bytes
SHA1 (patch-base_base.gyp) = 329bd8614282aca28fcba30b2e593f488801118d
SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191
-SHA1 (patch-base_crash__report__handler.cc) = c901dbb2c8f18d18b479486b2d25ff09b3de356b
+SHA1 (patch-base_crash__report__handler.cc) = 28e581ffef8a108aff372c79b3578686472cb464
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) = cb11b9b707ab0c361c969eefd4d7c805c0b4b06a
+SHA1 (patch-base_password__manager.cc) = f16982447f54e397d1aa103260d8f4d10aa76f96
SHA1 (patch-base_process.cc) = abdd6a955e87506972e7f71fd4bc3a300f49b304
SHA1 (patch-base_run__level.cc) = 8aa169a8be51674898906740cb8f6103b99021b4
SHA1 (patch-base_system__util.cc) = f3ef575a15cd518fe7d29264b39f775ccf502802
SHA1 (patch-base_thread.h) = 8aaacbb1421cf0e886f3b58dfd2c653f3d82ef70
SHA1 (patch-base_util.cc) = c473cb595535075b53c9c235fc28f5e7da26d087
-SHA1 (patch-build__mozc.py) = 76ea6874270348a21059b208894894258f6d4467
-SHA1 (patch-build__tools_mozc__version.py) = 47460ca750d8d28652c5c55e5df9b786af4d33c7
+SHA1 (patch-build__mozc.py) = a8b4596c9c5f86ca8dbbf3ea03e1873ff86baa00
+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) = 1e53b37c085bd7bdb3d2d2088e4a93b877aadc64
+SHA1 (patch-gui_config__dialog_config__dialog.cc) = aae18b7ea36fd5ff5758625875a04634ffdfd68a
SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 00a6e4bb2c07e3340e188f108f0285a3aa2aceb9
SHA1 (patch-gui_config__dialog_keymap__editor.cc) = a78a4fb5c484e672b0cfecf38c6713cf74007cb5
-SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 3fa79c240b20884b73eed7677a57a389aff467d8
+SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 0ce41d4522c837836bad345cf82cb4741e7af4d0
SHA1 (patch-gui_gui.gyp) = 70b6d78ca5a482b9e8fa697dbb191cccbdde1c6a
SHA1 (patch-gui_qt__libraries.gypi) = 2b00307c22380d0d1c60b5d98ce08970b0e74f09
SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 34a7cd2a99a0082f490c3f623c7c6a856c984f8b
-SHA1 (patch-gui_zinnia.gyp) = 0eaad35b829d2c25e751ce6e99207781306934d5
-SHA1 (patch-gyp_common.gypi) = af22172e630cc742c789ea2d89720bb9897c7f0a
-SHA1 (patch-handwriting_handwriting.gyp) = 608e45f7bc4edcd434929d9e3a5cb05cee723abc
+SHA1 (patch-gyp_common.gypi) = 69095a357de9d871c93fc8effda95568068bedab
+SHA1 (patch-handwriting_handwriting.gyp) = 0261aef287b34f4a3c8424fb1af44720ae00a85c
+SHA1 (patch-handwriting_zinnia.gyp) = d09ac17d17dabdbfdcb7c623193a5c72dbcacfbc
SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2
-SHA1 (patch-ipc_ipc__path__manager.cc) = 53d9268ddf048d339ebad26c97dab22aadced84b
+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-languages_hangul_hangul.gyp) = 685964cd31e91c96f0d41e729441b17ed9ac24f8
SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea
SHA1 (patch-protobuf_genproto.gypi) = 601165a376bcd05983f87733285737ee043c13fe
-SHA1 (patch-protobuf_protobuf.gyp) = 41c7fd41e89e163b02b40d4b44947604b3730b79
+SHA1 (patch-protobuf_protobuf.gyp) = 60abe727c1475e50295a5e811dccf8deb710e18a
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) = d2ab62853919a964d3edf574a391d83e9c5e02bd
+SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 9d7e1da07854c2244a22ffe5034fabb25d16d266
SHA1 (patch-unix_ibus_mozc__engine.cc) = 2ce0a680a0fad1abdc646737b6b5a4c3a9e87e6e
diff -r 1150b1a32510 -r a45b8eb3103d inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc
--- a/inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc Sun Jan 19 00:49:06 2014 +0000
+++ b/inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc Sun Jan 19 01:18:50 2014 +0000
@@ -1,19 +1,19 @@
-$NetBSD: patch-base_crash__report__handler.cc,v 1.2 2013/09/07 18:42:14 ryoon Exp $
+$NetBSD: patch-base_crash__report__handler.cc,v 1.3 2014/01/19 01:18:50 ryoon Exp $
---- base/crash_report_handler.cc.orig 2013-08-28 05:26:13.000000000 +0000
+--- base/crash_report_handler.cc.orig 2014-01-06 07:10:31.000000000 +0000
+++ base/crash_report_handler.cc
-@@ -321,7 +321,7 @@ void CrashReportHandler::SetCriticalSect
- }
+@@ -346,7 +346,7 @@ void CrashReportHandler::SetCriticalSect
+
} // namespace mozc
--#elif defined(OS_LINUX) // OS_WIN
+-#else
+#elif defined(OS_LINUX) || defined(OS_NETBSD) // OS_WIN
namespace mozc {
-@@ -341,4 +341,4 @@ bool CrashReportHandler::Uninitialize()
+@@ -372,4 +372,4 @@ void CrashReportHandler::SetCriticalSect
} // namespace mozc
--#endif // OS_WIN OS_LINUX
+-#endif
+#endif // OS_WIN OS_LINUX OS_NETBSD
diff -r 1150b1a32510 -r a45b8eb3103d inputmethod/mozc-server/patches/patch-base_password__manager.cc
--- a/inputmethod/mozc-server/patches/patch-base_password__manager.cc Sun Jan 19 00:49:06 2014 +0000
+++ b/inputmethod/mozc-server/patches/patch-base_password__manager.cc Sun Jan 19 01:18:50 2014 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-base_password__manager.cc,v 1.1 2013/04/29 09:52:17 ryoon Exp $
+$NetBSD: patch-base_password__manager.cc,v 1.2 2014/01/19 01:18:50 ryoon Exp $
---- base/password_manager.cc.orig 2012-08-31 05:37:06.000000000 +0000
+--- base/password_manager.cc.orig 2014-01-06 07:10:31.000000000 +0000
+++ base/password_manager.cc
-@@ -366,7 +366,7 @@ class DeprecatedMacPasswordManager : pub
- // this module to other Linux distro, you might want to implement
- // a new password manager which adopts some secure mechanism such
- // like gnome-keyring.
+@@ -264,7 +264,7 @@ bool WinMacPasswordManager::RemovePasswo
+ // We use plain text file for password storage on Linux. If you port this module
+ // to other Linux distro, you might want to implement a new password manager
+ // which adopts some secure mechanism such like gnome-keyring.
-#if defined OS_LINUX
+#if defined(OS_LINUX) || defined(OS_NETBSD)
typedef PlainPasswordManager DefaultPasswordManager;
diff -r 1150b1a32510 -r a45b8eb3103d inputmethod/mozc-server/patches/patch-build__mozc.py
--- a/inputmethod/mozc-server/patches/patch-build__mozc.py Sun Jan 19 00:49:06 2014 +0000
+++ b/inputmethod/mozc-server/patches/patch-build__mozc.py Sun Jan 19 01:18:50 2014 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-build__mozc.py,v 1.3 2013/09/07 18:42:14 ryoon Exp $
+$NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $
---- build_mozc.py.orig 2013-08-28 05:25:59.000000000 +0000
+--- build_mozc.py.orig 2014-01-06 07:10:26.000000000 +0000
+++ build_mozc.py
@@ -60,6 +60,7 @@ from build_tools.util import FindFileFro
from build_tools.util import GetNumberOfProcessors
@@ -10,16 +10,16 @@
from build_tools.util import IsMac
from build_tools.util import IsWindows
from build_tools.util import PrintErrorAndExit
-@@ -116,6 +117,8 @@ def GetBuildBaseName(options, target_pla
+@@ -120,6 +121,8 @@ def GetBuildBaseName(options, target_pla
build_base = 'out_mac'
- elif target_platform == 'Linux' or target_platform == 'ChromeOS':
+ elif target_platform == 'Linux':
build_base = 'out_linux'
+ elif target_platform == 'NetBSD':
+ build_base = 'out_bsd'
elif target_platform == 'Android':
build_base = 'out_android'
elif target_platform == 'NaCl':
-@@ -224,6 +227,12 @@ def GetGypFileNames(options):
+@@ -214,6 +217,14 @@ def GetGypFileNames(options):
if not PkgExists('ibus-1.0 >= 1.4.1'):
logging.info('removing ibus.gyp.')
gyp_file_names.remove('%s/unix/ibus/ibus.gyp' % SRC_DIR)
@@ -29,18 +29,12 @@
+ if not PkgExists('ibus-1.0 >= 1.4.1'):
+ logging.info('removing ibus.gyp.')
+ gyp_file_names.remove('%s/unix/ibus/ibus.gyp' % SRC_DIR)
- elif options.target_platform == 'ChromeOS':
- gyp_file_names.extend(glob.glob('%s/unix/ibus/*.gyp' % SRC_DIR))
++ elif options.target_platform == 'ChromeOS':
++ gyp_file_names.extend(glob.glob('%s/unix/ibus/*.gyp' % SRC_DIR))
elif options.target_platform == 'NaCl':
-@@ -260,6 +269,7 @@ def AddCommonOptions(parser):
- help='Specifies the base directory of the built binaries.')
- parser.add_option('--language', dest='language', default='japanese',
- help='Specify the target language to build.')
-+ parser.add_option('--os', dest='os', default='linux')
- return parser
-
-
-@@ -280,6 +290,8 @@ def AddTargetPlatformOption(parser):
+ # Add chrome NaCl Mozc gyp scripts.
+ gyp_file_names.append('%s/chrome/nacl/nacl_extension.gyp' % SRC_DIR)
+@@ -309,6 +320,8 @@ def AddTargetPlatformOption(parser):
# If you want Android build, specify "Android".
if IsLinux():
default_target = 'Linux'
@@ -49,7 +43,7 @@
elif IsWindows():
default_target = 'Windows'
elif IsMac():
-@@ -478,6 +490,12 @@ def ExpandMetaTarget(options, meta_targe
+@@ -506,6 +519,14 @@ def ExpandMetaTarget(options, meta_targe
SRC_DIR + '/gui/gui.gyp:mozc_tool']
if PkgExists('ibus-1.0 >= 1.4.1'):
targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc')
@@ -59,10 +53,12 @@
+ SRC_DIR + '/gui/gui.gyp:mozc_tool']
+ if PkgExists('ibus-1.0 >= 1.4.1'):
+ targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc')
- elif target_platform == 'ChromeOS':
- targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc')
++ elif target_platform == 'ChromeOS':
++ targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc')
elif target_platform == 'Mac':
-@@ -505,7 +523,7 @@ def ParseBuildOptions(args=None, values=
+ targets = [SRC_DIR + '/mac/mac.gyp:DiskImage']
+ elif target_platform == 'Windows':
+@@ -531,7 +552,7 @@ def ParseBuildOptions(args=None, values=
"""Parses command line options for the build command."""
parser = optparse.OptionParser(usage='Usage: %prog build [options]')
AddCommonOptions(parser)
@@ -71,7 +67,7 @@
default_build_concurrency = GetNumberOfProcessors() * 2
parser.add_option('--jobs', '-j', dest='jobs',
default=('%d' % default_build_concurrency),
-@@ -525,7 +543,7 @@ def ParseRunTestsOptions(args=None, valu
+@@ -551,7 +572,7 @@ def ParseRunTestsOptions(args=None, valu
parser = optparse.OptionParser(
usage='Usage: %prog runtests [options] [test_targets] [-- build options]')
AddCommonOptions(parser)
@@ -80,25 +76,17 @@
default_build_concurrency = GetNumberOfProcessors() * 2
parser.add_option('--jobs', '-j', dest='jobs',
default=('%d' % default_build_concurrency),
-@@ -693,6 +711,8 @@ def GypMain(options, unused_args):
- command_line.extend(['-D', 'wix_dir=%s' % options.wix_dir])
- else:
- command_line.extend(['-D', 'use_wix=NO'])
-+ if options.os:
-+ command_line.extend(['-D', 'OS=%s' % options.os])
-
- android_sdk_home = options.android_sdk_home
- if version.GetTargetPlatform() == 'Android':
-@@ -755,7 +775,7 @@ def GypMain(options, unused_args):
+@@ -777,7 +798,8 @@ def GypMain(options, unused_args, _):
+ gyp_options.extend(['-D', 'channel_dev=1'])
def SetCommandLineForFeature(option_name, windows=False, mac=False,
- linux=False, chromeos=False, android=False,
-- nacl=False):
-+ nacl=False, netbsd=False):
+- linux=False, android=False, nacl=False):
++ linux=False, android=False, nacl=False,
++ netbsd=False):
"""Updates an option like '--enable_foober' and add a -D argument for gyp.
This function ensures an option like '--enable_foober' exists and it has a
-@@ -779,6 +799,8 @@ def GypMain(options, unused_args):
+@@ -799,6 +821,8 @@ def GypMain(options, unused_args, _):
option on Android platform.
nacl: A boolean which replesents the default value of the target
Home |
Main Index |
Thread Index |
Old Index