aboutsummaryrefslogtreecommitdiffstats
path: root/japanese/mozc-server/files/patch-base_process.cc
diff options
context:
space:
mode:
Diffstat (limited to 'japanese/mozc-server/files/patch-base_process.cc')
-rw-r--r--japanese/mozc-server/files/patch-base_process.cc23
1 files changed, 6 insertions, 17 deletions
diff --git a/japanese/mozc-server/files/patch-base_process.cc b/japanese/mozc-server/files/patch-base_process.cc
index 5990af6eb29d..48b94ca9c40d 100644
--- a/japanese/mozc-server/files/patch-base_process.cc
+++ b/japanese/mozc-server/files/patch-base_process.cc
@@ -1,22 +1,11 @@
---- base/process.cc.orig 2013-04-21 03:48:45.176269982 +0900
-+++ base/process.cc 2013-04-21 04:16:40.382269441 +0900
-@@ -121,13 +121,18 @@
- return ShellExecuteInSystemDir(L"open", wurl.c_str(), NULL, SW_SHOW);
+--- base/process.cc.orig 2013-03-29 13:33:43.000000000 +0900
++++ base/process.cc 2013-04-24 00:17:03.000000000 +0900
+@@ -122,7 +122,7 @@
#endif
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) && !defined(__FreeBSD__)
- static const char kBrowserCommand[] = "/usr/bin/xdg-open";
+ #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);
- #endif // LINUX
-
-+#ifdef __FreeBSD__
-+ static const char kBrowserCommand[] = "@@LOCALBASE@@/bin/xdg-open";
-+ return SpawnProcess(kBrowserCommand, url);
-+#endif
-+
- #ifdef OS_MACOSX
- return MacProcess::OpenBrowserForMac(url);
- #endif // OS_MACOSX