1 files changed, 0 insertions, 150 deletions
diff --git a/japanese/mozc-server/files/patch-src-gyp_common.gypi b/japanese/mozc-server/files/patch-src-gyp_common.gypi
deleted file mode 100644
index 64edadcbeffe..000000000000
--- a/japanese/mozc-server/files/patch-src-gyp_common.gypi
+++ /dev/null
@@ -1,150 +0,0 @@
---- src/gyp/common.gypi.orig	2016-03-13 11:22:55.000000000 +0900
-+++ src/gyp/common.gypi	2016-05-11 00:09:18.009062000 +0900
-@@ -109,7 +109,7 @@
-     ],
-     # Libraries for GNU/Linux environment.
-     'linux_ldflags': [
--      '-pthread',
-+      '-lpthread',
-     ],
- 
-     # Extra defines
-@@ -161,9 +161,9 @@
-       ['target_platform=="Linux"', {
-         # enable_gtk_renderer represents if mozc_renderer is supported on Linux
-         # or not.
--        'compiler_target': 'clang',
-+        'compiler_target': '<(compiler_target)',
-         'compiler_target_version_int': 304,  # Clang 3.4 or higher
--        'compiler_host': 'clang',
-+        'compiler_host': '<(compiler_host)',
-         'compiler_host_version_int': 304,  # Clang 3.4 or higher
-         'enable_gtk_renderer%': 1,
-       }, {  # else
-@@ -208,6 +208,14 @@
-     # installed. This option is only for Linux.
-     'server_dir%': '/usr/lib/mozc',
- 
-+    # renderer_dir represents the directory where mozc_renderer is
-+    # installed. This option is only for Linux.
-+    'renderer_dir%': '/usr/lib/mozc',
-+
-+    # tool_dir represents the directory where mozc_tool is
-+    # installed. This option is only for Linux.
-+    'tool_dir%': '/usr/lib/mozc',
-+
-     # Represents the directory where the source code of protobuf is
-     # extracted. This value is ignored when 'use_libprotobuf' is 1.
-     'protobuf_root': '<(third_party_dir)/protobuf',
-@@ -415,7 +423,7 @@
-           },
-         },
-         'conditions': [
--          ['OS=="linux"', {
-+          ['OS=="linux" or OS=="freebsd"', {
-             'cflags': [
-               '<@(debug_extra_cflags)',
-             ],
-@@ -481,7 +489,7 @@
-           },
-         },
-         'conditions': [
--          ['OS=="linux"', {
-+          ['OS=="linux" or OS=="freebsd"', {
-             'cflags': [
-               '<@(release_extra_cflags)',
-             ],
-@@ -533,17 +541,20 @@
-           ['compiler_target=="clang"', {
-             'cflags': [
-               '-Wtype-limits',
-+	      '<@(cflags)',
-             ],
-             'cflags_cc': [
-               '-Wno-covered-switch-default',
-               '-Wno-unnamed-type-template-args',
-               '-Wno-c++11-narrowing',
--              '-std=gnu++0x',
-+              '-std=c++11',
-+	      '<@(cflags_cc)',
-             ],
-           }],
--          ['compiler_target=="clang" or compiler_target=="gcc"', {
-+          ['compiler_host=="gcc"', {
-             'cflags_cc': [
--              '-std=gnu++0x',
-+              '-std=gnu++11',
-+	      '<@(cflags_cc)',
-             ],
-           }],
-         ],
-@@ -553,17 +564,20 @@
-           ['compiler_host=="clang"', {
-             'cflags': [
-               '-Wtype-limits',
-+	      '<@(cflags)',
-             ],
-             'cflags_cc': [
-               '-Wno-covered-switch-default',
-               '-Wno-unnamed-type-template-args',
-               '-Wno-c++11-narrowing',
--              '-std=gnu++0x',
-+              '-std=c++11',
-+	      '<@(cflags_cc)',
-             ],
-           }],
--          ['compiler_host=="clang" or compiler_host=="gcc"', {
-+          ['compiler_host=="gcc"', {
-             'cflags_cc': [
--              '-std=gnu++0x',
-+              '-std=gnu++11',
-+	      '<@(cflags_cc)',
-             ],
-           }],
-         ],
-@@ -578,7 +592,7 @@
-       ['channel_dev==1', {
-         'defines': ['CHANNEL_DEV'],
-       }],
--      ['OS=="linux"', {
-+      ['OS=="linux" or OS=="freebsd"', {
-         'ldflags': [
-           '<@(linux_ldflags)',
-         ],
-@@ -694,21 +708,34 @@
-           },
-         },
-       }],
--      ['OS=="linux"', {
-+      ['OS=="linux" or OS=="freebsd"', {
-         'cflags': [
-           '<@(warning_cflags)',
-           '-fPIC',
-           '-fno-exceptions',
-+          '<@(cflags)',
-         ],
-         'cflags_cc': [
-           # We use deprecated <hash_map> and <hash_set> instead of upcoming
-           # <unordered_map> and <unordered_set>.
-           '-Wno-deprecated',
-+          '<@(cflags_cc)',
-         ],
-+        'include_dirs': [
-+          '<@(include_dirs)',
-+        ], 
-+        'ldflags': [
-+          '<@(ldflags)',
-+          '-fstack-protector',
-+        ], 
-         'conditions': [
-           ['target_platform=="Linux"', {
-             # OS_LINUX is defined always (target and host).
--            'defines': ['OS_LINUX',],
-+            'defines': [
-+		'OS_LINUX',
-+		'OS_FREEBSD',
-+		'LOCALBASE="<@(localbase)"',
-+		],
-           }],
-           ['target_platform=="Android"', {
-             'defines': ['NO_USAGE_REWRITER'],