diff options
Diffstat (limited to 'japanese/ibus-mozc/files')
10 files changed, 39 insertions, 43 deletions
diff --git a/japanese/ibus-mozc/files/patch-src_base_iconv.cc b/japanese/ibus-mozc/files/patch-src_base_iconv.cc index 7f2f5b122cf5..5a928e254b27 100644 --- a/japanese/ibus-mozc/files/patch-src_base_iconv.cc +++ b/japanese/ibus-mozc/files/patch-src_base_iconv.cc @@ -1,5 +1,5 @@ ---- base/iconv.cc.org 2010-06-11 18:01:03.000000000 +0900 -+++ base/iconv.cc 2010-06-12 10:02:20.315839057 +0900 +--- 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 diff --git a/japanese/ibus-mozc/files/patch-src_base_mutex.h b/japanese/ibus-mozc/files/patch-src_base_mutex.h index d5bf95f853f5..4249feff64fc 100644 --- a/japanese/ibus-mozc/files/patch-src_base_mutex.h +++ b/japanese/ibus-mozc/files/patch-src_base_mutex.h @@ -1,5 +1,5 @@ ---- base/mutex.h.org 2010-06-11 18:01:03.000000000 +0900 -+++ base/mutex.h 2010-06-12 10:02:50.414966599 +0900 +--- 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 diff --git a/japanese/ibus-mozc/files/patch-src_base_process.cc b/japanese/ibus-mozc/files/patch-src_base_process.cc index 9d03245ec4f1..9832c2f21642 100644 --- a/japanese/ibus-mozc/files/patch-src_base_process.cc +++ b/japanese/ibus-mozc/files/patch-src_base_process.cc @@ -1,5 +1,5 @@ ---- base/process.cc.org 2010-06-11 18:01:03.000000000 +0900 -+++ base/process.cc 2010-06-12 10:03:39.662872618 +0900 +--- 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 diff --git a/japanese/ibus-mozc/files/patch-src_base_util.cc b/japanese/ibus-mozc/files/patch-src_base_util.cc index a5f0b5f99725..b338a19eb60e 100644 --- a/japanese/ibus-mozc/files/patch-src_base_util.cc +++ b/japanese/ibus-mozc/files/patch-src_base_util.cc @@ -1,11 +1,11 @@ ---- base/util.cc.org 2010-06-11 18:01:03.000000000 +0900 -+++ base/util.cc 2010-06-12 10:04:16.922969013 +0900 -@@ -1489,7 +1489,7 @@ +--- 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@@/share/ibus-mozc/server"; ++ return "@@LOCALBASE@@/bin"; #endif // OS_LINUX } diff --git a/japanese/ibus-mozc/files/patch-src_build_mozc.py b/japanese/ibus-mozc/files/patch-src_build_mozc.py index 2aee74bfd72e..ba044b1cad4a 100644 --- a/japanese/ibus-mozc/files/patch-src_build_mozc.py +++ b/japanese/ibus-mozc/files/patch-src_build_mozc.py @@ -1,6 +1,6 @@ ---- build_mozc.py.org 2010-06-11 18:01:03.000000000 +0900 -+++ build_mozc.py 2010-06-12 10:05:39.176190512 +0900 -@@ -67,7 +67,7 @@ +--- 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.""" @@ -9,16 +9,7 @@ def GetGeneratorName(): -@@ -356,7 +356,7 @@ - default='Win32', - help='specify the target plaform: [Win32|x64]') - # default Qt dir to support the current build procedure for Debian. -- default_qtdir = '/usr/local/Trolltech/Qt-4.5.2' -+ default_qtdir = '@@LOCALBASE@@/lib/qt4/' - if IsWindows(): - default_qtdir = None - parser.add_option('--qtdir', dest='qtdir', -@@ -387,7 +387,7 @@ +@@ -403,7 +403,7 @@ (unused_gyp_file_name, target_name) = ParseTarget(target) target_names.append(target_name) diff --git a/japanese/ibus-mozc/files/patch-src_gyp_common.gypi b/japanese/ibus-mozc/files/patch-src_gyp_common.gypi index 8e637be0cfac..6bd13450d867 100644 --- a/japanese/ibus-mozc/files/patch-src_gyp_common.gypi +++ b/japanese/ibus-mozc/files/patch-src_gyp_common.gypi @@ -1,11 +1,15 @@ ---- gyp/common.gypi.org 2010-06-11 18:00:39.000000000 +0900 -+++ gyp/common.gypi 2010-06-12 10:06:52.655552554 +0900 -@@ -420,6 +420,8 @@ - '-lssl', +--- 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' ], ++ 'include_dirs': [ ++ '@@LOCALBASE@@/include' ++ ], ++ 'ldflags': [ ++ '-L@@LOCALBASE@@/lib' ++ ], 'conditions': [ ['chromeos==1', { 'defines': [ diff --git a/japanese/ibus-mozc/files/patch-src_ipc_unix_ipc.cc b/japanese/ibus-mozc/files/patch-src_ipc_unix_ipc.cc index 6c18ebd6aa34..f0e5dfc02654 100644 --- a/japanese/ibus-mozc/files/patch-src_ipc_unix_ipc.cc +++ b/japanese/ibus-mozc/files/patch-src_ipc_unix_ipc.cc @@ -1,5 +1,5 @@ ---- ipc/unix_ipc.cc.org 2010-06-11 18:01:03.000000000 +0900 -+++ ipc/unix_ipc.cc 2010-06-12 10:21:51.905675963 +0900 +--- 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> diff --git a/japanese/ibus-mozc/files/patch-src_unix_ibus_mozc.xml b/japanese/ibus-mozc/files/patch-src_unix_ibus_mozc.xml index cc26cb581a02..4a8d10e24709 100644 --- a/japanese/ibus-mozc/files/patch-src_unix_ibus_mozc.xml +++ b/japanese/ibus-mozc/files/patch-src_unix_ibus_mozc.xml @@ -1,16 +1,17 @@ ---- unix/ibus/mozc.xml.org 2010-06-11 18:00:39.000000000 +0900 -+++ unix/ibus/mozc.xml 2010-06-12 10:22:30.668862555 +0900 -@@ -3,6 +3,7 @@ +--- unix/ibus/mozc.xml.org 2010-06-17 15:59:08.044438083 +0900 ++++ unix/ibus/mozc.xml 2010-06-26 16:28:56.093569793 +0900 +@@ -2,12 +2,12 @@ + <component> <name>com.google.IBus.Mozc</name> <description>Mozc Component</description> - <exec>/usr/libexec/ibus-engine-mozc --ibus</exec> +- <exec>/usr/libexec/ibus-engine-mozc --ibus</exec> + <exec>@@LOCALBASE@@/libexec/ibus-engine-mozc --ibus</exec> <!-- TODO(mazda): Generate the version number --> <version>0.0.0.0</version> <author>Google Inc.</author> -@@ -10,4 +11,5 @@ + <license>New BSD</license> <homepage>http://code.google.com/p/mozc/</homepage> <textdomain>ibus-mozc</textdomain> - <engines exec="/usr/libexec/ibus-engine-mozc --xml" /> +- <engines exec="/usr/libexec/ibus-engine-mozc --xml" /> + <engines exec="@@LOCALBASE@@/libexec/ibus-engine-mozc --xml" /> </component> diff --git a/japanese/ibus-mozc/files/patch-src_unix_ibus_mozc_engine.cc b/japanese/ibus-mozc/files/patch-src_unix_ibus_mozc_engine.cc index d338366bec65..b5457112eecb 100644 --- a/japanese/ibus-mozc/files/patch-src_unix_ibus_mozc_engine.cc +++ b/japanese/ibus-mozc/files/patch-src_unix_ibus_mozc_engine.cc @@ -1,6 +1,6 @@ ---- unix/ibus/mozc_engine.cc.org 2010-06-11 18:00:39.000000000 +0900 -+++ unix/ibus/mozc_engine.cc 2010-06-12 13:19:26.188760964 +0900 -@@ -59,7 +59,7 @@ +--- unix/ibus/mozc_engine.cc.org 2010-06-17 15:59:08.047320852 +0900 ++++ unix/ibus/mozc_engine.cc 2010-06-26 16:32:23.046397317 +0900 +@@ -66,7 +66,7 @@ // Icon path for MozcTool // TODO(taku): currently, unknown icon is displayed. diff --git a/japanese/ibus-mozc/files/patch-src_unix_ibus_path_util.cc b/japanese/ibus-mozc/files/patch-src_unix_ibus_path_util.cc index 824dd8e4fa9e..a29f67dc80a3 100644 --- a/japanese/ibus-mozc/files/patch-src_unix_ibus_path_util.cc +++ b/japanese/ibus-mozc/files/patch-src_unix_ibus_path_util.cc @@ -1,5 +1,5 @@ ---- unix/ibus/path_util.cc.org 2010-06-11 18:00:39.000000000 +0900 -+++ unix/ibus/path_util.cc 2010-06-12 10:23:37.582580151 +0900 +--- unix/ibus/path_util.cc.org 2010-06-17 15:59:08.044438083 +0900 ++++ unix/ibus/path_util.cc 2010-06-26 16:38:18.218403536 +0900 @@ -30,14 +30,14 @@ #include "unix/ibus/path_util.h" @@ -13,7 +13,7 @@ string GetIconPath(const string &icon_file) { - return kInstalledDirectory + string("/") + icon_file; -+ return kInstalledDirectory + string("/icons/") + icon_file; ++ return string("@@LOCALBASE@@/share/mozc-additions/icons/") + icon_file; } } // namespace ibus |