Update to 1.15.1917.102 from 1.15.1895.102

Changelog:
r373 2014-11-03 1.15.1917.102 - r353 2014-10-17 1.15.1896.102

You can check out Mozc r373 as follows.

gclient sync --revision=373

Summary of changes between 1.15.1896.102 (r353) and 1.15.1917.102 (r373).

    Build related changes:
        Android build is now tested with NDK r10c and OpenJDK 7
    Fixed issues:
        FIX: Warning message from keymap editor should be updated ( Issue 251 )
    Commit summary:
        r373: Remove Util:ToUTF8 since it is actually a dead code
        r372: Tidy up build_mozc.py
        r371: Unsupport BuildToolsMain in build_mozc.py except for Windows
        r370: Re-enable tests for SafeStrToDouble/SafeStrToFloat on Android
        r369: Use OpenJDK 7 to build Android binaries
        r368: Swith protobuf repository from Google Code to GitHub part2
        r367: Fix several coding style issues
        r366: Sort test cases alphabetically
        r365: Merge ANDROID_VERSION_CODE into BUILD
        r364: Replace scoped_ptr with std::unique_ptr under unix/
        r363: Stop generating xcode rule to run unittest from IDE
        r362: Fix style violations in header include guards part 3
        r361: Deprecate build fravor "Optimize"
        r360: Put mozc_build_tools under output directory
        r359: Fix indentation in a python script
        r358: Roll breakpad r1375:r1391
        r357: Swith protobuf repository from Google Code to GitHub
        r356: Show the warning message when and only when keymaps for DirectInput mode are changed
        r355: Stop using non-standard default constructor of std::istream
        r354: Fix style violations in header include guards part 2
        r353: Switch to Android NDK r10c

5 files changed, 30 insertions, 31 deletions

diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index 599cc570f9b..177301595d0 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2014/10/25 21:03:30 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.15 2014/11/07 23:28:36 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-1.15.1895.102
+DISTNAME=	mozc-1.15.1917.102
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pnsft-aur/}
 EXTRACT_SUFX=	.tar.xz
@@ -27,8 +27,8 @@ PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-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
+GCC_REQD+=	4.6
+CXXFLAGS+=	-std=c++03
 
 USE_TOOLS+=	gmake pkg-config
 
diff --git a/inputmethod/mozc-server/distinfo b/inputmethod/mozc-server/distinfo
index bcfb6bd152d..660f7b519a7 100644
--- a/inputmethod/mozc-server/distinfo
+++ b/inputmethod/mozc-server/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.10 2014/10/25 21:03:30 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2014/11/07 23:28:36 ryoon Exp $
 
-SHA1 (mozc-1.15.1895.102.tar.xz) = 28ecf5bfec1706cbffbb73ae6c831158b30af9bd
-RMD160 (mozc-1.15.1895.102.tar.xz) = 029fa3fdd0f410056fcfcfa897dfc6f229425bef
-Size (mozc-1.15.1895.102.tar.xz) = 32468784 bytes
+SHA1 (mozc-1.15.1917.102.tar.xz) = be7f09f424d519c6b856049f587e86072c7aed21
+RMD160 (mozc-1.15.1917.102.tar.xz) = 97b7293339e0791642d791764aae841179b1b2c8
+Size (mozc-1.15.1917.102.tar.xz) = 32524892 bytes
 SHA1 (uim-mozc-334.tar.xz) = af86ce7a04b291629bd5dc56d5c1115332954a91
 RMD160 (uim-mozc-334.tar.xz) = b988667237f65e61fabf3935f83f5d21a8059f4e
 Size (uim-mozc-334.tar.xz) = 30544 bytes
-SHA1 (patch-base_base.gyp) = d1b0c6133bcef09a58bb02da0154fe54a5e71564
+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
@@ -14,11 +14,11 @@ SHA1 (patch-base_mutex.cc) = aed8588d4ff7b057fed072097ef09ddbc2696d31
 SHA1 (patch-base_mutex.h) = 6c3c8f0845f0fdad815c4877026894000d5eac2c
 SHA1 (patch-base_password__manager.cc) = f16982447f54e397d1aa103260d8f4d10aa76f96
 SHA1 (patch-base_process.cc) = abdd6a955e87506972e7f71fd4bc3a300f49b304
-SHA1 (patch-base_run__level.cc) = bf9897527494fda5e5f97366e2fd26a283225450
+SHA1 (patch-base_run__level.cc) = ead96536246093bd3d44f59a80085da2f39904e8
 SHA1 (patch-base_system__util.cc) = f3ef575a15cd518fe7d29264b39f775ccf502802
 SHA1 (patch-base_thread.h) = 8aaacbb1421cf0e886f3b58dfd2c653f3d82ef70
 SHA1 (patch-base_util.cc) = c473cb595535075b53c9c235fc28f5e7da26d087
-SHA1 (patch-build__mozc.py) = b6e94a43564cd4a7032cc9c6d5bd297453010d36
+SHA1 (patch-build__mozc.py) = 693e5d67ddf4dc1bc12fd9fa62bd72654c2ce5bc
 SHA1 (patch-build__tools_mozc__version.py) = a6ff8a82b1328086b7d758f73a7d3c31e87bccc9
 SHA1 (patch-build__tools_util.py) = 6416884ba288d60eb8e558e8c5de7ef6e538b82e
 SHA1 (patch-client_client.cc) = 7ca43dde3f207331005599653c6520667e3ca93c
@@ -26,7 +26,6 @@ SHA1 (patch-config_stats__config__util__test.cc) = db51e6619c5c04ac8fa5089082520
 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-gui_config__dialog_keymap__editor.cc) = a78a4fb5c484e672b0cfecf38c6713cf74007cb5
 SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 3652713857d03f847108952f2994ee44bfe62608
 SHA1 (patch-gui_gui.gyp) = 70b6d78ca5a482b9e8fa697dbb191cccbdde1c6a
 SHA1 (patch-gui_qt__libraries.gypi) = e92be78947dcf66211c80169b864b7c9d057b3db
diff --git a/inputmethod/mozc-server/patches/patch-base_base.gyp b/inputmethod/mozc-server/patches/patch-base_base.gyp
index d6a784b135a..f3c2cd755dd 100644
--- a/inputmethod/mozc-server/patches/patch-base_base.gyp
+++ b/inputmethod/mozc-server/patches/patch-base_base.gyp
@@ -1,6 +1,6 @@
-$NetBSD: patch-base_base.gyp,v 1.4 2014/07/19 09:03:04 ryoon Exp $
+$NetBSD: patch-base_base.gyp,v 1.5 2014/11/07 23:28:36 ryoon Exp $
 
---- base/base.gyp.orig	2014-07-06 07:03:03.000000000 +0000
+--- base/base.gyp.orig	2014-11-03 05:13:02.000000000 +0000
 +++ base/base.gyp
 @@ -78,7 +78,7 @@
          # shared among *host* binaries and *target* binaries. This means that
diff --git a/inputmethod/mozc-server/patches/patch-base_run__level.cc b/inputmethod/mozc-server/patches/patch-base_run__level.cc
index 15ae237684b..3cdc648f9f4 100644
--- a/inputmethod/mozc-server/patches/patch-base_run__level.cc
+++ b/inputmethod/mozc-server/patches/patch-base_run__level.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-base_run__level.cc,v 1.2 2014/07/19 09:03:04 ryoon Exp $
+$NetBSD: patch-base_run__level.cc,v 1.3 2014/11/07 23:28:36 ryoon Exp $
 
---- base/run_level.cc.orig	2014-07-06 07:03:03.000000000 +0000
+--- base/run_level.cc.orig	2014-11-03 05:13:02.000000000 +0000
 +++ base/run_level.cc
 @@ -38,10 +38,10 @@
  #include <unistd.h>
diff --git a/inputmethod/mozc-server/patches/patch-build__mozc.py b/inputmethod/mozc-server/patches/patch-build__mozc.py
index 1d1b017ac26..590c5efcace 100644
--- a/inputmethod/mozc-server/patches/patch-build__mozc.py
+++ b/inputmethod/mozc-server/patches/patch-build__mozc.py
@@ -1,6 +1,6 @@
-$NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
+$NetBSD: patch-build__mozc.py,v 1.6 2014/11/07 23:28:36 ryoon Exp $
 
---- build_mozc.py.orig	2014-07-14 10:14:21.000000000 +0000
+--- build_mozc.py.orig	2014-11-03 05:13:03.000000000 +0000
 +++ build_mozc.py
 @@ -60,6 +60,7 @@ from build_tools.util import FindFileFro
  from build_tools.util import GetNumberOfProcessors
@@ -19,7 +19,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
    elif target_platform == 'Android':
      build_base = 'out_android'
    elif target_platform == 'NaCl':
-@@ -220,6 +223,14 @@ def GetGypFileNames(options):
+@@ -219,6 +222,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)
@@ -34,7 +34,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
    elif options.target_platform == 'NaCl':
      # Add chrome NaCl Mozc gyp scripts.
      gyp_file_names.append('%s/chrome/nacl/nacl_extension.gyp' % SRC_DIR)
-@@ -315,6 +326,8 @@ def AddTargetPlatformOption(parser):
+@@ -314,6 +325,8 @@ def AddTargetPlatformOption(parser):
    # If you want Android build, specify "Android".
    if IsLinux():
      default_target = 'Linux'
@@ -43,7 +43,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
    elif IsWindows():
      default_target = 'Windows'
    elif IsMac():
-@@ -512,6 +525,14 @@ def ExpandMetaTarget(options, meta_targe
+@@ -511,6 +524,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')
@@ -58,7 +58,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
    elif target_platform == 'Mac':
      targets = [SRC_DIR + '/mac/mac.gyp:DiskImage']
    elif target_platform == 'Windows':
-@@ -537,7 +558,7 @@ def ParseBuildOptions(args=None, values=
+@@ -536,7 +557,7 @@ def ParseBuildOptions(args=None, values=
    """Parses command line options for the build command."""
    parser = optparse.OptionParser(usage='Usage: %prog build [options]')
    AddCommonOptions(parser)
@@ -67,7 +67,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
      default_build_concurrency = GetNumberOfProcessors() * 2
      parser.add_option('--jobs', '-j', dest='jobs',
                        default=('%d' % default_build_concurrency),
-@@ -566,7 +587,7 @@ def ParseRunTestsOptions(args=None, valu
+@@ -565,7 +586,7 @@ def ParseRunTestsOptions(args=None, valu
    parser = optparse.OptionParser(
        usage='Usage: %prog runtests [options] [test_targets] [-- build options]')
    AddCommonOptions(parser)
@@ -76,7 +76,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
      default_build_concurrency = GetNumberOfProcessors() * 2
      parser.add_option('--jobs', '-j', dest='jobs',
                        default=('%d' % default_build_concurrency),
-@@ -787,7 +808,8 @@ def GypMain(options, unused_args, _):
+@@ -788,7 +809,8 @@ def GypMain(options, unused_args, _):
      gyp_options.extend(['-D', 'channel_dev=1'])
  
    def SetCommandLineForFeature(option_name, windows=False, mac=False,
@@ -86,7 +86,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
      """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
-@@ -809,6 +831,8 @@ def GypMain(options, unused_args, _):
+@@ -810,6 +832,8 @@ def GypMain(options, unused_args, _):
            option on Android platform.
        nacl: A boolean which replesents the default value of the target
            option on NaCl.
@@ -95,7 +95,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
  
      Raises:
        ValueError: An error occurred when 'option_name' is empty.
-@@ -821,6 +845,7 @@ def GypMain(options, unused_args, _):
+@@ -822,6 +846,7 @@ def GypMain(options, unused_args, _):
                         'Mac': mac,
                         'Linux': linux,
                         'Android': android,
@@ -103,7 +103,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
                         'NaCl': nacl}[options.target_platform]
      enable_option_name = 'enable_%s' % option_name
      enabled = options.ensure_value(enable_option_name, default_enabled)
-@@ -832,10 +857,12 @@ def GypMain(options, unused_args, _):
+@@ -833,10 +858,12 @@ def GypMain(options, unused_args, _):
  
    SetCommandLineForFeature(option_name='cloud_handwriting',
                             linux=is_official_dev,
@@ -116,7 +116,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
                             windows=is_official,
                             mac=is_official,
                             android=is_official,
-@@ -873,7 +900,8 @@ def GypMain(options, unused_args, _):
+@@ -874,7 +901,8 @@ def GypMain(options, unused_args, _):
    else:
      gyp_options.extend(['-D', 'use_zinnia=NO'])
  
@@ -126,7 +126,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
        '%s/unix/ibus/ibus.gyp' % SRC_DIR in gyp_file_names):
      gyp_options.extend(['-D', 'use_libibus=1'])
  
-@@ -906,7 +934,7 @@ def GypMain(options, unused_args, _):
+@@ -907,7 +935,7 @@ def GypMain(options, unused_args, _):
    # command for pkg-config.  Here we catch the environment variable
    # and use the specified command instead of actual pkg-config
    # command.
@@ -135,7 +135,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
      gyp_options.extend(['-D', 'pkg_config_command=%s' % GetPkgConfigCommand()])
    else:
      gyp_options.extend(['-D', 'pkg_config_command='])
-@@ -1050,6 +1078,25 @@ def BuildOnMac(options, targets, origina
+@@ -1045,6 +1073,25 @@ def BuildOnMac(options, targets, origina
                '-parallelizeTargets',
                'BUILD_WITH_GYP=1'])
  
@@ -161,7 +161,7 @@ $NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $
  
  def BuildOnWindows(targets):
    """Build the target on Windows."""
-@@ -1077,6 +1124,8 @@ def BuildMain(options, targets, original
+@@ -1072,6 +1119,8 @@ def BuildMain(options, targets, original
      BuildOnMac(options, targets, original_directory_name)
    elif IsLinux():
      BuildOnLinux(options, targets, original_directory_name)