svn commit: r415345 - in head: . devel devel/py-gyp devel/py-gyp-devel devel/py-gyp/files japanese/mozc-server japanese/mozc-server/files
Hiroki Sato
hrs at FreeBSD.org
Mon May 16 17:43:25 UTC 2016
Author: hrs
Date: Mon May 16 17:43:22 2016
New Revision: 415345
URL: https://svnweb.freebsd.org/changeset/ports/415345
Log:
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 [*]
Added:
head/devel/py-gyp/
- copied from r415344, head/devel/py-gyp-devel/
Deleted:
head/devel/py-gyp-devel/
head/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx.gyp
head/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_event_handler.h
head/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_key_translator.h
head/japanese/mozc-server/files/extra-patch-src-unix-fcitx-fcitx_mozc.h
head/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.cc
head/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_connection.h
head/japanese/mozc-server/files/extra-patch-src-unix-fcitx-mozc_response_parser.cc
head/japanese/mozc-server/files/extra-patch-src-unix-uim-key_translator.h
head/japanese/mozc-server/files/patch-src-session-session_base.gyp
head/japanese/mozc-server/files/patch-src-third_party_gyp_gyp
head/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_common.py
head/japanese/mozc-server/files/patch-src-third_party_gyp_pylib_gyp_generator_make.py
Modified:
head/MOVED
head/devel/Makefile
head/devel/py-gyp/Makefile
head/devel/py-gyp/distinfo
head/devel/py-gyp/files/patch-pylib_gyp_generator_make.py
head/devel/py-gyp/pkg-descr
head/japanese/mozc-server/Makefile
head/japanese/mozc-server/distinfo
head/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc
head/japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp
head/japanese/mozc-server/files/extra-patch-src-unix_fcitx_fcitx_mozc.cc
head/japanese/mozc-server/files/patch-src-base_process.cc
head/japanese/mozc-server/files/patch-src-build_mozc.py
head/japanese/mozc-server/files/patch-src-gui-qt_libraries.gypi
head/japanese/mozc-server/files/patch-src-gyp_common.gypi
head/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py
head/japanese/mozc-server/pkg-descr
Modified: head/MOVED
==============================================================================
--- head/MOVED Mon May 16 17:39:45 2016 (r415344)
+++ head/MOVED Mon May 16 17:43:22 2016 (r415345)
@@ -8325,3 +8325,4 @@ databases/postgresql90-pltcl||2016-05-16
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
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Mon May 16 17:39:45 2016 (r415344)
+++ head/devel/Makefile Mon May 16 17:43:22 2016 (r415345)
@@ -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
Modified: head/devel/py-gyp/Makefile
==============================================================================
--- head/devel/py-gyp-devel/Makefile Mon May 16 17:39:45 2016 (r415344)
+++ head/devel/py-gyp/Makefile Mon May 16 17:43:22 2016 (r415345)
@@ -2,22 +2,19 @@
# $FreeBSD$
PORTNAME= gyp
-PORTVERSION= 20150414
-PORTREVISION= 0
+PORTVERSION= 20160504
CATEGORIES= devel python
-MASTER_SITES= http://people.freebsd.org/~daichi/distfiles/
+MASTER_SITES= LOCAL/hrs
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= ${PORTNAME}-e679e688ba6db12336b79650c27fcf8a5ed21e60
-MAINTAINER= daichi at FreeBSD.org
-COMMENT= Generate Your Projects
+MAINTAINER= hrs at FreeBSD.org
+COMMENT= Build System That Generates Other Build Systems
LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
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 <bsd.port.mk>
Modified: head/devel/py-gyp/distinfo
==============================================================================
--- head/devel/py-gyp-devel/distinfo Mon May 16 17:39:45 2016 (r415344)
+++ head/devel/py-gyp/distinfo Mon May 16 17:43:22 2016 (r415345)
@@ -1,2 +1,2 @@
-SHA256 (gyp-20150414.tar.gz) = 798efaf63f605f2e7cdbab10ac279b310c9dd8d4e9f6d679fb6b16ece5c0878f
-SIZE (gyp-20150414.tar.gz) = 11860415
+SHA256 (gyp-e679e688ba6db12336b79650c27fcf8a5ed21e60.tar.gz) = 51fadf46a7a108b0c8f273fb726b113609d7be5394d286716cbf472d1327d18c
+SIZE (gyp-e679e688ba6db12336b79650c27fcf8a5ed21e60.tar.gz) = 620920
Modified: head/devel/py-gyp/files/patch-pylib_gyp_generator_make.py
==============================================================================
--- head/devel/py-gyp-devel/files/patch-pylib_gyp_generator_make.py Mon May 16 17:39:45 2016 (r415344)
+++ head/devel/py-gyp/files/patch-pylib_gyp_generator_make.py Mon May 16 17:43:22 2016 (r415345)
@@ -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.
Modified: head/devel/py-gyp/pkg-descr
==============================================================================
--- head/devel/py-gyp-devel/pkg-descr Mon May 16 17:39:45 2016 (r415344)
+++ head/devel/py-gyp/pkg-descr Mon May 16 17:43:22 2016 (r415345)
@@ -1,3 +1,7 @@
-gyp - Generate Your Projects - a python based build tool
+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: http://code.google.com/p/gyp/
+WWW: https://gyp.gsrc.io/
Modified: head/japanese/mozc-server/Makefile
==============================================================================
--- head/japanese/mozc-server/Makefile Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/Makefile Mon May 16 17:43:22 2016 (r415345)
@@ -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 at 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/
Modified: head/japanese/mozc-server/distinfo
==============================================================================
--- head/japanese/mozc-server/distinfo Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/distinfo Mon May 16 17:43:22 2016 (r415345)
@@ -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
Modified: head/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc
==============================================================================
--- head/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/files/extra-patch-src-unix-uim-mozc.cc Mon May 16 17:43:22 2016 (r415345)
@@ -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();
+ }
Modified: head/japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp
==============================================================================
--- head/japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/files/extra-patch-src-unix-uim-uim.gyp Mon May 16 17:43:22 2016 (r415345)
@@ -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': [
- '<!@(pkg-config --cflags <@(pkg_config_libs))',
Modified: head/japanese/mozc-server/files/extra-patch-src-unix_fcitx_fcitx_mozc.cc
==============================================================================
--- head/japanese/mozc-server/files/extra-patch-src-unix_fcitx_fcitx_mozc.cc Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/files/extra-patch-src-unix_fcitx_fcitx_mozc.cc Mon May 16 17:43:22 2016 (r415345)
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/unix/fcitx/fcitx_mozc.cc.orig 2016-05-14 21:54:58.149355000 +0900
++++ src/unix/fcitx/fcitx_mozc.cc 2016-05-14 21:54:58.170065000 +0900
+@@ -440,6 +440,8 @@
boolean ToolMenuAction(struct _FcitxUIMenu *menu, int index)
{
string args;
@@ -9,7 +9,7 @@
switch(index) {
case 0:
args = "--mode=config_dialog";
-@@ -459,7 +461,8 @@
+@@ -460,7 +462,8 @@
args = "--mode=about_dialog";
break;
}
Modified: head/japanese/mozc-server/files/patch-src-base_process.cc
==============================================================================
--- head/japanese/mozc-server/files/patch-src-base_process.cc Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/files/patch-src-base_process.cc Mon May 16 17:43:22 2016 (r415345)
@@ -1,9 +1,9 @@
---- 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 @@
+--- src/base/process.cc.orig 2016-03-13 11:22:55.000000000 +0900
++++ src/base/process.cc 2016-05-10 21:54:57.488770000 +0900
+@@ -126,7 +126,7 @@
#endif
- #ifdef OS_LINUX
+ #if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL)
- static const char kBrowserCommand[] = "/usr/bin/xdg-open";
+ static const char kBrowserCommand[] = LOCALBASE "/bin/xdg-open";
// xdg-open which uses kfmclient or gnome-open internally works both on KDE
Modified: head/japanese/mozc-server/files/patch-src-build_mozc.py
==============================================================================
--- head/japanese/mozc-server/files/patch-src-build_mozc.py Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/files/patch-src-build_mozc.py Mon May 16 17:43:22 2016 (r415345)
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/build_mozc.py.orig 2016-03-13 11:22:55.000000000 +0900
++++ src/build_mozc.py 2016-05-11 00:18:16.131052000 +0900
+@@ -354,6 +354,11 @@
parser.add_option('--version_file', dest='version_file',
help='use the specified version template file',
default='mozc_version_template.txt')
@@ -12,7 +12,7 @@
AddTargetPlatformOption(parser)
# Mac and Linux
-@@ -377,6 +382,14 @@
+@@ -368,6 +373,14 @@
default='',
help='A path to the directory where the server executable'
'is installed. This option is used only on Linux.')
@@ -27,16 +27,19 @@
# Android
parser.add_option('--android_arch', dest='android_arch',
-@@ -548,7 +561,7 @@
+@@ -522,6 +535,11 @@
+ """Parses command line options for the build command."""
parser = optparse.OptionParser(usage='Usage: %prog build [options]')
AddCommonOptions(parser)
- if IsLinux():
-- default_build_concurrency = GetNumberOfProcessors() * 2
++ if IsLinux():
+ default_build_concurrency = 1;
- parser.add_option('--jobs', '-j', dest='jobs',
- default=('%d' % default_build_concurrency),
- metavar='N', help='run build jobs in parallel')
-@@ -707,6 +720,17 @@
++ parser.add_option('--jobs', '-j', dest='jobs',
++ default=('%d' % default_build_concurrency),
++ metavar='N', help='run build jobs in parallel')
+ parser.add_option('--configuration', '-c', dest='configuration',
+ default='Debug', help='specify the build configuration.')
+
+@@ -672,6 +690,17 @@
logging.info('Building GYP command line...')
gyp_options = ['--depth=.', '--include=%s/gyp/common.gypi' % SRC_DIR]
@@ -54,7 +57,7 @@
mozc_root = os.path.abspath(GetTopLevelSourceDirectoryName())
gyp_options.extend(['-D', 'abs_depth=%s' % mozc_root])
-@@ -936,6 +960,14 @@
+@@ -876,6 +905,14 @@
if options.server_dir:
gyp_options.extend([
'-D', 'server_dir=%s' % os.path.abspath(options.server_dir)])
@@ -67,5 +70,5 @@
+
+
- # TODO(yukawa): Use ninja on OSX.
if generator == 'ninja':
+ gyp_options.extend(['--generator-output=.'])
Modified: head/japanese/mozc-server/files/patch-src-gui-qt_libraries.gypi
==============================================================================
--- head/japanese/mozc-server/files/patch-src-gui-qt_libraries.gypi Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/files/patch-src-gui-qt_libraries.gypi Mon May 16 17:43:22 2016 (r415345)
@@ -1,10 +1,11 @@
---- 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 @@
- }, {
+--- src/gui/qt_libraries.gypi.orig 2016-05-14 21:36:24.268182000 +0900
++++ src/gui/qt_libraries.gypi 2016-05-14 21:36:59.852298000 +0900
+@@ -84,7 +84,7 @@
+ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+ ]
+ }],
+- ['OS=="linux"', {
++ ['OS=="linux" or OS=="freebsd"', {
+ 'conditions': [
+ ['qt_dir', {
'libraries': [
- '<!@(<(pkg_config_command) --libs QtGui QtCore)',
-+ '-liconv -L<(localbase)/lib',
- ],
- }],
- ],
Modified: head/japanese/mozc-server/files/patch-src-gyp_common.gypi
==============================================================================
--- head/japanese/mozc-server/files/patch-src-gyp_common.gypi Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/files/patch-src-gyp_common.gypi Mon May 16 17:43:22 2016 (r415345)
@@ -1,5 +1,14 @@
---- 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
+--- src/gyp/common.gypi.orig 2016-03-13 11:22:55.000000000 +0900
++++ src/gyp/common.gypi 2016-05-11 00:09:18.009062000 +0900
+@@ -109,7 +109,7 @@
+ ],
+ # Libraries for GNU/Linux environment.
+ 'linux_ldflags': [
+- '-pthread',
++ '-lpthread',
+ ],
+
+ # Extra defines
@@ -161,9 +161,9 @@
['target_platform=="Linux"', {
# enable_gtk_renderer represents if mozc_renderer is supported on Linux
@@ -27,7 +36,25 @@
# 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',
-@@ -641,17 +649,20 @@
+@@ -415,7 +423,7 @@
+ },
+ },
+ 'conditions': [
+- ['OS=="linux"', {
++ ['OS=="linux" or OS=="freebsd"', {
+ 'cflags': [
+ '<@(debug_extra_cflags)',
+ ],
+@@ -481,7 +489,7 @@
+ },
+ },
+ 'conditions': [
+- ['OS=="linux"', {
++ ['OS=="linux" or OS=="freebsd"', {
+ 'cflags': [
+ '<@(release_extra_cflags)',
+ ],
+@@ -533,17 +541,20 @@
['compiler_target=="clang"', {
'cflags': [
'-Wtype-limits',
@@ -51,7 +78,7 @@
],
}],
],
-@@ -661,17 +672,20 @@
+@@ -553,17 +564,20 @@
['compiler_host=="clang"', {
'cflags': [
'-Wtype-limits',
@@ -75,31 +102,49 @@
],
}],
],
-@@ -764,16 +778,27 @@
- ['OS=="linux"', {
- 'defines': [
- 'OS_LINUX',
-+ 'OS_FREEBSD',
-+ 'LOCALBASE="<@(localbase)"',
+@@ -578,7 +592,7 @@
+ ['channel_dev==1', {
+ 'defines': ['CHANNEL_DEV'],
+ }],
+- ['OS=="linux"', {
++ ['OS=="linux" or OS=="freebsd"', {
+ 'ldflags': [
+ '<@(linux_ldflags)',
],
+@@ -694,21 +708,34 @@
+ },
+ },
+ }],
+- ['OS=="linux"', {
++ ['OS=="linux" or OS=="freebsd"', {
'cflags': [
'<@(warning_cflags)',
'-fPIC',
'-fno-exceptions',
-+ '<@(cflags)',
++ '<@(cflags)',
],
'cflags_cc': [
# We use deprecated <hash_map> and <hash_set> instead of upcoming
# <unordered_map> and <unordered_set>.
'-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'],
Modified: head/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py
==============================================================================
--- head/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/files/patch-src-unix_ibus_gen_mozc_xml.py Mon May 16 17:43:22 2016 (r415345)
@@ -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 <engines> 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 '<component>'
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',
+ }
Modified: head/japanese/mozc-server/pkg-descr
==============================================================================
--- head/japanese/mozc-server/pkg-descr Mon May 16 17:39:45 2016 (r415344)
+++ head/japanese/mozc-server/pkg-descr Mon May 16 17:43:22 2016 (r415345)
@@ -2,4 +2,4 @@ Mozc is a Japanese Input Method Editor (
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
More information about the svn-ports-head
mailing list