18 files changed, 36 insertions, 57 deletions

diff --git a/japanese/mozc-server/files/patch-base_iconv.cc b/japanese/mozc-server/files/patch-base_iconv.cc
index 460088a58f18..d272af94178d 100644
--- a/japanese/mozc-server/files/patch-base_iconv.cc
+++ b/japanese/mozc-server/files/patch-base_iconv.cc
@@ -1,4 +1,4 @@
---- base/iconv.cc.orig	2012-03-16 10:48:02.102712152 +0900
+--- base/iconv.cc.orig	2012-04-02 08:17:52.697727632 +0900
 +++ base/iconv.cc	2012-03-16 10:59:56.300711667 +0900
 @@ -52,7 +52,11 @@
    size_t olen_org = olen;
diff --git a/japanese/mozc-server/files/patch-base_logging.cc b/japanese/mozc-server/files/patch-base_logging.cc
deleted file mode 100644
index 5908641f2a25..000000000000
--- a/japanese/mozc-server/files/patch-base_logging.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- base/logging.cc.orig	2012-03-16 10:48:02.103712883 +0900
-+++ base/logging.cc	2012-01-29 13:49:21.256805888 +0900
-@@ -212,7 +212,7 @@
-   char buf[512];
-   snprintf(buf, sizeof(buf),
-            "%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d %u "
--#ifndef OS_LINUX  // = OS_WINDOWS or OS_MACOSX
-+#if !defined(OS_LINUX) && !defined(__FreeBSD__) // = OS_WINDOWS or OS_MACOSX
-            "%u",
- #else
-            "%lu",
-@@ -229,6 +229,9 @@
- #elif defined(OS_MACOSX)
-            ::getpid(),
-            reinterpret_cast<uint32>(pthread_self())
-+#elif defined(__FreeBSD__)
-+           ::getpid(),
-+           (uint64_t)pthread_self()
- #else  // = OS_LINUX
-            ::getpid(),
-            pthread_self()  // returns unsigned long.
diff --git a/japanese/mozc-server/files/patch-base_mutex.h b/japanese/mozc-server/files/patch-base_mutex.h
index 26a7dcf6940e..b4ad2d8316f3 100644
--- a/japanese/mozc-server/files/patch-base_mutex.h
+++ b/japanese/mozc-server/files/patch-base_mutex.h
@@ -1,4 +1,4 @@
---- base/mutex.h.orig	2012-03-16 10:48:02.113712658 +0900
+--- base/mutex.h.orig	2012-04-02 08:17:52.701727232 +0900
 +++ base/mutex.h	2012-01-29 13:49:20.902806916 +0900
 @@ -82,11 +82,11 @@
      // PTHREAD_MUTEX_RECURSIVE_NP and PTHREAD_MUTEX_RECURSIVE seem to be
diff --git a/japanese/mozc-server/files/patch-base_process.cc b/japanese/mozc-server/files/patch-base_process.cc
index b31258c5dcc2..ac3969dde839 100644
--- a/japanese/mozc-server/files/patch-base_process.cc
+++ b/japanese/mozc-server/files/patch-base_process.cc
@@ -1,4 +1,4 @@
---- base/process.cc.orig	2012-03-16 10:48:02.109712053 +0900
+--- base/process.cc.orig	2012-04-02 08:17:52.696726946 +0900
 +++ base/process.cc	2012-01-29 13:49:21.340806019 +0900
 @@ -120,13 +120,18 @@
    return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW);
diff --git a/japanese/mozc-server/files/patch-build_mozc.py b/japanese/mozc-server/files/patch-build_mozc.py
index 76c6dae0a186..873391ff412e 100644
--- a/japanese/mozc-server/files/patch-build_mozc.py
+++ b/japanese/mozc-server/files/patch-build_mozc.py
@@ -1,6 +1,6 @@
---- build_mozc.py.orig	2012-03-16 10:48:09.087711537 +0900
-+++ build_mozc.py	2012-03-16 10:59:56.396715771 +0900
-@@ -70,7 +70,7 @@
+--- build_mozc.py.orig	2012-04-02 08:17:58.918726529 +0900
++++ build_mozc.py	2012-04-02 08:38:43.715726567 +0900
+@@ -76,7 +76,7 @@
  
  def IsLinux():
    """Returns true if the platform is Linux."""
diff --git a/japanese/mozc-server/files/patch-build_tools_mozc_version.py b/japanese/mozc-server/files/patch-build_tools_mozc_version.py
index d134a061cd78..25bb3addeb8f 100644
--- a/japanese/mozc-server/files/patch-build_tools_mozc_version.py
+++ b/japanese/mozc-server/files/patch-build_tools_mozc_version.py
@@ -1,5 +1,5 @@
---- build_tools/mozc_version.py.orig	2012-03-16 10:48:02.096712071 +0900
-+++ build_tools/mozc_version.py	2012-01-29 13:49:15.791805587 +0900
+--- build_tools/mozc_version.py.orig	2012-04-02 08:17:52.764727837 +0900
++++ build_tools/mozc_version.py	2012-04-02 08:24:23.896726946 +0900
 @@ -56,7 +56,7 @@
  
  def IsLinux():
diff --git a/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc b/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc
index 2422ce538340..8600a618bf24 100644
--- a/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc
+++ b/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc
@@ -1,4 +1,4 @@
---- gui/about_dialog/about_dialog.cc.orig	2012-03-16 10:48:02.153986629 +0900
+--- gui/about_dialog/about_dialog.cc.orig	2012-04-02 08:17:52.786726932 +0900
 +++ gui/about_dialog/about_dialog.cc	2012-01-29 13:49:18.542805785 +0900
 @@ -119,7 +119,11 @@
    SetLabelText(label_terms);
diff --git a/japanese/mozc-server/files/patch-gyp_common.gypi b/japanese/mozc-server/files/patch-gyp_common.gypi
index 90d9aadb91e3..092dd9009323 100644
--- a/japanese/mozc-server/files/patch-gyp_common.gypi
+++ b/japanese/mozc-server/files/patch-gyp_common.gypi
@@ -1,6 +1,6 @@
---- gyp/common.gypi.orig	2012-03-16 10:48:02.138711974 +0900
-+++ gyp/common.gypi	2012-03-16 10:59:55.917712287 +0900
-@@ -43,7 +43,7 @@
+--- gyp/common.gypi.orig	2012-04-02 08:17:52.785727643 +0900
++++ gyp/common.gypi	2012-04-02 08:32:43.630727845 +0900
+@@ -53,7 +53,7 @@
      # warning_cflags will be shared with Mac and Linux.
      'warning_cflags': [
        '-Wall',
@@ -9,7 +9,7 @@
        '-Wno-char-subscripts',
        '-Wno-sign-compare',
        '-Wno-deprecated-declarations',
-@@ -593,6 +593,12 @@
+@@ -717,6 +717,12 @@
            # <unordered_map> and <unordered_set>.
            '-Wno-deprecated',
          ],
@@ -19,6 +19,6 @@
 +        'ldflags': [
 +          '-L@@LOCALBASE@@/lib'
 +        ],
-         'link_settings': {
-           'libraries': [
-             '<@(linux_libs)',
+         'conditions': [
+           ['target_platform!="Android"', {
+             'link_settings': {
diff --git a/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc b/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc
index dce0ecbc15c6..6043e8bcc9bd 100644
--- a/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc
+++ b/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc
@@ -1,5 +1,5 @@
---- handwriting/zinnia_handwriting.cc.orig	2012-03-16 10:48:02.136714319 +0900
-+++ handwriting/zinnia_handwriting.cc	2012-01-29 13:49:21.926806405 +0900
+--- handwriting/zinnia_handwriting.cc.orig	2012-04-02 08:17:52.785727643 +0900
++++ handwriting/zinnia_handwriting.cc	2012-04-02 08:38:43.657727715 +0900
 @@ -49,10 +49,16 @@
    const char kModelFile[] = "handwriting-light-ja.model";
    return Util::JoinPath(MacUtil::GetResourcesDirectory(), kModelFile);
diff --git a/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc b/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc
index 33b6abed74df..ec466af9b43c 100644
--- a/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc
+++ b/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc
@@ -1,6 +1,6 @@
---- ipc/ipc_path_manager.cc.orig	2012-03-16 10:48:02.136714319 +0900
-+++ ipc/ipc_path_manager.cc	2012-03-16 10:59:56.379712949 +0900
-@@ -274,7 +274,7 @@
+--- ipc/ipc_path_manager.cc.orig	2012-04-02 08:17:58.917725634 +0900
++++ ipc/ipc_path_manager.cc	2012-04-02 08:38:43.523726676 +0900
+@@ -272,7 +272,7 @@
    *ipc_name = kIPCPrefix;
  #endif  // OS_WINDOWS
  
diff --git a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc b/japanese/mozc-server/files/patch-ipc_unix_ipc.cc
index 077783871915..542c9a86d599 100644
--- a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc
+++ b/japanese/mozc-server/files/patch-ipc_unix_ipc.cc
@@ -1,4 +1,4 @@
---- ipc/unix_ipc.cc.orig	2012-03-16 10:48:02.134842636 +0900
+--- ipc/unix_ipc.cc.orig	2012-04-02 08:17:58.917725634 +0900
 +++ ipc/unix_ipc.cc	2012-01-29 13:49:21.405805900 +0900
 @@ -41,7 +41,7 @@
  #include <sys/time.h>
diff --git a/japanese/mozc-server/files/patch-server_mozc_server.cc b/japanese/mozc-server/files/patch-server_mozc_server.cc
index b048b501cc65..fdc18312268f 100644
--- a/japanese/mozc-server/files/patch-server_mozc_server.cc
+++ b/japanese/mozc-server/files/patch-server_mozc_server.cc
@@ -1,5 +1,5 @@
---- server/mozc_server.cc.orig	2012-03-16 10:48:02.074712300 +0900
-+++ server/mozc_server.cc	2012-01-29 13:49:16.896805385 +0900
+--- server/mozc_server.cc.orig	2012-04-02 08:17:52.743727333 +0900
++++ server/mozc_server.cc	2012-04-02 08:24:24.633727039 +0900
 @@ -32,6 +32,9 @@
  #ifdef OS_WINDOWS
  #include <windows.h>
@@ -10,7 +10,7 @@
  
  #include "base/base.h"
  #include "base/process.h"
-@@ -50,6 +53,23 @@
+@@ -49,6 +52,23 @@
  mozc::SessionServer *g_session_server = NULL;
  }
  
@@ -34,7 +34,7 @@
  namespace mozc {
  namespace {
  
-@@ -132,6 +152,12 @@
+@@ -127,6 +147,12 @@
        return -1;
      }
  
diff --git a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py b/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py
index a833bfeb1555..0a94465d713e 100644
--- a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py
+++ b/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py
@@ -1,4 +1,4 @@
---- third_party/gyp/pylib/gyp/common.py.orig	2012-03-16 10:48:02.041717236 +0900
+--- third_party/gyp/pylib/gyp/common.py.orig	2012-04-02 08:17:52.712725348 +0900
 +++ third_party/gyp/pylib/gyp/common.py	2012-01-30 15:35:06.300889252 +0900
 @@ -351,8 +351,10 @@
    flavors = {
diff --git a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py b/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py
index 8ed8b3f6e8b4..80baf92a6fee 100644
--- a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py
+++ b/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py
@@ -1,4 +1,4 @@
---- third_party/gyp/pylib/gyp/generator/make.py.orig	2012-03-16 10:48:02.039723886 +0900
+--- third_party/gyp/pylib/gyp/generator/make.py.orig	2012-04-02 08:17:52.711727455 +0900
 +++ third_party/gyp/pylib/gyp/generator/make.py	2012-01-30 15:37:51.791889791 +0900
 @@ -1998,6 +1998,9 @@
      srcdir_prefix = '$(srcdir)/'
diff --git a/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py b/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py
index 775fd05bba72..c89a8829d06b 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py
+++ b/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py
@@ -1,4 +1,4 @@
---- unix/ibus/gen_mozc_xml.py.orig	2012-03-16 10:48:02.015738213 +0900
+--- unix/ibus/gen_mozc_xml.py.orig	2012-04-02 08:17:52.706728426 +0900
 +++ unix/ibus/gen_mozc_xml.py	2012-01-29 13:49:15.972806246 +0900
 @@ -39,6 +39,7 @@
  
diff --git a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc b/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
index 52d6c7aa590b..041472c181e2 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
+++ b/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
@@ -1,6 +1,6 @@
---- unix/ibus/mozc_engine.cc.orig	2012-03-16 10:48:02.015738213 +0900
-+++ unix/ibus/mozc_engine.cc	2012-03-16 12:46:11.976711448 +0900
-@@ -192,14 +192,14 @@
+--- unix/ibus/mozc_engine.cc.orig	2012-04-02 08:17:52.706728426 +0900
++++ unix/ibus/mozc_engine.cc	2012-04-02 08:24:23.981727483 +0900
+@@ -226,14 +226,14 @@
  
    COMPILE_ASSERT(sizeof(int64) > sizeof(guint), int64_guint_check);
    const int64 kInt32AbsMax =
@@ -18,7 +18,7 @@
      return false;
    }
  
-@@ -1360,7 +1360,7 @@
+@@ -1598,7 +1598,7 @@
        //     on size_t, not uint32.
        string selection_text;
        const uint32 selection_start = min(cursor_pos, anchor_pos);
diff --git a/japanese/mozc-server/files/patch-unix_ibus_path_util.cc b/japanese/mozc-server/files/patch-unix_ibus_path_util.cc
index 5c287fe450ab..1a513f289cbe 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_path_util.cc
+++ b/japanese/mozc-server/files/patch-unix_ibus_path_util.cc
@@ -1,4 +1,4 @@
---- unix/ibus/path_util.cc.orig	2012-03-16 10:48:02.017713438 +0900
+--- unix/ibus/path_util.cc.orig	2012-04-02 08:17:52.705727810 +0900
 +++ unix/ibus/path_util.cc	2012-01-29 13:49:15.994806248 +0900
 @@ -30,14 +30,22 @@
  #include "unix/ibus/path_util.h"
diff --git a/japanese/mozc-server/files/patch-unix_scim_scim.gyp b/japanese/mozc-server/files/patch-unix_scim_scim.gyp
index 84a090e15566..114ea5784f69 100644
--- a/japanese/mozc-server/files/patch-unix_scim_scim.gyp
+++ b/japanese/mozc-server/files/patch-unix_scim_scim.gyp
@@ -1,5 +1,5 @@
---- unix/scim/scim.gyp.orig	2012-03-16 10:48:02.019712085 +0900
-+++ unix/scim/scim.gyp	2012-03-16 10:59:20.258715241 +0900
+--- unix/scim/scim.gyp.orig	2012-04-02 08:17:52.708727144 +0900
++++ unix/scim/scim.gyp	2012-04-02 08:24:24.095725631 +0900
 @@ -39,7 +39,7 @@
        'gtk+-2.0',
      ],