diff options
Diffstat (limited to 'japanese')
20 files changed, 29 insertions, 31 deletions
diff --git a/japanese/mozc-el/Makefile b/japanese/mozc-el/Makefile index 8595d8e41922..d99257c4b0f9 100644 --- a/japanese/mozc-el/Makefile +++ b/japanese/mozc-el/Makefile @@ -7,7 +7,6 @@ PKGNAMESUFFIX= -el-${EMACS_PORT_NAME} COMMENT= Mozc for GNU Emacs -PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../japanese/mozc-server PKGMESSAGE= ${.CURDIR}/pkg-message diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 876940c20616..f98ca8f01d68 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mozc -PORTVERSION= 1.5.1053.102 -PORTREVISION= 4 +PORTVERSION= 1.5.1090.102 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX?= ja- @@ -238,7 +237,7 @@ do-install-scim_mozc: # fcitx_mozc .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" PATCH_SITES= http://fcitx.googlecode.com/files/ -PATCHFILES= fcitx-mozc-${PORTVERSION}-1.patch +PATCHFILES= fcitx-mozc-${PORTVERSION}.1.patch PATCH_DIST_STRIP=-p2 LIB_DEPENDS+= fcitx-config.4:${PORTSDIR}/chinese/fcitx diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo index e260bfcce927..5892b4755106 100644 --- a/japanese/mozc-server/distinfo +++ b/japanese/mozc-server/distinfo @@ -1,4 +1,4 @@ -SHA256 (mozc-1.5.1053.102.tar.bz2) = c0b8e2f8db312fb530387c0ac9c67dae8bc723bf02765e54816353b1e8dc11e3 -SIZE (mozc-1.5.1053.102.tar.bz2) = 52230135 -SHA256 (fcitx-mozc-1.5.1053.102-1.patch) = 93ebe5ccf42520212ee81b2eac0b5d8727e211a2fbdef244e44d38576d6c54e6 -SIZE (fcitx-mozc-1.5.1053.102-1.patch) = 96547 +SHA256 (mozc-1.5.1090.102.tar.bz2) = b52c1879c4749041032578ec6c591d9741f521d54993070c050d09ae35bd2107 +SIZE (mozc-1.5.1090.102.tar.bz2) = 54911799 +SHA256 (fcitx-mozc-1.5.1090.102.1.patch) = ec93d32837fbc103e9e9dc945631985257a64a107b6e4056cab4c556e9dbc07c +SIZE (fcitx-mozc-1.5.1090.102.1.patch) = 96720 diff --git a/japanese/mozc-server/files/patch-base_base.gyp b/japanese/mozc-server/files/patch-base_base.gyp index ed14cf8738db..7d9909e2ad04 100644 --- a/japanese/mozc-server/files/patch-base_base.gyp +++ b/japanese/mozc-server/files/patch-base_base.gyp @@ -1,6 +1,6 @@ ---- base/base.gyp.orig 2012-05-01 12:21:08.063691925 +0900 -+++ base/base.gyp 2012-05-02 13:23:38.254552162 +0900 -@@ -228,20 +228,20 @@ +--- base/base.gyp.orig 2012-05-29 15:36:59.656961284 +0900 ++++ base/base.gyp 2012-05-29 16:04:46.528961427 +0900 +@@ -237,20 +237,20 @@ }], ['OS=="linux" and target_platform!="Android"', { 'cflags': [ diff --git a/japanese/mozc-server/files/patch-base_iconv.cc b/japanese/mozc-server/files/patch-base_iconv.cc index bab24384785c..bd61a8cdf2e7 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-05-01 12:21:08.064690752 +0900 +--- base/iconv.cc.orig 2012-05-29 15:36:59.653960903 +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_mutex.h b/japanese/mozc-server/files/patch-base_mutex.h index b50512454a35..b75e003eb075 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-05-01 12:21:08.064690752 +0900 +--- base/mutex.h.orig 2012-05-29 15:36:59.661959825 +0900 +++ base/mutex.h 2012-05-01 12:46:18.966692632 +0900 @@ -93,11 +93,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 b32537f0c8e5..5ce31b8ea156 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-05-01 12:21:08.063691925 +0900 +--- base/process.cc.orig 2012-05-29 15:36:59.660961653 +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_tools_util.py b/japanese/mozc-server/files/patch-build_tools_util.py index 764ee9d0faf7..f84bc2ac81fe 100644 --- a/japanese/mozc-server/files/patch-build_tools_util.py +++ b/japanese/mozc-server/files/patch-build_tools_util.py @@ -1,4 +1,4 @@ ---- build_tools/util.py.orig 2012-05-01 12:21:08.135692337 +0900 +--- build_tools/util.py.orig 2012-05-29 15:37:00.289960660 +0900 +++ build_tools/util.py 2012-05-01 13:03:43.227693771 +0900 @@ -54,7 +54,7 @@ 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 010ef7138b21..94e9aed7a106 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-05-01 12:21:08.168690849 +0900 +--- gui/about_dialog/about_dialog.cc.orig 2012-05-29 15:37:00.325961325 +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 0dea1f6c90b7..d6e23f2277d0 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-05-01 12:21:08.159691563 +0900 -+++ gyp/common.gypi 2012-05-01 12:46:18.406692000 +0900 -@@ -50,7 +50,7 @@ +--- gyp/common.gypi.orig 2012-05-29 15:37:00.311960872 +0900 ++++ gyp/common.gypi 2012-05-29 16:04:45.995960165 +0900 +@@ -46,7 +46,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', -@@ -720,6 +720,12 @@ +@@ -730,6 +730,12 @@ # <unordered_map> and <unordered_set>. '-Wno-deprecated', ], diff --git a/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc b/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc index ac982fa9c448..7bf3d645e00c 100644 --- a/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc +++ b/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc @@ -1,4 +1,4 @@ ---- handwriting/zinnia_handwriting.cc.orig 2012-05-01 12:21:08.157692007 +0900 +--- handwriting/zinnia_handwriting.cc.orig 2012-05-29 15:37:00.311960872 +0900 +++ handwriting/zinnia_handwriting.cc 2012-04-02 08:38:43.657727715 +0900 @@ -49,10 +49,16 @@ const char kModelFile[] = "handwriting-light-ja.model"; 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 b552a6cf0959..fd383670cdbb 100644 --- a/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc +++ b/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc @@ -1,4 +1,4 @@ ---- ipc/ipc_path_manager.cc.orig 2012-05-01 12:21:13.686691614 +0900 +--- ipc/ipc_path_manager.cc.orig 2012-05-29 15:37:10.807960643 +0900 +++ ipc/ipc_path_manager.cc 2012-05-01 12:46:21.263693646 +0900 @@ -284,7 +284,7 @@ *ipc_name = kIPCPrefix; diff --git a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc b/japanese/mozc-server/files/patch-ipc_unix_ipc.cc index 93b55d9e1fe2..dd42471dadea 100644 --- a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc +++ b/japanese/mozc-server/files/patch-ipc_unix_ipc.cc @@ -1,5 +1,5 @@ ---- ipc/unix_ipc.cc.orig 2012-05-01 12:21:13.686691614 +0900 -+++ ipc/unix_ipc.cc 2012-05-01 12:46:21.249691952 +0900 +--- ipc/unix_ipc.cc.orig 2012-05-29 15:37:10.806961005 +0900 ++++ ipc/unix_ipc.cc 2012-05-29 16:04:46.619961889 +0900 @@ -41,7 +41,7 @@ #include <sys/time.h> #include <sys/types.h> diff --git a/japanese/mozc-server/files/patch-server_mozc_server.cc b/japanese/mozc-server/files/patch-server_mozc_server.cc index ed5952b7f449..7fb19681fdf2 100644 --- a/japanese/mozc-server/files/patch-server_mozc_server.cc +++ b/japanese/mozc-server/files/patch-server_mozc_server.cc @@ -1,4 +1,4 @@ ---- server/mozc_server.cc.orig 2012-05-01 12:21:08.112691771 +0900 +--- server/mozc_server.cc.orig 2012-05-29 15:37:00.266961647 +0900 +++ server/mozc_server.cc 2012-04-02 08:24:24.633727039 +0900 @@ -32,6 +32,9 @@ #ifdef OS_WINDOWS 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 02a302c29b35..45f3f8c4ec91 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-05-01 12:21:08.076690903 +0900 +--- third_party/gyp/pylib/gyp/common.py.orig 2012-05-29 15:36:59.734962050 +0900 +++ third_party/gyp/pylib/gyp/common.py 2012-05-01 12:46:18.154691389 +0900 @@ -353,8 +353,10 @@ 'win32': 'win', 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 c7c5f52570a1..fb4b5e79934c 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-05-01 12:21:08.073691445 +0900 +--- third_party/gyp/pylib/gyp/generator/make.py.orig 2012-05-29 15:36:59.732960259 +0900 +++ third_party/gyp/pylib/gyp/generator/make.py 2012-05-01 12:46:18.211693101 +0900 @@ -1963,6 +1963,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 c12d90291a2c..b72771cde1ce 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-05-01 12:21:08.068691602 +0900 +--- unix/ibus/gen_mozc_xml.py.orig 2012-05-29 15:36:59.663960777 +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 6265b2a48454..5806011e1d05 100644 --- a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc +++ b/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc @@ -1,4 +1,4 @@ ---- unix/ibus/mozc_engine.cc.orig 2012-05-01 12:21:08.068691602 +0900 +--- unix/ibus/mozc_engine.cc.orig 2012-05-29 15:36:59.665961241 +0900 +++ unix/ibus/mozc_engine.cc 2012-05-01 12:45:44.250693013 +0900 @@ -893,7 +893,7 @@ // on size_t, not uint32. 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 31e5df2bf67c..20b24aa7d472 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-05-01 12:21:08.068691602 +0900 +--- unix/ibus/path_util.cc.orig 2012-05-29 15:36:59.663960777 +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 45962bc03f49..f41e123aea27 100644 --- a/japanese/mozc-server/files/patch-unix_scim_scim.gyp +++ b/japanese/mozc-server/files/patch-unix_scim_scim.gyp @@ -1,4 +1,4 @@ ---- unix/scim/scim.gyp.orig 2012-05-01 12:21:08.071692137 +0900 +--- unix/scim/scim.gyp.orig 2012-05-29 15:36:59.667960727 +0900 +++ unix/scim/scim.gyp 2012-05-01 12:45:44.903691176 +0900 @@ -39,7 +39,7 @@ 'gtk+-2.0', |