aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--japanese/mozc-server/Makefile117
-rw-r--r--japanese/mozc-server/distinfo8
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-fcitx-eim.cc (renamed from japanese/mozc-server/files/extra-patch-unix-fcitx-eim.cc)4
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx.gyp10
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_event_handler.h13
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_translator.h11
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_mozc.h11
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.cc11
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.h11
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc (renamed from japanese/mozc-server/files/extra-patch-unix-fcitx-mozc_response_parser.cc)13
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-fcitx-surrounding_text_util.cc (renamed from japanese/mozc-server/files/extra-patch-unix-fcitx-surrounding_text_util.cc)4
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h11
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc13
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp28
-rw-r--r--japanese/mozc-server/files/extra-patch-src-unix_fcitx_fcitx_mozc.cc (renamed from japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-base_base.gyp (renamed from japanese/mozc-server/files/patch-base_base.gyp)4
-rw-r--r--japanese/mozc-server/files/patch-src-base_logging.cc (renamed from japanese/mozc-server/files/patch-base_logging.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-base_mutex.cc (renamed from japanese/mozc-server/files/patch-base_mutex.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-base_process.cc (renamed from japanese/mozc-server/files/patch-base_process.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-base_system_util.cc (renamed from japanese/mozc-server/files/patch-base_system_util.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-build_mozc.py (renamed from japanese/mozc-server/files/patch-build_mozc.py)4
-rw-r--r--japanese/mozc-server/files/patch-src-build_tools_util.py (renamed from japanese/mozc-server/files/patch-build_tools_util.py)4
-rw-r--r--japanese/mozc-server/files/patch-src-gui-qt_libraries.gypi (renamed from japanese/mozc-server/files/patch-gui-qt_libraries.gypi)4
-rw-r--r--japanese/mozc-server/files/patch-src-gui_about_dialog_about_dialog.cc (renamed from japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-gyp_common.gypi (renamed from japanese/mozc-server/files/patch-gyp_common.gypi)14
-rw-r--r--japanese/mozc-server/files/patch-src-ipc_ipc_path_manager.cc (renamed from japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-ipc_unix_ipc.cc (renamed from japanese/mozc-server/files/patch-ipc_unix_ipc.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-server_mozc_server.cc (renamed from japanese/mozc-server/files/patch-server_mozc_server.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-third_party_gyp_gyp (renamed from japanese/mozc-server/files/patch-third_party_gyp_gyp)4
-rw-r--r--japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_common.py (renamed from japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py)4
-rw-r--r--japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_generator_make.py (renamed from japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py)4
-rw-r--r--japanese/mozc-server/files/patch-src-unix_emacs_mozc.el (renamed from japanese/mozc-server/files/patch-unix_emacs_mozc.el)4
-rw-r--r--japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py (renamed from japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py)4
-rw-r--r--japanese/mozc-server/files/patch-src-unix_ibus_ibus.gyp (renamed from japanese/mozc-server/files/patch-unix_ibus_ibus.gyp)4
-rw-r--r--japanese/mozc-server/files/patch-src-unix_ibus_mozc_engine.cc (renamed from japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc)4
-rw-r--r--japanese/mozc-server/files/patch-src-unix_ibus_path_util.cc (renamed from japanese/mozc-server/files/patch-unix_ibus_path_util.cc)4
36 files changed, 251 insertions, 112 deletions
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index e65ab67c62a6..5f9d6db24bed 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mozc
-PORTVERSION= 2.16.2051.102
-PORTREVISION= 3
+PORTVERSION= 2.17.2106.102
CATEGORIES= japanese
MASTER_SITES= LOCAL/hrs
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -13,7 +12,7 @@ MAINTAINER= hrs@FreeBSD.org
COMMENT?= Mozc Japanese Input Method, Server
LICENSE= BSD3CLAUSE
-LICENSE_FILE= ${WRKSRC}/third_party/gyp/LICENSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ninja:${PORTSDIR}/devel/ninja \
python:${PORTSDIR}/lang/python
@@ -24,6 +23,7 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
USES= compiler:c++11-lang pkgconfig iconv:wchar_t gmake \
tar:bzip2 python:build
+BUILD_WRKSRC= ${WRKSRC}/src
BUILD_MOZC_LIST?= mozc_server
@@ -33,11 +33,11 @@ PKGNAMESUFFIX= -server
LICENSE= BSD3CLAUSE NAISTL
LICENSE_COMB= multi
-LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third_party/gyp/LICENSE
+LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE
LICENSE_DISTFILES_BSD3CLAUSE= ${DISTNAME}${EXTRACT_SUFX}
LICENSE_NAME_NAISTL= Nara Institute of Science and Technology License
LICENSE_PERMS_NAISTL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE_NAISTL= ${WRKSRC}/data/dictionary_oss/README.txt
+LICENSE_FILE_NAISTL= ${WRKSRC}/src/data/dictionary_oss/README.txt
LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX}
.elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
USE_GNOME= glib20 gtk20
@@ -76,8 +76,8 @@ GYP_DEFINES= use_libprotobuf=1 \
BUILD_MODE= Release
BUILD_CMD= ${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${MAKE_CMD}
BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \
- ${SETENV} BUILD_COMMAND="${WRKSRC}/mozcmake" \
- PYTHONPATH=${WRKSRC}/third_party/gyp/pylib/gyp \
+ ${SETENV} BUILD_COMMAND="${BUILD_WRKSRC}/mozcmake" \
+ PYTHONPATH=${BUILD_WRKSRC}/third_party/gyp/pylib/gyp \
GYP_DEFINES="${GYP_DEFINES}" \
CC_host="${CC}" \
CC_target="${CC}" \
@@ -87,31 +87,28 @@ BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \
AR_host="${AR}" \
${PYTHON_CMD} build_mozc.py
BUILD_MOZC_CMD_BUILD= ${BUILD_MOZC_CMD} build -c ${BUILD_MODE} ${_MAKE_JOBS}
-BUILD_GYP_CMD= cd ${WRKSRC}/third_party/gyp && \
+BUILD_GYP_CMD= cd ${BUILD_WRKSRC}/third_party/gyp && \
${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP}
post-patch:
- ${MKDIR} ${WRKSRC}/mozc_build_tools/linux
- ${LN} -sf ${LOCALBASE}/bin/protoc ${WRKSRC}/mozc_build_tools/linux/
${REINPLACE_CMD} 's,-liconv,${ICONV_LIB},g' \
- ${WRKSRC}/gui/qt_libraries.gypi
-
+ ${BUILD_WRKSRC}/gui/qt_libraries.gypi
.if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \
- ${WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh
+ ${BUILD_WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh
${REINPLACE_CMD} "s,/usr,${LOCALBASE:Q}," \
- ${WRKSRC}/unix/fcitx/mozc.conf
+ ${BUILD_WRKSRC}/unix/fcitx/mozc.conf
.endif
.if !${BUILD_MOZC_LIST:Mmozc_el}
-${WRKSRC}/mozcmake:
+${BUILD_WRKSRC}/mozcmake:
${PRINTF} "%s\n%s\n" "#!/bin/sh" 'exec ${BUILD_CMD} $$@' \
- > ${WRKSRC}/mozcmake
- ${CHMOD} +x ${WRKSRC}/mozcmake
+ > ${BUILD_WRKSRC}/mozcmake
+ ${CHMOD} +x ${BUILD_WRKSRC}/mozcmake
-post-configure: ${WRKSRC}/mozcmake
+post-configure: ${BUILD_WRKSRC}/mozcmake
${BUILD_MOZC_CMD} gyp \
- --gypdir=${WRKSRC}/third_party/gyp \
+ --gypdir=${BUILD_WRKSRC}/third_party/gyp \
--server_dir="${PREFIX}/bin" \
--tool_dir="${PREFIX}/libexec" \
--renderer_dir="${PREFIX}/libexec" \
@@ -143,10 +140,11 @@ SUB_FILES+= mozc
post-extract-mozc_server:
@for F in jigyosyo-20130628.lzh ken_all-20130628.lzh; do \
- ${LHA_CMD} xfq2w=${WRKSRC}/data/dictionary_oss ${DISTDIR}/$$F; \
+ ${LHA_CMD} xfq2w=${BUILD_WRKSRC}/data/dictionary_oss \
+ ${DISTDIR}/$$F; \
done
- @cd ${WRKSRC}/data/dictionary_oss && \
- ${PYTHON_CMD} ${WRKSRC}/dictionary/gen_zip_code_seed.py \
+ @cd ${BUILD_WRKSRC}/data/dictionary_oss && \
+ ${PYTHON_CMD} ${BUILD_WRKSRC}/dictionary/gen_zip_code_seed.py \
--zip_code=ken_all.csv --jigyosyo=jigyosyo.csv \
>> dictionary09.txt
@@ -158,10 +156,10 @@ do-build-mozc_server:
do-install-mozc_server:
${INSTALL_PROGRAM} \
- ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \
+ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \
${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} \
- ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \
+ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \
${STAGEDIR}${PREFIX}/libexec
${INSTALL_SCRIPT} \
${WRKDIR}/mozc ${STAGEDIR}/${PREFIX}/bin
@@ -185,15 +183,15 @@ do-build-mozc_tool:
do-install-mozc_tool:
${INSTALL_PROGRAM} \
- ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \
+ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \
${STAGEDIR}${PREFIX}/libexec
${INSTALL_SCRIPT} ${WRKDIR}/mozc_tool ${STAGEDIR}${PREFIX}/bin
@${MKDIR} ${STAGEDIR}${DATADIR}/icons
${INSTALL_DATA} \
- ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
+ ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
${STAGEDIR}${DATADIR}/icons/product_logo.png
${INSTALL_DATA} \
- ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
+ ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
${STAGEDIR}${DATADIR}/icons/update_uptodate.png
.endif
@@ -230,24 +228,24 @@ do-build-ibus_mozc:
do-install-ibus_mozc:
${INSTALL_PROGRAM} \
- ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_renderer \
+ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_renderer \
${STAGEDIR}${PREFIX}/libexec/mozc_renderer
${INSTALL_PROGRAM} \
- ${WRKSRC}/out_linux/${BUILD_MODE}/ibus_mozc \
+ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/ibus_mozc \
${STAGEDIR}${PREFIX}/libexec/ibus-engine-mozc
${MKDIR} ${STAGEDIR}${PREFIX}/share/ibus/component
${INSTALL_DATA} \
- ${WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/ibus/mozc.xml \
+ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/ibus/mozc.xml \
${STAGEDIR}${PREFIX}/share/ibus/component/mozc.xml
@${MKDIR} ${STAGEDIR}${DATADIR}/icons
.for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \
ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool
${INSTALL_DATA} \
- ${WRKSRC}/data/images/unix/${F}.png \
+ ${BUILD_WRKSRC}/data/images/unix/${F}.png \
${STAGEDIR}${DATADIR}/icons/${F:S/^ui-//}.png
.endfor
${INSTALL_DATA} \
- ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
+ ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \
${STAGEDIR}${DATADIR}/icons/product_icon.png
.endif
@@ -265,10 +263,10 @@ WRKSRC_MU= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
LIB_DEPENDS+= libuim.so:${PORTSDIR}/textproc/uim
RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \
mozc_tool:${PORTSDIR}/japanese/mozc-tool
-GYP_OPTIONS+= --noqt
-GYP_DEFINES+= use_libibus=0 \
- enable_gtk_renderer=0
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-unix-uim-key_translator.h \
+ ${PATCHDIR}/extra-patch-src-unix-uim-mozc.cc \
+ ${PATCHDIR}/extra-patch-src-unix-uim-uim.gyp
PLIST_FILES+= lib/uim/plugin/libuim-mozc.so \
%%DATADIR%%/mozc.scm \
%%DATADIR%%/mozc-custom.scm \
@@ -277,8 +275,12 @@ PLIST_FILES+= lib/uim/plugin/libuim-mozc.so \
"@exec ${LOCALBASE}/bin/uim-module-manager --register mozc" \
"@unexec ${LOCALBASE}/bin/uim-module-manager --unregister mozc"
+GYP_OPTIONS+= --noqt
+GYP_DEFINES+= use_libibus=0 \
+ enable_gtk_renderer=0
+
post-extract-uim_mozc:
- ${LN} -s ${WRKSRC_MU}/Mozc/uim ${WRKSRC}/unix
+ ${MV} ${WRKSRC_MU}/Mozc/uim ${BUILD_WRKSRC}/unix
${REINPLACE_CMD} -e "s,/usr/lib/mozc,${LOCALBASE}/libexec," \
${WRKSRC_MU}/Mozc/scm/mozc-custom.scm
@@ -291,7 +293,7 @@ do-build-uim_mozc:
do-install-uim_mozc:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/uim/plugin
${INSTALL_PROGRAM} \
- ${WRKSRC}/out_linux/${BUILD_MODE}/libuim-mozc.so \
+ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/libuim-mozc.so \
${STAGEDIR}${PREFIX}/lib/uim/plugin
${MKDIR} ${STAGEDIR}${DATADIR}
cd ${WRKSRC_MU}/Mozc/scm && \
@@ -299,7 +301,7 @@ do-install-uim_mozc:
${STAGEDIR}${DATADIR}
${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps
${INSTALL_DATA} \
- ${WRKSRC}/data/images/product_icon_32bpp-128.png \
+ ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \
${STAGEDIR}${DATADIR}/pixmaps/mozc.png
.endif
@@ -309,10 +311,19 @@ PATCH_SITES= http://download.fcitx-im.org/fcitx-mozc/
PATCHFILES= fcitx-mozc-2.16.2037.102.2.patch
.endif
.if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
-PATCH_DIST_STRIP=-p2
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-unix-fcitx-eim.cc \
- ${PATCHDIR}/extra-patch-unix-fcitx-mozc_response_parser.cc \
- ${PATCHDIR}/extra-patch-unix-fcitx-surrounding_text_util.cc
+PATCH_DIST_STRIP=-p1
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-unix-fcitx-eim.cc \
+ ${PATCHDIR}/extra-patch-src-unix-fcitx-mozc_response_parser.cc \
+ ${PATCHDIR}/extra-patch-src-unix-fcitx-surrounding_text_util.cc
+
+POST_PATCHES= ${PATCHDIR}/extra-patch-src-unix_fcitx_fcitx_mozc.cc \
+ ${PATCHDIR}/extra-patch-src-unix-fcitx-fcitx.gyp \
+ ${PATCHDIR}/extra-patch-src-unix-fcitx-fcitx_key_event_handler.h \
+ ${PATCHDIR}/extra-patch-src-unix-fcitx-fcitx_key_translator.h \
+ ${PATCHDIR}/extra-patch-src-unix-fcitx-fcitx_mozc.h \
+ ${PATCHDIR}/extra-patch-src-unix-fcitx-mozc_connection.cc \
+ ${PATCHDIR}/extra-patch-src-unix-fcitx-mozc_connection.h
+
GYP_OPTIONS+= --noqt
GYP_DEFINES+= use_libibus=0 \
enable_gtk_renderer=0
@@ -340,12 +351,12 @@ PLIST_FILES+= lib/fcitx/fcitx-mozc.so \
PLIST_DIRS+= %%DATADIR%%/icon ${DATADIR_REL}
post-extract-fcitx_mozc:
- ${RM} ${WRKSRC}/unix/fcitx/fcitx.gyp
+ ${RM} ${BUILD_WRKSRC}/unix/fcitx/fcitx.gyp
post-extract: post-extract-fcitx_mozc
post-patch-fcitx_mozc:
- cd ${PATCH_WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-unix_fcitx_fcitx_mozc.cc
+ cd ${PATCH_WRKSRC} && ${CAT} ${POST_PATCHES} | ${PATCH}
post-patch: post-patch-fcitx_mozc
@@ -358,27 +369,27 @@ do-install-fcitx_mozc:
${STAGEDIR}${PREFIX}/share/fcitx/addon \
${STAGEDIR}${PREFIX}/share/fcitx/inputmethod
${INSTALL_LIB} \
- ${WRKSRC}/out_linux/${BUILD_MODE}/fcitx-mozc.so \
+ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/fcitx-mozc.so \
${STAGEDIR}${PREFIX}/lib/fcitx/fcitx-mozc.so
${INSTALL_DATA} \
- ${WRKSRC}/unix/fcitx/fcitx-mozc.conf \
+ ${BUILD_WRKSRC}/unix/fcitx/fcitx-mozc.conf \
${STAGEDIR}${PREFIX}/share/fcitx/addon/fcitx-mozc.conf
${INSTALL_DATA} \
- ${WRKSRC}/unix/fcitx/mozc.conf \
+ ${BUILD_WRKSRC}/unix/fcitx/mozc.conf \
${STAGEDIR}${PREFIX}/share/fcitx/inputmethod/mozc.conf
@${MKDIR} ${STAGEDIR}${DATADIR}/icon
.for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \
ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool
${INSTALL_DATA} \
- ${WRKSRC}/data/images/unix/${F}.png \
+ ${BUILD_WRKSRC}/data/images/unix/${F}.png \
${STAGEDIR}${DATADIR}/icon/${F:S,^ui-,mozc-,}.png
.endfor
${INSTALL_DATA} \
- ${WRKSRC}/data/images/product_icon_32bpp-128.png \
+ ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \
${STAGEDIR}${DATADIR}/icon/mozc.png
.for L in ja zh_CN zh_TW
${INSTALL_DATA} \
- ${WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/fcitx/po/${L}.mo \
+ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/fcitx/po/${L}.mo \
${STAGEDIR}${PREFIX}/share/locale/${L}/LC_MESSAGES/fcitx-mozc.mo
.endfor
.endif
@@ -394,19 +405,19 @@ PLIST_DIRS+= ${EMACS_VERSION_SITE_LISPDIR}/mozc
post-patch-mozc_el:
${REINPLACE_CMD} "s,%%PREFIX%%,${PREFIX}," \
- ${WRKSRC}/unix/emacs/mozc.el
+ ${BUILD_WRKSRC}/unix/emacs/mozc.el
post-patch: post-patch-mozc_el
do-build-mozc_el:
- cd ${WRKSRC}/unix/emacs && \
+ cd ${BUILD_WRKSRC}/unix/emacs && \
${EMACS_CMD} -batch -q -no-site-file -no-init-file \
-f batch-byte-compile mozc.el
do-install-mozc_el:
@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc
${INSTALL_DATA} \
- ${WRKSRC}/unix/emacs/mozc.elc \
+ ${BUILD_WRKSRC}/unix/emacs/mozc.elc \
${FILESDIR}/leim-list.el \
${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/
.endif
diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo
index a343b80fbf76..7bd359908822 100644
--- a/japanese/mozc-server/distinfo
+++ b/japanese/mozc-server/distinfo
@@ -1,10 +1,10 @@
-SHA256 (mozc-2.16.2051.102.tar.bz2) = 11877306031afee3bbe39e2208340d27df21c90605c1cf48fe788ffa5cf249aa
-SIZE (mozc-2.16.2051.102.tar.bz2) = 36135991
+SHA256 (mozc-2.17.2106.102.tar.bz2) = 00d2a82a8c814a6787bdb1d77bdc5dea652eb16cfbf4ae20fe33a25b285d8f39
+SIZE (mozc-2.17.2106.102.tar.bz2) = 33452163
SHA256 (ken_all-20130628.lzh) = 78630e7f8b396603cde066c4a6d598c9af94bb97f415a68148dd3144dea18871
SIZE (ken_all-20130628.lzh) = 1735995
SHA256 (jigyosyo-20130628.lzh) = d7b796d8643457d883de4a33cb3edf7455f11d778ea74d07b450ea10f3339cf7
SIZE (jigyosyo-20130628.lzh) = 823590
-SHA256 (fcitx-mozc-2.16.2037.102.2.patch) = ff175f3e0301c33f750780765ea264887827d00bc7a59fc8b55ae514ba449a1e
-SIZE (fcitx-mozc-2.16.2037.102.2.patch) = 140421
SHA256 (e-kato-macuim-v0.6.16.2_GH0.tar.bz2) = 25fca78d1d76cc5c6a49f3b2f6981791ad8275abb2726334d8d40bd49498194d
SIZE (e-kato-macuim-v0.6.16.2_GH0.tar.bz2) = 324551
+SHA256 (fcitx-mozc-2.16.2037.102.2.patch) = ff175f3e0301c33f750780765ea264887827d00bc7a59fc8b55ae514ba449a1e
+SIZE (fcitx-mozc-2.16.2037.102.2.patch) = 140421
diff --git a/japanese/mozc-server/files/extra-patch-unix-fcitx-eim.cc b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-eim.cc
index 87638c4861c4..38003c2f3c10 100644
--- a/japanese/mozc-server/files/extra-patch-unix-fcitx-eim.cc
+++ b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-eim.cc
@@ -1,5 +1,5 @@
---- unix/fcitx/eim.cc.orig 2014-08-31 06:48:00.000000000 +0900
-+++ unix/fcitx/eim.cc 2014-08-31 06:48:11.000000000 +0900
+--- src/unix/fcitx/eim.cc.orig 2014-08-31 06:48:00.000000000 +0900
++++ src/unix/fcitx/eim.cc 2014-08-31 06:48:11.000000000 +0900
@@ -176,7 +176,9 @@
// clear candidate table
FcitxCandidateWordReset(candList);
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx.gyp b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx.gyp
new file mode 100644
index 000000000000..da756a100bbb
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx.gyp
@@ -0,0 +1,10 @@
+--- src/unix/fcitx/fcitx.gyp.orig 2015-07-13 04:27:48.760816000 +0900
++++ src/unix/fcitx/fcitx.gyp 2015-07-13 04:30:04.604724000 +0900
+@@ -44,7 +44,6 @@
+ '../../client/client.gyp:client',
+ '../../ipc/ipc.gyp:ipc',
+ '../../session/session_base.gyp:ime_switch_util',
+- '../../session/session_base.gyp:session_protocol',
+ ],
+ 'fcitx_defines': [
+ 'LOCALEDIR="<!@(fcitx4-config --prefix)/share/locale/"',
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_event_handler.h b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_event_handler.h
new file mode 100644
index 000000000000..abad18297eb1
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_event_handler.h
@@ -0,0 +1,13 @@
+--- src/unix/fcitx/fcitx_key_event_handler.h.bak 2015-07-13 04:37:03.713712000 +0900
++++ src/unix/fcitx/fcitx_key_event_handler.h 2015-07-13 04:37:03.754663000 +0900
+@@ -35,8 +35,8 @@
+ #include <memory>
+
+ #include "base/port.h"
+-#include "config/config.pb.h"
+-#include "session/commands.pb.h"
++#include "protocol/config.pb.h"
++#include "protocol/commands.pb.h"
+ #include "unix/fcitx/fcitx_key_translator.h"
+
+ namespace mozc {
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_translator.h b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_translator.h
new file mode 100644
index 000000000000..bf9249f06c39
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_translator.h
@@ -0,0 +1,11 @@
+--- src/unix/fcitx/fcitx_key_translator.h.bak 2015-07-13 04:37:03.714894000 +0900
++++ src/unix/fcitx/fcitx_key_translator.h 2015-07-13 04:37:03.756571000 +0900
+@@ -38,7 +38,7 @@
+ #include <fcitx-config/hotkey.h>
+
+ #include "base/port.h"
+-#include "session/commands.pb.h"
++#include "protocol/commands.pb.h"
+ #include <fcitx/ime.h>
+
+ namespace mozc {
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_mozc.h b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_mozc.h
new file mode 100644
index 000000000000..f81b497bb85d
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_mozc.h
@@ -0,0 +1,11 @@
+--- src/unix/fcitx/fcitx_mozc.h.bak 2015-07-13 04:37:03.716155000 +0900
++++ src/unix/fcitx/fcitx_mozc.h 2015-07-13 04:37:03.758916000 +0900
+@@ -39,7 +39,7 @@
+
+ #include "base/port.h"
+ #include "base/run_level.h"
+-#include "session/commands.pb.h"
++#include "protocol/commands.pb.h"
+ #include "client/client_interface.h"
+ #include "mozc_connection.h"
+
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.cc b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.cc
new file mode 100644
index 000000000000..1f8050b7381b
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.cc
@@ -0,0 +1,11 @@
+--- src/unix/fcitx/mozc_connection.cc.bak 2015-07-13 04:37:03.716883000 +0900
++++ src/unix/fcitx/mozc_connection.cc 2015-07-13 04:37:03.789664000 +0900
+@@ -36,7 +36,7 @@
+ #include "base/util.h"
+ #include "client/client.h"
+ #include "ipc/ipc.h"
+-#include "session/commands.pb.h"
++#include "protocol/commands.pb.h"
+ #include "session/ime_switch_util.h"
+ #include "unix/fcitx/fcitx_key_event_handler.h"
+ #include "unix/fcitx/surrounding_text_util.h"
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.h b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.h
new file mode 100644
index 000000000000..ef196528c843
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.h
@@ -0,0 +1,11 @@
+--- src/unix/fcitx/mozc_connection.h.bak 2015-07-13 04:37:03.717225000 +0900
++++ src/unix/fcitx/mozc_connection.h 2015-07-13 04:37:03.761331000 +0900
+@@ -38,7 +38,7 @@
+ #include <fcitx/instance.h>
+
+ #include "base/port.h"
+-#include "session/commands.pb.h"
++#include "protocol/commands.pb.h"
+ #include "unix/fcitx/fcitx_key_event_handler.h"
+
+ namespace mozc {
diff --git a/japanese/mozc-server/files/extra-patch-unix-fcitx-mozc_response_parser.cc b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc
index a36dd8fe2dd9..77fdebbcb320 100644
--- a/japanese/mozc-server/files/extra-patch-unix-fcitx-mozc_response_parser.cc
+++ b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc
@@ -1,5 +1,14 @@
---- unix/fcitx/mozc_response_parser.cc.orig 2014-08-31 07:00:01.000000000 +0900
-+++ unix/fcitx/mozc_response_parser.cc 2014-08-31 07:00:45.000000000 +0900
+--- src/unix/fcitx/mozc_response_parser.cc.orig 2015-07-13 04:56:54.572997000 +0900
++++ src/unix/fcitx/mozc_response_parser.cc 2015-07-13 04:58:15.160661000 +0900
+@@ -36,7 +36,7 @@
+ #include "base/logging.h"
+ #include "base/process.h"
+ #include "base/util.h"
+-#include "session/commands.pb.h"
++#include "protocol/commands.pb.h"
+ #include "unix/fcitx/fcitx_mozc.h"
+ #include "unix/fcitx/surrounding_text_util.h"
+ #include <fcitx/candidate.h>
@@ -235,11 +235,13 @@
}
}
diff --git a/japanese/mozc-server/files/extra-patch-unix-fcitx-surrounding_text_util.cc b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-surrounding_text_util.cc
index a995c0d93a99..13746a327abb 100644
--- a/japanese/mozc-server/files/extra-patch-unix-fcitx-surrounding_text_util.cc
+++ b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-surrounding_text_util.cc
@@ -1,5 +1,5 @@
---- unix/fcitx/surrounding_text_util.cc.orig 2014-08-31 07:02:14.000000000 +0900
-+++ unix/fcitx/surrounding_text_util.cc 2014-08-31 07:03:49.000000000 +0900
+--- src/unix/fcitx/surrounding_text_util.cc.orig 2014-08-31 07:02:14.000000000 +0900
++++ src/unix/fcitx/surrounding_text_util.cc 2014-08-31 07:03:49.000000000 +0900
@@ -32,7 +32,9 @@
#include <limits>
#include <string>
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h b/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h
new file mode 100644
index 000000000000..2f94143a45d9
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h
@@ -0,0 +1,11 @@
+--- src/unix/uim/key_translator.h.orig 2015-07-13 05:02:13.505621000 +0900
++++ src/unix/uim/key_translator.h 2015-07-13 05:02:22.697125000 +0900
+@@ -38,7 +38,7 @@
+ using __gnu_cxx::hash_map;
+
+ #include "base/port.h"
+-#include "session/commands.pb.h"
++#include "protocol/commands.pb.h"
+
+ namespace mozc {
+ namespace uim {
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc b/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc
new file mode 100644
index 000000000000..3253be97c9c4
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc
@@ -0,0 +1,13 @@
+--- src/unix/uim/mozc.cc.orig 2015-07-13 05:03:12.431514000 +0900
++++ src/unix/uim/mozc.cc 2015-07-13 05:03:30.340372000 +0900
+@@ -50,8 +50,8 @@
+
+ #include "base/port.h"
+ #include "base/util.h"
+-#include "config/config.pb.h"
+-#include "session/commands.pb.h"
++#include "protocol/config.pb.h"
++#include "protocol/commands.pb.h"
+ #include "client/client.h"
+ #include "unix/uim/key_translator.h"
+
diff --git a/japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp b/japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp
new file mode 100644
index 000000000000..082f54758a04
--- /dev/null
+++ b/japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp
@@ -0,0 +1,28 @@
+--- src/unix/uim/uim.gyp.orig 2014-10-27 02:24:13.000000000 +0900
++++ src/unix/uim/uim.gyp 2015-07-13 15:29:56.322735000 +0900
+@@ -31,6 +31,7 @@
+ {
+ 'variables': {
+ 'relative_dir': 'unix/uim',
++ 'gen_out_dir': '<(SHARED_INTERMEDIATE_DIR)/<(relative_dir)',
+ 'pkg_config_libs': [
+ 'uim',
+ ],
+@@ -39,6 +40,8 @@
+ 'uim_dependencies': [
+ '../../base/base.gyp:base',
+ '../../client/client.gyp:client',
++ '../../ipc/ipc.gyp:ipc',
++ '../../session/session_base.gyp:ime_switch_util',
+ ],
+ },
+ 'targets': [
+@@ -49,7 +52,7 @@
+ 'key_translator.cc',
+ ],
+ 'dependencies': [
+- '../../session/session_base.gyp:session_protocol',
++ '../../session/session_base.gyp:ime_switch_util',
+ ],
+ 'cflags': [
+ '<!@(pkg-config --cflags <@(pkg_config_libs))',
diff --git a/japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc b/japanese/mozc-server/files/extra-patch-src-unix_fcitx_fcitx_mozc.cc
index ef75da43baba..dac1d2f2ee33 100644
--- a/japanese/mozc-server/files/extra-patch-unix_fcitx_fcitx_mozc.cc
+++ b/japanese/mozc-server/files/extra-patch-src-unix_fcitx_fcitx_mozc.cc
@@ -1,5 +1,5 @@
---- unix/fcitx/fcitx_mozc.cc.orig 2015-02-19 10:48:37.000000000 +0900
-+++ unix/fcitx/fcitx_mozc.cc 2015-02-19 10:54:04.000000000 +0900
+--- src/unix/fcitx/fcitx_mozc.cc.orig 2015-02-19 10:48:37.000000000 +0900
++++ src/unix/fcitx/fcitx_mozc.cc 2015-02-19 10:54:04.000000000 +0900
@@ -439,6 +439,8 @@
boolean ToolMenuAction(struct _FcitxUIMenu *menu, int index)
{
diff --git a/japanese/mozc-server/files/patch-base_base.gyp b/japanese/mozc-server/files/patch-src-base_base.gyp
index 2fbd33920e13..2848309ba0b2 100644
--- a/japanese/mozc-server/files/patch-base_base.gyp
+++ b/japanese/mozc-server/files/patch-src-base_base.gyp
@@ -1,5 +1,5 @@
---- base/base.gyp.orig 2015-02-17 18:02:46.000000000 +0900
-+++ base/base.gyp 2015-02-17 18:03:44.000000000 +0900
+--- src/base/base.gyp.orig 2015-02-17 18:02:46.000000000 +0900
++++ src/base/base.gyp 2015-02-17 18:03:44.000000000 +0900
@@ -154,6 +154,16 @@
'MOZC_SERVER_DIRECTORY="<(server_dir)"',
],
diff --git a/japanese/mozc-server/files/patch-base_logging.cc b/japanese/mozc-server/files/patch-src-base_logging.cc
index c6fca634fd65..b7e812a4622d 100644
--- a/japanese/mozc-server/files/patch-base_logging.cc
+++ b/japanese/mozc-server/files/patch-src-base_logging.cc
@@ -1,5 +1,5 @@
---- base/logging.cc.orig 2013-07-17 11:38:04.000000000 +0900
-+++ base/logging.cc 2013-07-19 22:24:20.000000000 +0900
+--- src/base/logging.cc.orig 2013-07-17 11:38:04.000000000 +0900
++++ src/base/logging.cc 2013-07-19 22:24:20.000000000 +0900
@@ -111,7 +111,7 @@
#if defined(__native_client__)
"%p",
diff --git a/japanese/mozc-server/files/patch-base_mutex.cc b/japanese/mozc-server/files/patch-src-base_mutex.cc
index 5d36cf708388..2fc3e7b4f43d 100644
--- a/japanese/mozc-server/files/patch-base_mutex.cc
+++ b/japanese/mozc-server/files/patch-src-base_mutex.cc
@@ -1,5 +1,5 @@
---- base/mutex.cc.orig 2013-03-29 13:33:43.000000000 +0900
-+++ base/mutex.cc 2013-04-27 15:37:37.000000000 +0900
+--- src/base/mutex.cc.orig 2013-03-29 13:33:43.000000000 +0900
++++ src/base/mutex.cc 2013-04-27 15:37:37.000000000 +0900
@@ -296,7 +296,7 @@
// PTHREAD_MUTEX_RECURSIVE_NP but Mac OS X 10.5 does not
pthread_mutexattr_t attr;
diff --git a/japanese/mozc-server/files/patch-base_process.cc b/japanese/mozc-server/files/patch-src-base_process.cc
index 48b94ca9c40d..2ebdcbe34a81 100644
--- a/japanese/mozc-server/files/patch-base_process.cc
+++ b/japanese/mozc-server/files/patch-src-base_process.cc
@@ -1,5 +1,5 @@
---- base/process.cc.orig 2013-03-29 13:33:43.000000000 +0900
-+++ base/process.cc 2013-04-24 00:17:03.000000000 +0900
+--- src/base/process.cc.orig 2013-03-29 13:33:43.000000000 +0900
++++ src/base/process.cc 2013-04-24 00:17:03.000000000 +0900
@@ -122,7 +122,7 @@
#endif
diff --git a/japanese/mozc-server/files/patch-base_system_util.cc b/japanese/mozc-server/files/patch-src-base_system_util.cc
index 9d9e875c11bb..6bb75d58d190 100644
--- a/japanese/mozc-server/files/patch-base_system_util.cc
+++ b/japanese/mozc-server/files/patch-src-base_system_util.cc
@@ -1,5 +1,5 @@
---- base/system_util.cc.orig 2015-02-17 17:59:05.000000000 +0900
-+++ base/system_util.cc 2015-02-17 18:01:50.000000000 +0900
+--- src/base/system_util.cc.orig 2015-02-17 17:59:05.000000000 +0900
++++ src/base/system_util.cc 2015-02-17 18:01:50.000000000 +0900
@@ -407,7 +407,11 @@
if (server_path.empty()) {
return "";
diff --git a/japanese/mozc-server/files/patch-build_mozc.py b/japanese/mozc-server/files/patch-src-build_mozc.py
index 39e3f46871c7..ba8aecb173bb 100644
--- a/japanese/mozc-server/files/patch-build_mozc.py
+++ b/japanese/mozc-server/files/patch-src-build_mozc.py
@@ -1,5 +1,5 @@
---- build_mozc.py.orig 2015-02-15 04:18:52.000000000 +0900
-+++ build_mozc.py 2015-02-19 03:40:47.000000000 +0900
+--- src/build_mozc.py.orig 2015-02-15 04:18:52.000000000 +0900
++++ src/build_mozc.py 2015-02-19 03:40:47.000000000 +0900
@@ -357,6 +357,11 @@
parser.add_option('--version_file', dest='version_file',
help='use the specified version template file',
diff --git a/japanese/mozc-server/files/patch-build_tools_util.py b/japanese/mozc-server/files/patch-src-build_tools_util.py
index 6826911ebe10..65f3c4dcc604 100644
--- a/japanese/mozc-server/files/patch-build_tools_util.py
+++ b/japanese/mozc-server/files/patch-src-build_tools_util.py
@@ -1,5 +1,5 @@
---- build_tools/util.py.orig 2013-04-21 03:48:52.147271754 +0900
-+++ build_tools/util.py 2013-04-21 04:07:17.415269142 +0900
+--- src/build_tools/util.py.orig 2013-04-21 03:48:52.147271754 +0900
++++ src/build_tools/util.py 2013-04-21 04:07:17.415269142 +0900
@@ -54,7 +54,7 @@
def IsLinux():
diff --git a/japanese/mozc-server/files/patch-gui-qt_libraries.gypi b/japanese/mozc-server/files/patch-src-gui-qt_libraries.gypi
index 8d66ac67a60d..7e2a69922d9f 100644
--- a/japanese/mozc-server/files/patch-gui-qt_libraries.gypi
+++ b/japanese/mozc-server/files/patch-src-gui-qt_libraries.gypi
@@ -1,5 +1,5 @@
---- gui/qt_libraries.gypi.orig 2013-07-17 11:38:03.000000000 +0900
-+++ gui/qt_libraries.gypi 2013-08-18 15:57:44.000000000 +0900
+--- src/gui/qt_libraries.gypi.orig 2013-07-17 11:38:03.000000000 +0900
++++ src/gui/qt_libraries.gypi 2013-08-18 15:57:44.000000000 +0900
@@ -105,6 +105,7 @@
}, {
'libraries': [
diff --git a/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc b/japanese/mozc-server/files/patch-src-gui_about_dialog_about_dialog.cc
index ad375ba47ea0..d82770c13491 100644
--- a/japanese/mozc-server/files/patch-gui_about_dialog_about_dialog.cc
+++ b/japanese/mozc-server/files/patch-src-gui_about_dialog_about_dialog.cc
@@ -1,5 +1,5 @@
---- gui/about_dialog/about_dialog.cc.orig 2013-03-29 13:33:58.000000000 +0900
-+++ gui/about_dialog/about_dialog.cc 2013-04-27 15:16:49.000000000 +0900
+--- src/gui/about_dialog/about_dialog.cc.orig 2013-03-29 13:33:58.000000000 +0900
++++ src/gui/about_dialog/about_dialog.cc 2013-04-27 15:16:49.000000000 +0900
@@ -121,7 +121,11 @@
SetLabelText(label_terms);
SetLabelText(label_credits);
diff --git a/japanese/mozc-server/files/patch-gyp_common.gypi b/japanese/mozc-server/files/patch-src-gyp_common.gypi
index 5369a21a9336..d639e0e1b1f1 100644
--- a/japanese/mozc-server/files/patch-gyp_common.gypi
+++ b/japanese/mozc-server/files/patch-src-gyp_common.gypi
@@ -1,15 +1,15 @@
---- gyp/common.gypi.orig 2015-02-15 04:18:51.000000000 +0900
-+++ gyp/common.gypi 2015-02-17 18:08:07.000000000 +0900
+--- src/gyp/common.gypi.orig 2015-06-07 16:16:23.000000000 +0900
++++ src/gyp/common.gypi 2015-07-13 04:02:55.631402000 +0900
@@ -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': 305, # Clang 3.5 or higher
+ 'compiler_target_version_int': 304, # Clang 3.4 or higher
- 'compiler_host': 'clang',
+ 'compiler_host': '<(compiler_host)',
- 'compiler_host_version_int': 305, # Clang 3.5 or higher
+ 'compiler_host_version_int': 304, # Clang 3.4 or higher
'enable_gtk_renderer%': 1,
}, { # else
@@ -208,6 +208,14 @@
@@ -27,7 +27,7 @@
# 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',
-@@ -621,17 +629,20 @@
+@@ -641,17 +649,20 @@
['compiler_target=="clang"', {
'cflags': [
'-Wtype-limits',
@@ -51,7 +51,7 @@
],
}],
],
-@@ -641,17 +652,20 @@
+@@ -661,17 +672,20 @@
['compiler_host=="clang"', {
'cflags': [
'-Wtype-limits',
@@ -75,7 +75,7 @@
],
}],
],
-@@ -744,16 +758,27 @@
+@@ -764,16 +778,27 @@
['OS=="linux"', {
'defines': [
'OS_LINUX',
diff --git a/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc b/japanese/mozc-server/files/patch-src-ipc_ipc_path_manager.cc
index 8b029cc2652f..52b5064ffb95 100644
--- a/japanese/mozc-server/files/patch-ipc_ipc_path_manager.cc
+++ b/japanese/mozc-server/files/patch-src-ipc_ipc_path_manager.cc
@@ -1,5 +1,5 @@
---- ipc/ipc_path_manager.cc.orig 2013-03-29 13:33:26.000000000 +0900
-+++ ipc/ipc_path_manager.cc 2013-04-27 15:21:52.000000000 +0900
+--- src/ipc/ipc_path_manager.cc.orig 2013-03-29 13:33:26.000000000 +0900
++++ src/ipc/ipc_path_manager.cc 2013-04-27 15:21:52.000000000 +0900
@@ -276,7 +276,7 @@
*ipc_name = kIPCPrefix;
#endif // OS_WIN
diff --git a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc b/japanese/mozc-server/files/patch-src-ipc_unix_ipc.cc
index 76192d6fd642..ac358d9a5576 100644
--- a/japanese/mozc-server/files/patch-ipc_unix_ipc.cc
+++ b/japanese/mozc-server/files/patch-src-ipc_unix_ipc.cc
@@ -1,5 +1,5 @@
---- ipc/unix_ipc.cc.orig 2013-03-29 13:33:26.000000000 +0900
-+++ ipc/unix_ipc.cc 2013-04-27 15:23:08.000000000 +0900
+--- src/ipc/unix_ipc.cc.orig 2013-03-29 13:33:26.000000000 +0900
++++ src/ipc/unix_ipc.cc 2013-04-27 15:23:08.000000000 +0900
@@ -41,6 +41,9 @@
#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-src-server_mozc_server.cc
index 55a601b1a9ba..6a5983e17837 100644
--- a/japanese/mozc-server/files/patch-server_mozc_server.cc
+++ b/japanese/mozc-server/files/patch-src-server_mozc_server.cc
@@ -1,5 +1,5 @@
---- server/mozc_server.cc.orig 2013-03-29 13:33:26.000000000 +0900
-+++ server/mozc_server.cc 2013-04-27 15:18:29.000000000 +0900
+--- src/server/mozc_server.cc.orig 2013-03-29 13:33:26.000000000 +0900
++++ src/server/mozc_server.cc 2013-04-27 15:18:29.000000000 +0900
@@ -32,6 +32,9 @@
#ifdef OS_WIN
#include <windows.h>
diff --git a/japanese/mozc-server/files/patch-third_party_gyp_gyp b/japanese/mozc-server/files/patch-src-third_party_gyp_gyp
index 9816e1eade65..675b00c03b07 100644
--- a/japanese/mozc-server/files/patch-third_party_gyp_gyp
+++ b/japanese/mozc-server/files/patch-src-third_party_gyp_gyp
@@ -1,5 +1,5 @@
---- third_party/gyp/gyp.orig 2014-08-31 04:28:46.000000000 +0900
-+++ third_party/gyp/gyp 2014-08-31 04:28:50.000000000 +0900
+--- src/third_party/gyp/gyp.orig 2014-08-31 04:28:46.000000000 +0900
++++ src/third_party/gyp/gyp 2014-08-31 04:28:50.000000000 +0900
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
diff --git a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py b/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_common.py
index a26890f1e33a..02d14a66bf0e 100644
--- a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_common.py
+++ b/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_common.py
@@ -1,5 +1,5 @@
---- third_party/gyp/pylib/gyp/common.py.orig 2013-04-21 03:48:44.556270889 +0900
-+++ third_party/gyp/pylib/gyp/common.py 2013-04-21 04:16:32.525269583 +0900
+--- src/third_party/gyp/pylib/gyp/common.py.orig 2013-04-21 03:48:44.556270889 +0900
++++ src/third_party/gyp/pylib/gyp/common.py 2013-04-21 04:16:32.525269583 +0900
@@ -382,6 +382,11 @@
'cygwin': 'win',
'win32': 'win',
diff --git a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py b/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_generator_make.py
index 1d391db29991..56af50dcc9b2 100644
--- a/japanese/mozc-server/files/patch-third_party_gyp_pylib_gyp_generator_make.py
+++ b/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_generator_make.py
@@ -1,5 +1,5 @@
---- third_party/gyp/pylib/gyp/generator/make.py.orig 2013-02-26 11:59:54.000000000 +0900
-+++ third_party/gyp/pylib/gyp/generator/make.py 2013-05-03 21:08:15.000000000 +0900
+--- src/third_party/gyp/pylib/gyp/generator/make.py.orig 2013-02-26 11:59:54.000000000 +0900
++++ src/third_party/gyp/pylib/gyp/generator/make.py 2013-05-03 21:08:15.000000000 +0900
@@ -259,7 +259,7 @@
# export LINK=g++
#
diff --git a/japanese/mozc-server/files/patch-unix_emacs_mozc.el b/japanese/mozc-server/files/patch-src-unix_emacs_mozc.el
index 22257b1095af..dac728d79b7f 100644
--- a/japanese/mozc-server/files/patch-unix_emacs_mozc.el
+++ b/japanese/mozc-server/files/patch-src-unix_emacs_mozc.el
@@ -1,5 +1,5 @@
---- unix/emacs/mozc.el.orig 2015-02-15 04:18:31.000000000 +0900
-+++ unix/emacs/mozc.el 2015-02-19 04:01:46.000000000 +0900
+--- src/unix/emacs/mozc.el.orig 2015-02-15 04:18:31.000000000 +0900
++++ src/unix/emacs/mozc.el 2015-02-19 04:01:46.000000000 +0900
@@ -1538,7 +1538,7 @@
;;;; Communication with Mozc server through the helper process
diff --git a/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py b/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py
index de022f56d745..4b797fa5c7e8 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_gen_mozc_xml.py
+++ b/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py
@@ -1,5 +1,5 @@
---- unix/ibus/gen_mozc_xml.py.orig 2015-02-15 04:18:31.000000000 +0900
-+++ unix/ibus/gen_mozc_xml.py 2015-02-22 02:00:23.000000000 +0900
+--- src/unix/ibus/gen_mozc_xml.py.orig 2015-02-15 04:18:31.000000000 +0900
++++ src/unix/ibus/gen_mozc_xml.py 2015-02-22 02:00:23.000000000 +0900
@@ -67,7 +67,7 @@
# Information to generate <engines> part of mozc.xml for IBus 1.5 or later.
IBUS_1_5_ENGINE_COMMON_PROPS = {
diff --git a/japanese/mozc-server/files/patch-unix_ibus_ibus.gyp b/japanese/mozc-server/files/patch-src-unix_ibus_ibus.gyp
index b4d1ede5dee6..6dda77eac099 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_ibus.gyp
+++ b/japanese/mozc-server/files/patch-src-unix_ibus_ibus.gyp
@@ -1,5 +1,5 @@
---- unix/ibus/ibus.gyp.orig 2015-02-17 18:04:40.000000000 +0900
-+++ unix/ibus/ibus.gyp 2015-02-17 18:04:58.000000000 +0900
+--- src/unix/ibus/ibus.gyp.orig 2015-02-17 18:04:40.000000000 +0900
++++ src/unix/ibus/ibus.gyp 2015-02-17 18:04:58.000000000 +0900
@@ -83,6 +83,8 @@
'./gen_mozc_xml.py',
'--branding=Mozc',
diff --git a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc b/japanese/mozc-server/files/patch-src-unix_ibus_mozc_engine.cc
index ea78852a5b49..e42fe70fb0e2 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc
+++ b/japanese/mozc-server/files/patch-src-unix_ibus_mozc_engine.cc
@@ -1,5 +1,5 @@
---- unix/ibus/mozc_engine.cc.orig 2014-08-31 03:35:19.000000000 +0900
-+++ unix/ibus/mozc_engine.cc 2014-08-31 04:04:15.000000000 +0900
+--- src/unix/ibus/mozc_engine.cc.orig 2014-08-31 03:35:19.000000000 +0900
++++ src/unix/ibus/mozc_engine.cc 2014-08-31 04:04:15.000000000 +0900
@@ -224,7 +224,7 @@
}
diff --git a/japanese/mozc-server/files/patch-unix_ibus_path_util.cc b/japanese/mozc-server/files/patch-src-unix_ibus_path_util.cc
index 28185c1ca03c..be46af7f91bd 100644
--- a/japanese/mozc-server/files/patch-unix_ibus_path_util.cc
+++ b/japanese/mozc-server/files/patch-src-unix_ibus_path_util.cc
@@ -1,5 +1,5 @@
---- unix/ibus/path_util.cc.orig 2013-03-29 13:33:43.000000000 +0900
-+++ unix/ibus/path_util.cc 2013-04-27 15:42:28.000000000 +0900
+--- src/unix/ibus/path_util.cc.orig 2013-03-29 13:33:43.000000000 +0900
++++ src/unix/ibus/path_util.cc 2013-04-27 15:42:28.000000000 +0900
@@ -30,7 +30,7 @@
#include "unix/ibus/path_util.h"
generated by cgit (git 2.34.1) at 2024-12-18 11:57:33 +0800