From 196453bfe438e95d4554a395653f65fd213c6cff Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Mon, 16 May 2016 17:43:22 +0000 Subject: [PATCH] Update japanese/mozc-server to 2.17.2322.102. Changes include: - Use Github as the source. - Depend on devel/py-gyp and japanese/zinnia because bundled versions have been removed from the original distfile. - devel/py-gyp-devel has been updated to snapshot as of 20160504 and renamed with devel/py-gyp. Take maintainership[*]. - Install mozc.el.gz instead of mozc.el. Approved by: maintainer [*] --- MOVED | 1 + devel/Makefile | 2 +- devel/py-gyp-devel/Makefile | 23 ------ devel/py-gyp-devel/distinfo | 2 - devel/py-gyp-devel/pkg-descr | 3 - devel/py-gyp/Makefile | 20 +++++ devel/py-gyp/distinfo | 2 + .../files/patch-pylib_gyp_generator_make.py | 6 +- devel/py-gyp/pkg-descr | 7 ++ japanese/mozc-server/Makefile | 72 ++++++++--------- japanese/mozc-server/distinfo | 22 ++--- .../extra-patch-src-unix-fcitx-fcitx.gyp | 10 --- ...h-src-unix-fcitx-fcitx_key_event_handler.h | 13 --- ...atch-src-unix-fcitx-fcitx_key_translator.h | 11 --- .../extra-patch-src-unix-fcitx-fcitx_mozc.h | 11 --- ...ra-patch-src-unix-fcitx-mozc_connection.cc | 11 --- ...tra-patch-src-unix-fcitx-mozc_connection.h | 11 --- ...tch-src-unix-fcitx-mozc_response_parser.cc | 50 ------------ .../extra-patch-src-unix-uim-key_translator.h | 11 --- .../files/extra-patch-src-unix-uim-mozc.cc | 24 +++--- .../files/extra-patch-src-unix-uim-uim.gyp | 14 +--- .../extra-patch-src-unix_fcitx_fcitx_mozc.cc | 8 +- .../files/patch-src-base_process.cc | 8 +- .../mozc-server/files/patch-src-build_mozc.py | 29 ++++--- .../files/patch-src-gui-qt_libraries.gypi | 19 ++--- .../files/patch-src-gyp_common.gypi | 81 ++++++++++++++----- .../files/patch-src-session-session_base.gyp | 10 --- .../files/patch-src-third_party_gyp_gyp | 8 -- ...ch-src-third_party_gyp_pylib_gyp_common.py | 14 ---- ...hird_party_gyp_pylib_gyp_generator_make.py | 31 ------- .../files/patch-src-unix_ibus_gen_mozc_xml.py | 39 ++++----- japanese/mozc-server/pkg-descr | 2 +- 32 files changed, 210 insertions(+), 365 deletions(-) delete mode 100644 devel/py-gyp-devel/Makefile delete mode 100644 devel/py-gyp-devel/distinfo delete mode 100644 devel/py-gyp-devel/pkg-descr create mode 100644 devel/py-gyp/Makefile create mode 100644 devel/py-gyp/distinfo rename devel/{py-gyp-devel => py-gyp}/files/patch-pylib_gyp_generator_make.py (70%) create mode 100644 devel/py-gyp/pkg-descr delete mode 100644 japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx.gyp delete mode 100644 japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_event_handler.h delete mode 100644 japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_translator.h delete mode 100644 japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_mozc.h delete mode 100644 japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.cc delete mode 100644 japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.h delete mode 100644 japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc delete mode 100644 japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h delete mode 100644 japanese/mozc-server/files/patch-src-session-session_base.gyp delete mode 100644 japanese/mozc-server/files/patch-src-third_party_gyp_gyp delete mode 100644 japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_common.py delete mode 100644 japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_generator_make.py diff --git a/MOVED b/MOVED index e5b4aa6ede20..40a5ac935aab 100644 --- a/MOVED +++ b/MOVED @@ -8325,3 +8325,4 @@ databases/postgresql90-pltcl||2016-05-16|Has expired: "EOL was reached in Septem databases/postgresql90-client||2016-05-16|Has expired: "EOL was reached in September 2015" databases/postgresql90-docs||2016-05-16|Has expired: "EOL was reached in September 2015" databases/postgresql90-server||2016-05-16|Has expired: "EOL was reached in September 2015" +devel/py-gyp-devel|devel/py-gyp|2016-05-16|Renamed to devel/py-gyp diff --git a/devel/Makefile b/devel/Makefile index 4cc228fb428a..dd80fb5b85ab 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4130,7 +4130,7 @@ SUBDIR += py-greenlet SUBDIR += py-grizzled SUBDIR += py-grouch - SUBDIR += py-gyp-devel + SUBDIR += py-gyp SUBDIR += py-hash_ring SUBDIR += py-hghooks SUBDIR += py-hgsubversion diff --git a/devel/py-gyp-devel/Makefile b/devel/py-gyp-devel/Makefile deleted file mode 100644 index 1547c9b3cbcc..000000000000 --- a/devel/py-gyp-devel/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Created by: Daichi GOTO -# $FreeBSD$ - -PORTNAME= gyp -PORTVERSION= 20150414 -PORTREVISION= 0 -CATEGORIES= devel python -MASTER_SITES= http://people.freebsd.org/~daichi/distfiles/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= daichi@FreeBSD.org -COMMENT= Generate Your Projects - -LICENSE= BSD3CLAUSE - -USES= python:2 -USE_PYTHON= autoplist distutils - -pre-configure: - ${REINPLACE_CMD} -e 's/linux/${OPSYS:tl}/;s|gcc|${CC}|;s|g++|${CXX}|' \ - ${WRKSRC}/pylib/gyp/generator/make.py - -.include diff --git a/devel/py-gyp-devel/distinfo b/devel/py-gyp-devel/distinfo deleted file mode 100644 index 965dafd866a6..000000000000 --- a/devel/py-gyp-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (gyp-20150414.tar.gz) = 798efaf63f605f2e7cdbab10ac279b310c9dd8d4e9f6d679fb6b16ece5c0878f -SIZE (gyp-20150414.tar.gz) = 11860415 diff --git a/devel/py-gyp-devel/pkg-descr b/devel/py-gyp-devel/pkg-descr deleted file mode 100644 index 1abc76032b77..000000000000 --- a/devel/py-gyp-devel/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -gyp - Generate Your Projects - a python based build tool - -WWW: http://code.google.com/p/gyp/ diff --git a/devel/py-gyp/Makefile b/devel/py-gyp/Makefile new file mode 100644 index 000000000000..bf183b77e477 --- /dev/null +++ b/devel/py-gyp/Makefile @@ -0,0 +1,20 @@ +# Created by: Daichi GOTO +# $FreeBSD$ + +PORTNAME= gyp +PORTVERSION= 20160504 +CATEGORIES= devel python +MASTER_SITES= LOCAL/hrs +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= ${PORTNAME}-e679e688ba6db12336b79650c27fcf8a5ed21e60 + +MAINTAINER= hrs@FreeBSD.org +COMMENT= Build System That Generates Other Build Systems + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= python:2 +USE_PYTHON= autoplist distutils + +.include diff --git a/devel/py-gyp/distinfo b/devel/py-gyp/distinfo new file mode 100644 index 000000000000..e673817a6309 --- /dev/null +++ b/devel/py-gyp/distinfo @@ -0,0 +1,2 @@ +SHA256 (gyp-e679e688ba6db12336b79650c27fcf8a5ed21e60.tar.gz) = 51fadf46a7a108b0c8f273fb726b113609d7be5394d286716cbf472d1327d18c +SIZE (gyp-e679e688ba6db12336b79650c27fcf8a5ed21e60.tar.gz) = 620920 diff --git a/devel/py-gyp-devel/files/patch-pylib_gyp_generator_make.py b/devel/py-gyp/files/patch-pylib_gyp_generator_make.py similarity index 70% rename from devel/py-gyp-devel/files/patch-pylib_gyp_generator_make.py rename to devel/py-gyp/files/patch-pylib_gyp_generator_make.py index fd508990b925..a4dfc93054d5 100644 --- a/devel/py-gyp-devel/files/patch-pylib_gyp_generator_make.py +++ b/devel/py-gyp/files/patch-pylib_gyp_generator_make.py @@ -1,6 +1,6 @@ ---- pylib/gyp/generator/make.py.orig 2015-04-16 13:28:24.117918307 +0900 -+++ pylib/gyp/generator/make.py 2015-04-16 13:28:50.421923951 +0900 -@@ -342,7 +342,7 @@ +--- pylib/gyp/generator/make.py.orig 2016-05-10 14:06:56 UTC ++++ pylib/gyp/generator/make.py +@@ -342,7 +342,7 @@ sed -e "s|^$(notdir $@)|$@|" $(depfile). # We remove slashes and replace spaces with new lines; # remove blank lines; # delete the first line and append a colon to the remaining lines. diff --git a/devel/py-gyp/pkg-descr b/devel/py-gyp/pkg-descr new file mode 100644 index 000000000000..df264fa8d694 --- /dev/null +++ b/devel/py-gyp/pkg-descr @@ -0,0 +1,7 @@ +GYP is a Meta-Build system: a build system that generates other +build systems. It is intended to support large projects that need +to be built on multiple platforms (e.g., Mac, Windows, Linux), and +where it is important that the project can be built using the IDEs +that are popular on each platform as if the project is a "native" one. + +WWW: https://gyp.gsrc.io/ diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 422970f3d368..36e0218934da 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -2,11 +2,14 @@ # $FreeBSD$ PORTNAME= mozc -PORTVERSION= 2.17.2106.102 +PORTVERSION= 2.17.2322.102 CATEGORIES= japanese -MASTER_SITES= LOCAL/hrs -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= https://codeload.github.com/google/${PORTNAME}/tar.gz/9b4c9e0?dummy=/:main \ + https://codeload.github.com/hiroyuki-komatsu/japanese-usage-dictionary/tar.gz/e5b3425?dummy=/:udic +DISTFILES= google-${PORTNAME}-9b4c9e0_GH0.tar.gz:main \ + hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz:udic +EXTRACT_ONLY= google-${PORTNAME}-9b4c9e0_GH0.tar.gz \ + hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz MAINTAINER= hrs@FreeBSD.org COMMENT?= Mozc Japanese Input Method, Server @@ -15,7 +18,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ninja:devel/ninja \ - python:lang/python + python:lang/python \ + gyp:devel/py-gyp EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR} LIB_DEPENDS= libprotobuf.so:devel/protobuf \ libzinnia.so:japanese/zinnia @@ -23,6 +27,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USES= compiler:c++11-lang pkgconfig iconv:wchar_t gmake \ tar:bzip2 python:build +WRKSRC= ${WRKDIR}/${PORTNAME}-9b4c9e0 BUILD_WRKSRC= ${WRKSRC}/src BUILD_MOZC_LIST?= mozc_server @@ -70,6 +75,7 @@ GYP_DEFINES= use_libprotobuf=1 \ enable_unittest=0 \ compiler_host="${_CCTYPE}" \ compiler_target="${_CCTYPE}" \ + use_libzinnia=1 \ zinnia_model_file="${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model" \ ibus_mozc_icon_path="${LOCALBASE}/share/ibus-mozc/icons/product_icon.png" \ ibus_mozc_path="${PREFIX}/libexec/ibus-engine-mozc" @@ -77,8 +83,8 @@ BUILD_MODE= Release BUILD_CMD= ${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${MAKE_CMD} BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \ ${SETENV} BUILD_COMMAND="${BUILD_WRKSRC}/mozcmake" \ - PYTHONPATH=${BUILD_WRKSRC}/third_party/gyp/pylib/gyp \ GYP_DEFINES="${GYP_DEFINES}" \ + PYTHONPATH=${PYTHON_SITELIBDIR}/gyp \ CC_host="${CC}" \ CC_target="${CC}" \ CXX_host="${CXX}" \ @@ -87,8 +93,7 @@ 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 ${BUILD_WRKSRC}/third_party/gyp && \ - ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} +BUILD_GYP_CMD= ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/gyp post-patch: ${REINPLACE_CMD} 's,-liconv,${ICONV_LIB},g' \ @@ -108,7 +113,7 @@ ${BUILD_WRKSRC}/mozcmake: post-configure: ${BUILD_WRKSRC}/mozcmake ${BUILD_MOZC_CMD} gyp \ - --gypdir=${BUILD_WRKSRC}/third_party/gyp \ + --gypdir=${LOCALBASE}/bin \ --server_dir="${PREFIX}/bin" \ --tool_dir="${PREFIX}/libexec" \ --renderer_dir="${PREFIX}/libexec" \ @@ -128,10 +133,8 @@ GYP_DEFINES+= use_libibus=0 \ MASTER_SITES+= LOCAL/kuriyama:zipcode DISTFILES+= \ - ken_all-20130628.lzh:zipcode \ - jigyosyo-20130628.lzh:zipcode - -EXTRACT_DEPENDS+= lha:archivers/lha + ken_all-20160428.zip:zipcode \ + jigyosyo-20160428.zip:zipcode PLIST_FILES+= bin/mozc \ bin/mozc_server \ @@ -139,14 +142,16 @@ PLIST_FILES+= bin/mozc \ SUB_FILES+= mozc post-extract-mozc_server: - @for F in jigyosyo-20130628.lzh ken_all-20130628.lzh; do \ - ${LHA_CMD} xfq2w=${BUILD_WRKSRC}/data/dictionary_oss \ + @for F in ${DISTFILES:M*\:zipcode:C/\:zipcode//}; do \ + ${UNZIP_NATIVE_CMD} -L -d ${BUILD_WRKSRC}/data/dictionary_oss \ ${DISTDIR}/$$F; \ done @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 + ${MV} ${WRKDIR}/japanese-usage-dictionary-e5b3425/usage_dict.txt \ + ${BUILD_WRKSRC}/third_party/japanese_usage_dictionary post-extract: post-extract-mozc_server @@ -251,18 +256,20 @@ do-install-ibus_mozc: # uim_mozc .if ${BUILD_MOZC_LIST:Muim_mozc} == "uim_mozc" || make(makesum) -USE_GITHUB= nodefault # XXX -GH_ACCOUNT= e-kato:MU -GH_PROJECT= macuim:MU -GH_TAGNAME= v0.6.16.2:MU -EXTRACT_ONLY+= ${DISTFILE_MU} +#USE_GITHUB= yes # XXX +GH_ACCOUNT= e-kato +GH_PROJECT= macuim +GH_TAGNAME= v0.6.16.2.1 +DISTFILES+= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}_GH0${EXTRACT_SUFX}:gh_uim +EXTRACT_ONLY+= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}_GH0${EXTRACT_SUFX} +MASTER_SITES+= https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/:gh_uim +WRKSRC_MU= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//} LIB_DEPENDS+= libuim.so:textproc/uim RUN_DEPENDS+= mozc_server:japanese/mozc-server \ mozc_tool:japanese/mozc-tool -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-unix-uim-key_translator.h \ - ${PATCHDIR}/extra-patch-src-unix-uim-mozc.cc \ +EXTRA_PATCHES= ${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 \ @@ -305,22 +312,13 @@ do-install-uim_mozc: # fcitx_mozc .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" || make(makesum) PATCH_SITES= http://download.fcitx-im.org/fcitx-mozc/ -PATCHFILES= fcitx-mozc-2.16.2037.102.2.patch +PATCHFILES= fcitx-mozc-2.17.2313.102.1.patch .endif .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" 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 @@ -352,11 +350,6 @@ post-extract-fcitx_mozc: post-extract: post-extract-fcitx_mozc -post-patch-fcitx_mozc: - cd ${PATCH_WRKSRC} && ${CAT} ${POST_PATCHES} | ${PATCH} - -post-patch: post-patch-fcitx_mozc - do-build-fcitx_mozc: ${BUILD_MOZC_CMD_BUILD} unix/fcitx/fcitx.gyp:fcitx-mozc @@ -397,6 +390,7 @@ CATEGORIES+= elisp RUN_DEPENDS+= mozc_server:japanese/mozc-server PLIST_FILES+= ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.elc \ + ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz \ ${EMACS_VERSION_SITE_LISPDIR}/mozc/leim-list.el PLIST_DIRS+= ${EMACS_VERSION_SITE_LISPDIR}/mozc @@ -409,11 +403,13 @@ post-patch: post-patch-mozc_el do-build-mozc_el: cd ${BUILD_WRKSRC}/unix/emacs && \ ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ - -f batch-byte-compile mozc.el + -f batch-byte-compile mozc.el && \ + ${GZIP_CMD} -9 mozc.el do-install-mozc_el: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc ${INSTALL_DATA} \ + ${BUILD_WRKSRC}/unix/emacs/mozc.el.gz \ ${BUILD_WRKSRC}/unix/emacs/mozc.elc \ ${FILESDIR}/leim-list.el \ ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/ diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo index 5d7a49168f92..839bd8d3508a 100644 --- a/japanese/mozc-server/distinfo +++ b/japanese/mozc-server/distinfo @@ -1,10 +1,12 @@ -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 (e-kato-macuim-v0.6.16.2_GH0.tar.gz) = 25fca78d1d76cc5c6a49f3b2f6981791ad8275abb2726334d8d40bd49498194d -SIZE (e-kato-macuim-v0.6.16.2_GH0.tar.gz) = 324551 -SHA256 (fcitx-mozc-2.16.2037.102.2.patch) = ff175f3e0301c33f750780765ea264887827d00bc7a59fc8b55ae514ba449a1e -SIZE (fcitx-mozc-2.16.2037.102.2.patch) = 140421 +SHA256 (google-mozc-9b4c9e0_GH0.tar.gz) = b7f57c4bfbff9a7e657de4f8213bac2f8d3cc454076463ddc66e32ebcf7bf795 +SIZE (google-mozc-9b4c9e0_GH0.tar.gz) = 57248995 +SHA256 (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz) = 2af954cd844c6a3113449d7dca37e36b769ecb2b49d3a54318a3bdee1a75af56 +SIZE (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz) = 71050 +SHA256 (ken_all-20160428.zip) = dd732957ca98dcad8c68aaa89447d77bd9201f26a19241f2531cb3f4ba2296f0 +SIZE (ken_all-20160428.zip) = 1684351 +SHA256 (jigyosyo-20160428.zip) = b95ed393343ed85363e8e7e14725af5e0b0586e60289a386fdba288e0e36f040 +SIZE (jigyosyo-20160428.zip) = 752471 +SHA256 (e-kato-macuim-v0.6.16.2.1_GH0.tar.bz2) = ae999a2f02379bd049484a22684c37be5eb1f4db9763fa79885c4981502336e9 +SIZE (e-kato-macuim-v0.6.16.2.1_GH0.tar.bz2) = 324549 +SHA256 (fcitx-mozc-2.17.2313.102.1.patch) = 52a7ed450f075eca3f4d468390ef59f9a439e0ac74327639802a7f11caa1a2c2 +SIZE (fcitx-mozc-2.17.2313.102.1.patch) = 140531 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 deleted file mode 100644 index da756a100bbb..000000000000 --- a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx.gyp +++ /dev/null @@ -1,10 +0,0 @@ ---- 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=" - - #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 deleted file mode 100644 index bf9249f06c39..000000000000 --- a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_translator.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - - #include "base/port.h" --#include "session/commands.pb.h" -+#include "protocol/commands.pb.h" - #include - - 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 deleted file mode 100644 index f81b497bb85d..000000000000 --- a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_mozc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 1f8050b7381b..000000000000 --- a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index ef196528c843..000000000000 --- a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - - #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-src-unix-fcitx-mozc_response_parser.cc b/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc deleted file mode 100644 index 77fdebbcb320..000000000000 --- a/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc +++ /dev/null @@ -1,50 +0,0 @@ ---- 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 -@@ -235,11 +235,13 @@ - } - } - -+#if 0 - static boolean FcitxMozcPaging(void* arg, boolean prev) - { - FcitxMozc* mozc = static_cast(arg); - return mozc->paging(prev); - } -+#endif - - void MozcResponseParser::ParseCandidates( - const mozc::commands::Candidates &candidates, FcitxMozc *fcitx_mozc) const { -@@ -286,12 +288,14 @@ - FcitxCandidateWordList* candList = FcitxInputStateGetCandidateList(fcitx_mozc->GetInputState()); - FcitxCandidateWordReset(candList); - FcitxCandidateWordSetPageSize(candList, 9); -+#if 0 - if (candidates.has_direction() && - candidates.direction() == commands::Candidates::HORIZONTAL) { - FcitxCandidateWordSetLayoutHint(candList, CLH_Horizontal); - } else { - FcitxCandidateWordSetLayoutHint(candList, CLH_Vertical); - } -+#endif - - map > usage_map; - if (candidates.has_usages()) { -@@ -395,7 +399,9 @@ - else - FcitxCandidateWordSetChoose(candList, EMPTY_STR_CHOOSE); - FcitxCandidateWordSetFocus(candList, local_index); -+#if 0 - FcitxCandidateWordSetOverridePaging(candList, hasPrev, hasNext, FcitxMozcPaging, fcitx_mozc, NULL); -+#endif - } - - static int GetRawCursorPos(const char * str, int upos) 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 deleted file mode 100644 index 2f94143a45d9..000000000000 --- a/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 index 3253be97c9c4..2fced9df6401 100644 --- a/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc +++ b/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc @@ -1,13 +1,19 @@ ---- 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 @@ +--- src/unix/uim/mozc.cc.orig 2016-05-11 00:39:29.009401000 +0900 ++++ src/unix/uim/mozc.cc 2016-05-11 00:40:58.320083000 +0900 +@@ -48,6 +48,7 @@ + # include "plugin.h" + #endif ++#include "base/init_mozc.h" #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" + #include "protocol/config.pb.h" +@@ -1196,7 +1197,7 @@ + argv[0] = (char *)name; + argv[1] = NULL; + +- InitGoogle((const char *)argv[0], &argc, (char ***)&argv, true); ++ mozc::InitMozc((const char *)argv[0], &argc, (char ***)&argv, true); + mozc::uim::install_keymap(); + } 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 index 700f2890e971..ad49d67e1974 100644 --- a/japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp +++ b/japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp @@ -1,5 +1,5 @@ ---- src/unix/uim/uim.gyp.orig 2014-10-27 02:24:13.000000000 +0900 -+++ src/unix/uim/uim.gyp 2015-09-26 06:34:58.683557000 +0900 +--- src/unix/uim/uim.gyp.orig 2015-07-15 10:04:31.000000000 +0900 ++++ src/unix/uim/uim.gyp 2016-05-11 00:37:33.495056000 +0900 @@ -31,6 +31,7 @@ { 'variables': { @@ -17,13 +17,3 @@ ], }, 'targets': [ -@@ -49,7 +52,8 @@ - 'key_translator.cc', - ], - 'dependencies': [ -- '../../session/session_base.gyp:session_protocol', -+ '../../protocol/protocol.gyp:commands_proto', -+ '../../session/session_base.gyp:ime_switch_util', - ], - 'cflags': [ - ' and instead of upcoming # and . '-Wno-deprecated', -+ '<@(cflags_cc)', -+ ], ++ '<@(cflags_cc)', + ], + 'include_dirs': [ -+ '<@(include_dirs)' -+ ], ++ '<@(include_dirs)', ++ ], + 'ldflags': [ + '<@(ldflags)', -+ '-fstack-protector', - ], ++ '-fstack-protector', ++ ], 'conditions': [ - ['target_platform!="NaCl"', { + ['target_platform=="Linux"', { + # OS_LINUX is defined always (target and host). +- 'defines': ['OS_LINUX',], ++ 'defines': [ ++ 'OS_LINUX', ++ 'OS_FREEBSD', ++ 'LOCALBASE="<@(localbase)"', ++ ], + }], + ['target_platform=="Android"', { + 'defines': ['NO_USAGE_REWRITER'], diff --git a/japanese/mozc-server/files/patch-src-session-session_base.gyp b/japanese/mozc-server/files/patch-src-session-session_base.gyp deleted file mode 100644 index 53beda468ae8..000000000000 --- a/japanese/mozc-server/files/patch-src-session-session_base.gyp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/session/session_base.gyp.orig 2015-09-09 23:49:24.267933000 +0900 -+++ src/session/session_base.gyp 2015-09-09 23:50:12.347558000 +0900 -@@ -101,6 +101,7 @@ - '../composer/composer.gyp:key_event_util', - '../composer/composer.gyp:key_parser', - '../config/config.gyp:config_handler', -+ '../protocol/protocol.gyp:commands_proto', - '../protocol/protocol.gyp:config_proto', - 'keymap', - ], diff --git a/japanese/mozc-server/files/patch-src-third_party_gyp_gyp b/japanese/mozc-server/files/patch-src-third_party_gyp_gyp deleted file mode 100644 index 675b00c03b07..000000000000 --- a/japanese/mozc-server/files/patch-src-third_party_gyp_gyp +++ /dev/null @@ -1,8 +0,0 @@ ---- 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 - # Copyright 2013 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. diff --git a/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_common.py b/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_common.py deleted file mode 100644 index 02d14a66bf0e..000000000000 --- a/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_common.py +++ /dev/null @@ -1,14 +0,0 @@ ---- 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', - 'darwin': 'mac', -+ 'freebsd7': 'linux', -+ 'freebsd8': 'linux', -+ 'freebsd9': 'linux', -+ 'freebsd10': 'linux', -+ 'freebsd11': 'linux' - } - - if 'flavor' in params: diff --git a/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_generator_make.py b/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_generator_make.py deleted file mode 100644 index 56af50dcc9b2..000000000000 --- a/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_generator_make.py +++ /dev/null @@ -1,31 +0,0 @@ ---- 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++ - # - # This will allow make to invoke N linker processes as specified in -jN. --LINK ?= %(flock)s $(builddir)/linker.lock $(CXX.target) -+LINK ?= $(CXX.target) - - CC.target ?= %(CC.target)s - CFLAGS.target ?= $(CFLAGS) -@@ -1956,6 +1956,9 @@ - srcdir_prefix = '$(srcdir)/' - - flock_command= 'flock' -+ if os.uname()[0] == 'FreeBSD': -+ flock_command= 'lockf' -+ - header_params = { - 'default_target': default_target, - 'builddir': builddir_name, -@@ -2003,7 +2006,8 @@ - build_file, _, _ = gyp.common.ParseQualifiedTarget(target_list[0]) - make_global_settings_array = data[build_file].get('make_global_settings', []) - wrappers = {} -- wrappers['LINK'] = '%s $(builddir)/linker.lock' % flock_command -+ # Disable flock for linking. -+ # wrappers['LINK'] = '%s $(builddir)/linker.lock' % flock_command - for key, value in make_global_settings_array: - if key.endswith('_wrapper'): - wrappers[key[:-len('_wrapper')]] = '$(abspath %s)' % value diff --git a/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py b/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py index 4b797fa5c7e8..eed3c1b84dec 100644 --- a/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py +++ b/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py @@ -1,24 +1,6 @@ ---- 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 part of mozc.xml for IBus 1.5 or later. - IBUS_1_5_ENGINE_COMMON_PROPS = { - 'description': '%(product_name)s (Japanese Input Method)', -- 'language': 'ja', -+ 'language': 'jpn', - 'icon': '%(ibus_mozc_icon_path)s', - 'rank': '80', - 'symbol': 'あ', -@@ -91,7 +91,7 @@ - # unix/ibus/mozc_engine.cc. - 'name': ['mozc-jp'], - 'longname': ['%(product_name)s'], -- 'layout': ['default'], -+ 'layout': ['jp'], - }, - } - -@@ -129,6 +129,7 @@ +--- src/unix/ibus/gen_mozc_xml.py.orig 2016-03-13 11:22:55.000000000 +0900 ++++ src/unix/ibus/gen_mozc_xml.py 2016-05-10 23:43:06.273350000 +0900 +@@ -90,6 +90,7 @@ engines: A dictionary from a property name to a list of property values of engines. For example, {'name': ['mozc-jp', 'mozc', 'mozc-dv']}. """ @@ -26,7 +8,7 @@ print '' for key in component: OutputXmlElement(param_dict, key, component[key]) -@@ -203,13 +204,19 @@ +@@ -164,13 +165,19 @@ parser.add_option('--server_dir', dest='server_dir', default='', help='The absolute directory path to be installed the ' 'server executable.') @@ -45,5 +27,14 @@ - setup_arg.append(os.path.join(options.server_dir, 'mozc_tool')) + setup_arg.append(os.path.join(options.tool_dir, 'mozc_tool')) setup_arg.append('--mode=config_dialog') - if IsIBus15OrGreater(options): - # A tentative workaround against IBus 1.5 + + param_dict = { +@@ -181,7 +188,7 @@ + + engine_common_props = { + 'description': '%(product_name)s (Japanese Input Method)', +- 'language': 'ja', ++ 'language': 'jpn', + 'icon': '%(ibus_mozc_icon_path)s', + 'rank': '80', + } diff --git a/japanese/mozc-server/pkg-descr b/japanese/mozc-server/pkg-descr index a30e9243751e..fac004ed8220 100644 --- a/japanese/mozc-server/pkg-descr +++ b/japanese/mozc-server/pkg-descr @@ -2,4 +2,4 @@ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as Chromium OS, Windows, Mac and Linux. This open-source project originates from Google Japanese Input. -WWW: http://code.google.com/p/mozc/ +WWW: https://github.com/google/mozc