Update to 2.16.2007.102

Changelog:
Summary of changes between 2.16.2004.102 (r467) and 2.16.2007.102 (r470).

    DEPS changes:
        fontTools: initial import as of 5ba7d98a4153fad57258fca23b0bcb238717aec3
    Build related changes:
        Android build requires Android-21 SDK
    Major changes:
        Enable Material Theme on Android
        Support floating window and floating mode indicator on Android 5.0 and later when physical keyboard is attached
        Improve accessibility support on Android
    Known issues:
        Voiced sound marks on the key pad is not placed at correct position in Android (Issue 263)


Summary of changes between 2.16.1918.102 (r377) and 2.16.2003.102 (r463).

    DEPS changes:
        gtest: r692 -> r700
        gmock: r485 -> r501
        gyp: r1987 -> r2012
        protobuf: 172019c40bf548908ab09bfd276074c929d48415 -> bba83652e1be610bdb7ee1566ad18346d98b843c
    Build related changes:
        Android build requires NDK r10d
        Android build supports arm64/mips64/x86-64 ( Issue 259 )
        Android build supports Clang 3.5 and libc++ ( Issue 260 )
        Versioning scheme for Android is changed. See r439 for details.
        Build time dependency on libzinnia-dev is removed from Android and NaCl builds
    Major changes:
        Android 2.1 - Android 3.2 are no longer supported
        armeabi-v7a is always enabled in arm 32-bit build for Android
        Updated main dictionary, Emoji dictionary, emoticon dictionary, and single kanji dictionary
    Fixed issues:
        FIX: IME crashes when using US International hardware keyboard ( Issue 248 )
        FIX: ibus-mozc + XIM: preedit text is not cleared after preedit commit triggered by focus change ( Issue 255 )
        FIX: Entering symbol view causes NPE when "Switch Access" accessibility mode is enabled ( Issue 257 )
        FIX: An empty word can be suggested in the candidate list ( Issue 261 )

5 files changed, 14 insertions, 42 deletions

diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index 6bb0c0fe5d7..6295772ba47 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2014/12/30 21:38:08 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.17 2015/01/06 10:30:54 ryoon Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -7,9 +7,9 @@
 # used by inputmethod/uim-mozc/Makefile
 #
 
-DISTNAME=	mozc-1.15.1917.102
+DISTNAME=	mozc-2.16.2007.102
 CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pnsft-aur/}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	ryoon@NetBSD.org
diff --git a/inputmethod/mozc-server/distinfo b/inputmethod/mozc-server/distinfo
index 660f7b519a7..03d798d6cd2 100644
--- a/inputmethod/mozc-server/distinfo
+++ b/inputmethod/mozc-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2014/11/07 23:28:36 ryoon Exp $
+$NetBSD: distinfo,v 1.12 2015/01/06 10:30:54 ryoon Exp $
 
-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 (mozc-2.16.2007.102.tar.xz) = b77c44a6d8527b89c557068c66bc370ea1592b76
+RMD160 (mozc-2.16.2007.102.tar.xz) = d6183c14bfc3f6a4702d1192e07d7af73d287215
+Size (mozc-2.16.2007.102.tar.xz) = 47739136 bytes
 SHA1 (uim-mozc-334.tar.xz) = af86ce7a04b291629bd5dc56d5c1115332954a91
 RMD160 (uim-mozc-334.tar.xz) = b988667237f65e61fabf3935f83f5d21a8059f4e
 Size (uim-mozc-334.tar.xz) = 30544 bytes
@@ -16,9 +16,8 @@ SHA1 (patch-base_password__manager.cc) = f16982447f54e397d1aa103260d8f4d10aa76f9
 SHA1 (patch-base_process.cc) = abdd6a955e87506972e7f71fd4bc3a300f49b304
 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) = 693e5d67ddf4dc1bc12fd9fa62bd72654c2ce5bc
+SHA1 (patch-build__mozc.py) = 2e5448bb1bc07cdf9410ce1adf918416a1302db4
 SHA1 (patch-build__tools_mozc__version.py) = a6ff8a82b1328086b7d758f73a7d3c31e87bccc9
 SHA1 (patch-build__tools_util.py) = 6416884ba288d60eb8e558e8c5de7ef6e538b82e
 SHA1 (patch-client_client.cc) = 7ca43dde3f207331005599653c6520667e3ca93c
@@ -39,7 +38,7 @@ SHA1 (patch-ipc_ipc__path__manager__test.cc) = 90ea81daef93dc1ad5cee792ced26a9a2
 SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
 SHA1 (patch-ipc_unix__ipc.cc) = d821deb2f38bf77bf6b364eb31d419c0a86c1a7f
 SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea
-SHA1 (patch-protobuf_protobuf.gyp) = c1b08a30b8f9b2ca0d7cac180891cf3d9bc257f3
+SHA1 (patch-protobuf_protobuf.gyp) = 35059f0e24a9d47ca5224a892de84890d72acdf4
 SHA1 (patch-session_session.cc) = 0562f8646dc6f68e180d8ae98f00eeb0364fc473
 SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465
 SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95
diff --git a/inputmethod/mozc-server/patches/patch-base_thread.h b/inputmethod/mozc-server/patches/patch-base_thread.h
deleted file mode 100644
index a51523272c9..00000000000
--- a/inputmethod/mozc-server/patches/patch-base_thread.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-base_thread.h,v 1.2 2013/07/20 04:34:53 ryoon Exp $
-
---- base/thread.h.orig	2013-07-17 02:38:04.000000000 +0000
-+++ base/thread.h
-@@ -55,11 +55,11 @@
- 
- // Andorid NDK and NaCl don't support TLS.
- #if defined(OS_LINUX) && !defined(OS_ANDROID) && \
--    !defined(__native_client__) && (defined(__GNUC__) || defined(__clang__))
-+    !defined(__native_client__) && (defined(__GNUC__) || defined(__clang__)) || defined(OS_NETBSD)
- // GCC and Clang support TLS.
- #define TLS_KEYWORD __thread
- #define HAVE_TLS 1
--#endif  // OS_LINUX && !OS_ANDROID && (__GNUC__ || __clang__)
-+#endif  // OS_LINUX && !OS_ANDROID && (__GNUC__ || __clang__) || OS_NETBSD
- 
- 
- #if defined(OS_MACOSX) && MOZC_GCC_VERSION_GE(4, 5)
diff --git a/inputmethod/mozc-server/patches/patch-build__mozc.py b/inputmethod/mozc-server/patches/patch-build__mozc.py
index 590c5efcace..d6d0540f656 100644
--- a/inputmethod/mozc-server/patches/patch-build__mozc.py
+++ b/inputmethod/mozc-server/patches/patch-build__mozc.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-build__mozc.py,v 1.6 2014/11/07 23:28:36 ryoon Exp $
+$NetBSD: patch-build__mozc.py,v 1.7 2015/01/06 10:30:54 ryoon Exp $
 
 --- build_mozc.py.orig	2014-11-03 05:13:03.000000000 +0000
 +++ build_mozc.py
@@ -72,7 +72,7 @@ $NetBSD: patch-build__mozc.py,v 1.6 2014/11/07 23:28:36 ryoon Exp $
        usage='Usage: %prog runtests [options] [test_targets] [-- build options]')
    AddCommonOptions(parser)
 -  if IsLinux():
-+  if IsLinux() or ISNetBSD():
++  if IsLinux() or IsNetBSD():
      default_build_concurrency = GetNumberOfProcessors() * 2
      parser.add_option('--jobs', '-j', dest='jobs',
                        default=('%d' % default_build_concurrency),
diff --git a/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp b/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
index 40c79dbfde4..bb983977a2a 100644
--- a/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
+++ b/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp
@@ -1,17 +1,8 @@
-$NetBSD: patch-protobuf_protobuf.gyp,v 1.4 2014/06/15 13:08:34 ryoon Exp $
+$NetBSD: patch-protobuf_protobuf.gyp,v 1.5 2015/01/06 10:30:54 ryoon Exp $
 
---- protobuf/protobuf.gyp.orig	2014-05-21 10:49:57.000000000 +0000
+--- protobuf/protobuf.gyp.orig	2015-01-06 06:21:18.000000000 +0000
 +++ protobuf/protobuf.gyp
-@@ -211,7 +211,7 @@
-         '<(protobuf_root)/src',
-       ],
-       'conditions': [
--        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="netbsd"', {
-           'conditions': [
-             ['use_libprotobuf!=1', {
-               'cflags': [
-@@ -247,7 +247,7 @@
+@@ -254,7 +254,7 @@
        },
        'conditions': [
          # use system-installed protoc on Linux