diff options
author | Daichi GOTO <daichi@FreeBSD.org> | 2010-06-26 08:06:48 +0000 |
---|---|---|
committer | Daichi GOTO <daichi@FreeBSD.org> | 2010-06-26 08:06:48 +0000 |
commit | 753b49d51f6c7562ffa64edef755866392ee625e (patch) | |
tree | 3f52aeb03b2e38015f3573316d1deba41b30b6bd /japanese/mozc-server/files | |
parent | c29df41fd1641d65a51a067654b75d0891919c70 (diff) | |
download | ports-753b49d51f6c7562ffa64edef755866392ee625e.tar.gz ports-753b49d51f6c7562ffa64edef755866392ee625e.zip |
Add a new port: mozc-server
- Mozc server for IBus, SCIM and others
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=257010
Diffstat (limited to 'japanese/mozc-server/files')
-rw-r--r-- | japanese/mozc-server/files/patch-src_base_iconv.cc | 11 | ||||
-rw-r--r-- | japanese/mozc-server/files/patch-src_base_mutex.h | 11 | ||||
-rw-r--r-- | japanese/mozc-server/files/patch-src_base_process.cc | 11 | ||||
-rw-r--r-- | japanese/mozc-server/files/patch-src_base_util.cc | 11 | ||||
-rw-r--r-- | japanese/mozc-server/files/patch-src_build_mozc.py | 20 | ||||
-rw-r--r-- | japanese/mozc-server/files/patch-src_gyp_common.gypi | 15 | ||||
-rw-r--r-- | japanese/mozc-server/files/patch-src_ipc_unix_ipc.cc | 29 |
7 files changed, 108 insertions, 0 deletions
diff --git a/japanese/mozc-server/files/patch-src_base_iconv.cc b/japanese/mozc-server/files/patch-src_base_iconv.cc new file mode 100644 index 000000000000..5a928e254b27 --- /dev/null +++ b/japanese/mozc-server/files/patch-src_base_iconv.cc @@ -0,0 +1,11 @@ +--- base/iconv.cc.org 2010-06-17 15:59:08.032915669 +0900 ++++ base/iconv.cc 2010-06-26 14:52:20.086054034 +0900 +@@ -52,7 +52,7 @@ + size_t olen_org = olen; + iconv(ic, 0, &ilen, 0, &olen); // reset iconv state + while (ilen != 0) { +- if (iconv(ic, reinterpret_cast<char **>(&ibuf), &ilen, &obuf, &olen) ++ if (iconv(ic, (const char **)(&ibuf), &ilen, &obuf, &olen) + == static_cast<size_t>(-1)) { + return; + } diff --git a/japanese/mozc-server/files/patch-src_base_mutex.h b/japanese/mozc-server/files/patch-src_base_mutex.h new file mode 100644 index 000000000000..4249feff64fc --- /dev/null +++ b/japanese/mozc-server/files/patch-src_base_mutex.h @@ -0,0 +1,11 @@ +--- base/mutex.h.org 2010-06-17 15:59:08.032915669 +0900 ++++ base/mutex.h 2010-06-26 14:42:34.171132724 +0900 +@@ -87,7 +87,7 @@ + #endif + + #ifdef OS_LINUX +-#define PTHREAD_MUTEX_RECURSIVE_VALUE PTHREAD_MUTEX_RECURSIVE_NP ++#define PTHREAD_MUTEX_RECURSIVE_VALUE PTHREAD_MUTEX_RECURSIVE + #endif + + pthread_mutexattr_t attr; diff --git a/japanese/mozc-server/files/patch-src_base_process.cc b/japanese/mozc-server/files/patch-src_base_process.cc new file mode 100644 index 000000000000..9832c2f21642 --- /dev/null +++ b/japanese/mozc-server/files/patch-src_base_process.cc @@ -0,0 +1,11 @@ +--- base/process.cc.org 2010-06-17 15:59:08.038677016 +0900 ++++ base/process.cc 2010-06-26 15:14:15.207482874 +0900 +@@ -195,7 +195,7 @@ + #endif + + #ifdef OS_LINUX +- static const char kBrowserCommand[] = "/usr/bin/xdg-open"; ++ static const char kBrowserCommand[] = "@@LOCALBASE@@/bin/xdg-open"; + // xdg-open which uses kfmclient or gnome-open internally works both on KDE + // and GNOME environments. + return SpawnProcess(kBrowserCommand, url); diff --git a/japanese/mozc-server/files/patch-src_base_util.cc b/japanese/mozc-server/files/patch-src_base_util.cc new file mode 100644 index 000000000000..b338a19eb60e --- /dev/null +++ b/japanese/mozc-server/files/patch-src_base_util.cc @@ -0,0 +1,11 @@ +--- base/util.cc.org 2010-06-17 15:59:08.035797879 +0900 ++++ base/util.cc 2010-06-26 15:18:24.444371641 +0900 +@@ -1493,7 +1493,7 @@ + #endif // OS_MACOSX + + #ifdef OS_LINUX +- return "/usr/lib/mozc"; ++ return "@@LOCALBASE@@/bin"; + #endif // OS_LINUX + } + diff --git a/japanese/mozc-server/files/patch-src_build_mozc.py b/japanese/mozc-server/files/patch-src_build_mozc.py new file mode 100644 index 000000000000..ba044b1cad4a --- /dev/null +++ b/japanese/mozc-server/files/patch-src_build_mozc.py @@ -0,0 +1,20 @@ +--- build_mozc.py.org 2010-06-17 15:59:08.104932923 +0900 ++++ build_mozc.py 2010-06-26 14:43:42.504687128 +0900 +@@ -68,7 +68,7 @@ + + def IsLinux(): + """Returns true if the platform is Linux.""" +- return os.name == 'posix' and os.uname()[0] == 'Linux' ++ return os.name == 'posix' and os.uname()[0] == 'FreeBSD' + + + def GetGeneratorName(): +@@ -403,7 +403,7 @@ + (unused_gyp_file_name, target_name) = ParseTarget(target) + target_names.append(target_name) + +- make_command = os.getenv('BUILD_COMMAND', 'make') ++ make_command = os.getenv('BUILD_COMMAND', 'gmake') + # flags for building in Chrome OS chroot environment + envvars = [ + 'CFLAGS', diff --git a/japanese/mozc-server/files/patch-src_gyp_common.gypi b/japanese/mozc-server/files/patch-src_gyp_common.gypi new file mode 100644 index 000000000000..6bd13450d867 --- /dev/null +++ b/japanese/mozc-server/files/patch-src_gyp_common.gypi @@ -0,0 +1,15 @@ +--- gyp/common.gypi.org 2010-06-17 15:59:08.053080522 +0900 ++++ gyp/common.gypi 2010-06-26 14:48:00.645671527 +0900 +@@ -371,6 +371,12 @@ + '-lz', + '<@(extra_linux_libs)', + ], ++ 'include_dirs': [ ++ '@@LOCALBASE@@/include' ++ ], ++ 'ldflags': [ ++ '-L@@LOCALBASE@@/lib' ++ ], + 'conditions': [ + ['chromeos==1', { + 'defines': [ diff --git a/japanese/mozc-server/files/patch-src_ipc_unix_ipc.cc b/japanese/mozc-server/files/patch-src_ipc_unix_ipc.cc new file mode 100644 index 000000000000..f0e5dfc02654 --- /dev/null +++ b/japanese/mozc-server/files/patch-src_ipc_unix_ipc.cc @@ -0,0 +1,29 @@ +--- ipc/unix_ipc.cc.org 2010-06-17 15:59:08.061722403 +0900 ++++ ipc/unix_ipc.cc 2010-06-26 14:57:03.788901462 +0900 +@@ -41,7 +41,7 @@ + #include <sys/time.h> + #include <sys/types.h> + #include <sys/un.h> +-#ifdef OS_MACOSX ++#if defined(__FreeBSD__) || defined(OS_MACOSX) + #include <sys/ucred.h> + #endif + #include <sys/wait.h> +@@ -124,7 +124,7 @@ + bool IsPeerValid(int socket, pid_t *pid) { + *pid = 0; + +-#ifdef OS_MACOSX ++#if defined(__FreeBSD__) || defined(OS_MACOSX) + // If the OS is MAC, we should validate the peer by using LOCAL_PEERCRED. + struct xucred peer_cred; + socklen_t peer_cred_len = sizeof(struct xucred); +@@ -146,7 +146,7 @@ + *pid = 0; + #endif + +-#ifdef OS_LINUX ++#if !defined(__FreeBSD__) && defined(OS_LINUX) + // On ARM Linux, we do nothing and just return true since the platform (at + // least the qemu emulator) doesn't support the getsockopt(sock, SOL_SOCKET, + // SO_PEERCRED) system call. |