Date: Sat, 20 Jul 2013 04:02:49 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323333 - in head/japanese: fcitx-mozc ibus-mozc mozc-additions mozc-additions/files mozc-server mozc-server/files mozc-tool Message-ID: <201307200402.r6K42nBc086613@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Jul 20 04:02:49 2013 New Revision: 323333 URL: http://svnweb.freebsd.org/changeset/ports/323333 Log: - Update to 1.11.1502.102. Changes include: * Fixes cursor movement issue on Emacs 24 (Issue 168) * Support numpad keys in mozc.el (Issue 170) * Support Emacs 24 in mozc.el (Issue 190) * Support surrounding text * Dictionary update - Take maintainership. Approved by: daichi (maintainer) Added: head/japanese/mozc-additions/files/ head/japanese/mozc-additions/files/ibus-daemon_restart (contents, props changed) head/japanese/mozc-additions/files/ibus-daemon_start (contents, props changed) head/japanese/mozc-additions/files/ibus-daemon_stop (contents, props changed) head/japanese/mozc-additions/files/mozc_server_restart (contents, props changed) head/japanese/mozc-additions/files/mozc_server_start (contents, props changed) head/japanese/mozc-additions/files/mozc_server_stop (contents, props changed) head/japanese/mozc-additions/files/mozc_tool_character_palette (contents, props changed) head/japanese/mozc-additions/files/mozc_tool_config (contents, props changed) head/japanese/mozc-additions/files/mozc_tool_dictionary (contents, props changed) head/japanese/mozc-additions/files/mozc_tool_hand_writing (contents, props changed) head/japanese/mozc-additions/files/mozc_tool_word_register (contents, props changed) head/japanese/mozc-server/files/mozc_tool.in (contents, props changed) head/japanese/mozc-server/files/patch-base_compiler_specific.h (contents, props changed) head/japanese/mozc-server/files/patch-unix_ibus_selection_monitor.cc (contents, props changed) Deleted: head/japanese/mozc-additions/distinfo head/japanese/mozc-additions/pkg-plist head/japanese/mozc-server/files/patch-handwriting_zinnia_handwriting.cc Modified: head/japanese/fcitx-mozc/Makefile head/japanese/ibus-mozc/Makefile head/japanese/mozc-additions/Makefile head/japanese/mozc-additions/pkg-descr head/japanese/mozc-server/Makefile head/japanese/mozc-server/distinfo head/japanese/mozc-server/files/leim-list.el head/japanese/mozc-server/files/patch-base_logging.cc head/japanese/mozc-server/files/patch-build_mozc.py head/japanese/mozc-server/files/patch-gyp_common.gypi head/japanese/mozc-server/files/patch-unix_emacs_mozc.el head/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc head/japanese/mozc-tool/Makefile Modified: head/japanese/fcitx-mozc/Makefile ============================================================================== --- head/japanese/fcitx-mozc/Makefile Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/fcitx-mozc/Makefile Sat Jul 20 04:02:49 2013 (r323333) @@ -1,4 +1,4 @@ -# Created by: Daichi GOTO <daichi@freebsd.org> +# Created by: Daichi GOTO <daichi@FreeBSD.org> # $FreeBSD$ PKGNAMEPREFIX= ja-fcitx- @@ -9,8 +9,8 @@ DATADIR= ${PREFIX}/share/fcitx/${PORTNAM MASTERDIR= ${.CURDIR}/../../japanese/mozc-server PKGMESSAGE= ${.CURDIR}/pkg-message -BROKEN= fails to build - BUILD_MOZC_LIST= fcitx_mozc +IGNORE= not compatible with mozc 1.11.1502.102 + .include "${MASTERDIR}/Makefile" Modified: head/japanese/ibus-mozc/Makefile ============================================================================== --- head/japanese/ibus-mozc/Makefile Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/ibus-mozc/Makefile Sat Jul 20 04:02:49 2013 (r323333) @@ -1,4 +1,4 @@ -# Created by: Daichi GOTO <daichi@freebsd.org> +# Created by: Daichi GOTO <daichi@FreeBSD.org> # $FreeBSD$ PKGNAMEPREFIX= ja-ibus- Modified: head/japanese/mozc-additions/Makefile ============================================================================== --- head/japanese/mozc-additions/Makefile Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-additions/Makefile Sat Jul 20 04:02:49 2013 (r323333) @@ -1,28 +1,30 @@ -# New ports collection makefile for: mozc-additions -# Date created: 26 June 2010 -# Whom: Daichi GOTO <daichi@freebsd.org> -# +# Created by: Daichi GOTO <daichi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mozc-additions -PORTVERSION= 1.3.911.102 -PORTREVISION= 1 +PORTVERSION= 1.11.1502.102 CATEGORIES= japanese -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= daichi +MASTER_SITES= # empty PKGNAMEPREFIX?= ja- +DISTFILES= # empty -MAINTAINER= daichi@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Additional tools and images for Mozc Japanese Input Method NO_BUILD= yes -LOCALBASE_REPLACE_FILES= \ - Makefile +PLIST_FILES= bin/ibus-daemon_restart \ + bin/ibus-daemon_start \ + bin/ibus-daemon_stop \ + bin/mozc_server_restart \ + bin/mozc_server_start \ + bin/mozc_server_stop \ + bin/mozc_tool_character_palette \ + bin/mozc_tool_config \ + bin/mozc_tool_dictionary \ + bin/mozc_tool_hand_writing \ + bin/mozc_tool_word_register -post-patch: - cd ${WRKSRC} && \ - ${REINPLACE_CMD} "s/@@LOCALBASE@@/${LOCALBASE:S/\//\\\//g}/g" \ - ${LOCALBASE_REPLACE_FILES} +do-install: + ${INSTALL_SCRIPT} ${PLIST_FILES:S,bin/,${FILESDIR}/,} ${PREFIX}/bin .include <bsd.port.mk> Added: head/japanese/mozc-additions/files/ibus-daemon_restart ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/ibus-daemon_restart Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,39 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sat Jun 12 10:33:41 JST 2010 + +# ibus-daemon_restart + +# usage +# ibus-daemon_restart + +ibus-daemon_stop +ibus-daemon_start Added: head/japanese/mozc-additions/files/ibus-daemon_start ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/ibus-daemon_start Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,39 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sat Jun 26 11:07:59 JST 2010 + +# ibus-daemon_start + +# usage +# ibus-daemon_start + +mozc_server_restart +exec ibus-daemon -r --daemonize --xim Added: head/japanese/mozc-additions/files/ibus-daemon_stop ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/ibus-daemon_stop Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,38 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sat Jun 26 11:06:17 JST 2010 + +# ibus-daemon_stop + +# usage +# ibus-daemon_stop + +exec pkill -U $(id -u) ibus-daemon Added: head/japanese/mozc-additions/files/mozc_server_restart ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/mozc_server_restart Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,39 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sat May 29 19:38:14 JST 2010 + +# mozc_server_restart + +# usage +# mozc_server_restart + +mozc_server_stop +mozc_server_start Added: head/japanese/mozc-additions/files/mozc_server_start ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/mozc_server_start Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,42 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sat Jun 26 11:51:20 JST 2010 + +# mozc_server_start + +# usage +# mozc_server_start + +if [ -z "$(pgrep -U $(id -u) mozc_server)" ] +then + rm -f ${HOME}/.mozc/.session.ipc ${HOME}/.mozc/.server.lock + daemon mozc_server +fi Added: head/japanese/mozc-additions/files/mozc_server_stop ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/mozc_server_stop Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,39 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sat May 29 19:38:14 JST 2010 + +# mozc_server_stop + +# usage +# mozc_server_stop + +pkill -U $(id -u) mozc_server +rm -f ${HOME}/.mozc/.session.ipc ${HOME}/.mozc/.server.lock Added: head/japanese/mozc-additions/files/mozc_tool_character_palette ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/mozc_tool_character_palette Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,38 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2011 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sun Dec 4 21:17:02 JST 2011 + +# mozc_tool_character_palette + +# usage +# mozc_tool_character_palette + +exec mozc_tool --mode=character_palette Added: head/japanese/mozc-additions/files/mozc_tool_config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/mozc_tool_config Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,38 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sat Jun 26 11:51:32 JST 2010 + +# mozc_tool_config + +# usage +# mozc_tool_config + +exec mozc_tool --mode=config_dialog Added: head/japanese/mozc-additions/files/mozc_tool_dictionary ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/mozc_tool_dictionary Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,38 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2010 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sat Jun 26 11:51:47 JST 2010 + +# mozc_tool_dictionary + +# usage +# mozc_tool_dictionary + +exec mozc_tool --mode=dictionary_tool Added: head/japanese/mozc-additions/files/mozc_tool_hand_writing ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/mozc_tool_hand_writing Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,38 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2011 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sun Dec 4 21:18:20 JST 2011 + +# mozc_tool_hand_writing + +# usage +# mozc_tool_hand_writing + +exec mozc_tool --mode=hand_writing Added: head/japanese/mozc-additions/files/mozc_tool_word_register ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-additions/files/mozc_tool_word_register Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,38 @@ +#!/bin/sh +# $FreeBSD$ +# +# Copyright (c) 2011 Daichi GOTO <daichi@ongs.co.jp> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +# author: Daichi GOTO (daichi@ongs.co.jp) +# first edition: Sat May 29 19:37:53 JST 2010 +# last modified: Sun Dec 4 21:16:19 JST 2011 + +# mozc_tool_word_register + +# usage +# mozc_tool_word_register + +exec mozc_tool --mode=word_register_dialog Modified: head/japanese/mozc-additions/pkg-descr ============================================================================== --- head/japanese/mozc-additions/pkg-descr Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-additions/pkg-descr Sat Jul 20 04:02:49 2013 (r323333) @@ -1,3 +1 @@ Additional tools and images for Mozc Japanese Input Method. - -WWW: http://people.freebsd.org/~daichi/ Modified: head/japanese/mozc-server/Makefile ============================================================================== --- head/japanese/mozc-server/Makefile Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-server/Makefile Sat Jul 20 04:02:49 2013 (r323333) @@ -1,15 +1,14 @@ -# Created by: Daichi GOTO <daichi@freebsd.org> +# Created by: Daichi GOTO <daichi@FreeBSD.org> # $FreeBSD$ PORTNAME= mozc -PORTVERSION= 1.10.1390.102 -PORTREVISION= 5 +PORTVERSION= 1.11.1502.102 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= daichi@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT?= Mozc Japanese Input Method, Server LICENSE= BSD @@ -46,6 +45,7 @@ LICENSE_DISTFILES_NAISTL=${DISTNAME}${EX USE_GNOME= glib20 gtk20 USE_QT4= corelib gui qmake_build moc_build rcc_build uic_build .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" +USE_XORG= xcb USE_GNOME= glib20 gtk20 .elif ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el" USE_EMACS= yes @@ -63,7 +63,8 @@ BROKEN= Does not compile: segfault GYP_DEFINES= use_libprotobuf=1 \ channel_dev=0 \ - enable_unittest=0 + enable_unittest=0 \ + zinnia_model_file="${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model" BUILD_MODE= Release BUILD_CMD= ${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${GMAKE} BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \ @@ -129,7 +130,8 @@ DISTFILES+= \ EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha -PLIST_FILES+= bin/mozc_server +PLIST_FILES+= bin/mozc_server \ + bin/mozc_emacs_helper post-extract-mozc_server: @for F in jigyosyo-20130628.lzh ken_all-20130628.lzh; do \ @@ -144,10 +146,12 @@ post-extract: post-extract-mozc_server do-build-mozc_server: ${BUILD_MOZC_CMD_BUILD} server/server.gyp:mozc_server + ${BUILD_MOZC_CMD_BUILD} unix/emacs/emacs.gyp:mozc_emacs_helper do-install-mozc_server: ${INSTALL_PROGRAM} \ ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \ + ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \ ${PREFIX}/bin .endif @@ -158,18 +162,21 @@ GYP_DEFINES+= use_libibus=0 \ RUN_DEPENDS+= ${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model:${PORTSDIR}/japanese/tegaki-zinnia-japanese -PLIST_FILES+= bin/mozc_tool \ +PLIST_FILES+= libexec/mozc_tool \ + bin/mozc_tool \ %%DATADIR%%/icons/product_logo.png \ %%DATADIR%%/icons/update_uptodate.png PLIST_DIRS+= %%DATADIR%%/icons ${DATADIR_REL} +SUB_FILES+= mozc_tool do-build-mozc_tool: ${BUILD_MOZC_CMD_BUILD} gui/gui.gyp:mozc_tool do-install-mozc_tool: ${INSTALL_PROGRAM} \ - ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \ - ${PREFIX}/bin + ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \ + ${PREFIX}/libexec + ${INSTALL_SCRIPT} ${WRKDIR}/mozc_tool ${PREFIX}/bin @${MKDIR} ${DATADIR}/icons ${INSTALL_DATA} \ ${WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ @@ -181,7 +188,6 @@ do-install-mozc_tool: # ibus_mozc .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" -USE_XORG= xcb GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=1 \ enable_gtk_renderer=1 @@ -235,7 +241,7 @@ do-install-ibus_mozc: .endif # fcitx_mozc -.if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" || make(makesum) +.if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" # || make(makesum) PATCH_SITES= http://fcitx.googlecode.com/files/ PATCHFILES= fcitx-${DISTNAME}.2.patch .endif @@ -305,38 +311,25 @@ do-install-fcitx_mozc: # mozc_el .if ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el" -GYP_OPTIONS+= --noqt -GYP_DEFINES+= use_libibus=0 \ - enable_gtk_renderer=0 - CATEGORIES+= elisp RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \ mozc_server_start:${PORTSDIR}/japanese/mozc-additions -PLIST_FILES+= bin/mozc_emacs_helper \ - ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el \ +PLIST_FILES+= ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el \ ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.elc \ ${EMACS_VERSION_SITE_LISPDIR}/mozc/leim-list.el PLIST_DIRS+= ${EMACS_VERSION_SITE_LISPDIR}/mozc do-build-mozc_el: - ${BUILD_MOZC_CMD_BUILD} unix/emacs/emacs.gyp:mozc_emacs_helper cd ${WRKSRC}/unix/emacs && \ ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ -f batch-byte-compile mozc.el do-install-mozc_el: - ${INSTALL_PROGRAM} \ - ${WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \ - ${PREFIX}/bin/ @${MKDIR} ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc ${INSTALL_DATA} \ ${WRKSRC}/unix/emacs/mozc.el \ - ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/ - ${INSTALL_DATA} \ ${WRKSRC}/unix/emacs/mozc.elc \ - ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/ - ${INSTALL_DATA} \ ${FILESDIR}/leim-list.el \ ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/ .endif Modified: head/japanese/mozc-server/distinfo ============================================================================== --- head/japanese/mozc-server/distinfo Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-server/distinfo Sat Jul 20 04:02:49 2013 (r323333) @@ -1,8 +1,6 @@ -SHA256 (mozc-1.10.1390.102.tar.bz2) = 72a8ed6657daa1c03b1efe50c262a69be2ab66d45747a47df6e54996b6d5ee39 -SIZE (mozc-1.10.1390.102.tar.bz2) = 57879881 +SHA256 (mozc-1.11.1502.102.tar.bz2) = c74eb3f1096b0c1144868f6807fdf113412bd4cb23a297974ee22bd7a5f2dfe9 +SIZE (mozc-1.11.1502.102.tar.bz2) = 58777653 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-1.10.1390.102.2.patch) = 8702225049052ace5c4fa60998606cc7e08bc86966054f6f61b293277cffdcea -SIZE (fcitx-mozc-1.10.1390.102.2.patch) = 130658 Modified: head/japanese/mozc-server/files/leim-list.el ============================================================================== --- head/japanese/mozc-server/files/leim-list.el Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-server/files/leim-list.el Sat Jul 20 04:02:49 2013 (r323333) @@ -24,7 +24,6 @@ This indicator is not shown when you don :group 'mozc) (register-input-method - "japanese-mozc" "Japanese" 'mozc-leim-activate + "japanese-mozc" "Japanese" #'mozc-leim-activate mozc-leim-title - "Japanese input method with Mozc/Google Japanese Input." - 'its-select-hiragana) + "Japanese input method with Mozc/Google Japanese Input.") Added: head/japanese/mozc-server/files/mozc_tool.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-server/files/mozc_tool.in Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,20 @@ +#!/bin/sh +# $FreeBSD$ + +case $# in +0) + echo "Specify one of the following keyword in --mode= option:" + cat <<EOT + config_dialog + dictionary_tool + word_register_dialog + about_dialog + character_palette + hand_writing +EOT + exit 1 +;; +*) + exec %%PREFIX%%/libexec/mozc_tool "$@" +;; +esac Added: head/japanese/mozc-server/files/patch-base_compiler_specific.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-server/files/patch-base_compiler_specific.h Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,13 @@ +--- base/compiler_specific.h.orig 2013-07-17 11:38:04.000000000 +0900 ++++ base/compiler_specific.h 2013-07-20 00:41:09.000000000 +0900 +@@ -236,4 +236,10 @@ + #endif // _MSC_VER or !_MSC_VER + // === End suppress warning C4355 macro definitions === + ++#if 0 ++#define static_assert(a,b) { char _dum[(a) ? 1 : 0]; } ++#endif ++#define static_assert(a,b) ++#define unique_ptr auto_ptr ++ + #endif // MOZC_BASE_COMPILER_SPECIFIC_H Modified: head/japanese/mozc-server/files/patch-base_logging.cc ============================================================================== --- head/japanese/mozc-server/files/patch-base_logging.cc Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-server/files/patch-base_logging.cc Sat Jul 20 04:02:49 2013 (r323333) @@ -1,11 +1,11 @@ ---- base/logging.cc.orig 2013-04-26 10:49:33.000000000 +0900 -+++ base/logging.cc 2013-04-26 10:53:18.000000000 +0900 +--- base/logging.cc.orig 2013-07-17 11:38:04.000000000 +0900 ++++ base/logging.cc 2013-07-19 22:24:20.000000000 +0900 @@ -111,7 +111,7 @@ #if defined(__native_client__) "%p", #elif defined(OS_LINUX) - "%lu", + "%p", - #else // = OS_WIN or OS_MACOSX - "%u", - #endif + #elif defined(OS_MACOSX) && defined(__LP64__) + "%llu", + #else // OS_WIN or OS_MACOSX(32bit) Modified: head/japanese/mozc-server/files/patch-build_mozc.py ============================================================================== --- head/japanese/mozc-server/files/patch-build_mozc.py Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-server/files/patch-build_mozc.py Sat Jul 20 04:02:49 2013 (r323333) @@ -1,6 +1,6 @@ ---- build_mozc.py.orig 2013-03-29 13:33:25.000000000 +0900 -+++ build_mozc.py 2013-05-02 00:54:37.000000000 +0900 -@@ -332,6 +332,14 @@ +--- build_mozc.py.orig 2013-07-17 11:37:50.000000000 +0900 ++++ build_mozc.py 2013-07-19 22:27:55.000000000 +0900 +@@ -332,6 +332,13 @@ help='use rsync to copy files instead of builtin function') AddTargetPlatformOption(parser) @@ -11,11 +11,10 @@ + parser.add_option('--openssl_ldflags', dest='openssl_ldflags') + parser.add_option('--openssl_lib', dest='openssl_lib') + parser.add_option('--openssl_inc', dest='openssl_inc') -+ - parser.add_option('--mac_dir', dest='mac_dir', - help='A path to the root directory of third party ' - 'libraries for Mac build which will be passed to gyp ' -@@ -506,7 +514,7 @@ + + # Mac and Linux + warn_as_error_default = False +@@ -518,7 +525,7 @@ parser = optparse.OptionParser(usage='Usage: %prog build [options]') AddCommonOptions(parser) if IsLinux(): @@ -24,13 +23,23 @@ parser.add_option('--jobs', '-j', dest='jobs', default=('%d' % default_build_concurrency), metavar='N', help='run build jobs in parallel') -@@ -709,7 +717,22 @@ - command_line.extend(['-D', 'enable_unittest=0']) - break +@@ -566,9 +573,6 @@ + + return parser.parse_args(args, values) + +- +- +- + def AddPythonPathToEnvironmentFilesForWindows(out_dir): + """Add PYTHONPATH to environment files for Ninja.""" + mozc_root = os.path.abspath(GetTopLevelSourceDirectoryName()) +@@ -746,6 +750,22 @@ + else: + command_line.extend(['-D', 'warn_as_error=0']) + localbase = options.localbase or '/usr' + command_line.extend(['-D', 'localbase=%s' % localbase]) - ++ + ldflags = options.ldflags or '' + command_line.extend(['-D', 'ldflags=%s' % ldflags]) + include_dirs = options.include_dirs or '' @@ -45,5 +54,5 @@ + openssl_lib = options.openssl_lib or '' + command_line.extend(['-D', 'openssl_lib=%s' % openssl_lib]) - mac_dir = options.mac_dir or '../mac' - if not os.path.isabs(mac_dir): + # mac_dir should be started with '<(DEPTH)', otherwise some + # operations in XCode fails. So if the mac_dir option is an Modified: head/japanese/mozc-server/files/patch-gyp_common.gypi ============================================================================== --- head/japanese/mozc-server/files/patch-gyp_common.gypi Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-server/files/patch-gyp_common.gypi Sat Jul 20 04:02:49 2013 (r323333) @@ -1,16 +1,15 @@ ---- gyp/common.gypi.orig 2013-03-29 13:33:42.000000000 +0900 -+++ gyp/common.gypi 2013-04-28 17:38:16.000000000 +0900 -@@ -723,7 +723,9 @@ +--- gyp/common.gypi.orig 2013-07-17 11:38:04.000000000 +0900 ++++ gyp/common.gypi 2013-07-19 22:51:13.000000000 +0900 +@@ -749,6 +749,8 @@ ['OS=="linux"', { 'defines': [ 'OS_LINUX', + 'OS_FREEBSD', - 'MOZC_SERVER_DIRECTORY="<@(server_dir)"', + 'LOCALBASE="<@(localbase)"', ], 'cflags': [ '<@(warning_cflags)', -@@ -735,6 +737,13 @@ +@@ -760,6 +762,13 @@ # <unordered_map> and <unordered_set>. '-Wno-deprecated', ], @@ -24,3 +23,16 @@ 'conditions': [ ['target_platform=="ChromeOS"', { 'defines': [ +@@ -774,12 +783,10 @@ + '-Wno-covered-switch-default', + '-Wno-unnamed-type-template-args', + '-Wno-c++11-narrowing', +- '-std=gnu++0x', + ], + }], + ['clang==0 and target_platform!="Windows"', { + 'cflags_cc': [ +- '-std=gnu++0x', + ], + 'defines': [ + 'GTEST_LANG_CXX11=0', Modified: head/japanese/mozc-server/files/patch-unix_emacs_mozc.el ============================================================================== --- head/japanese/mozc-server/files/patch-unix_emacs_mozc.el Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-server/files/patch-unix_emacs_mozc.el Sat Jul 20 04:02:49 2013 (r323333) @@ -1,25 +1,7 @@ ---- unix/emacs/mozc.el.orig 2013-03-29 13:33:43.000000000 +0900 -+++ unix/emacs/mozc.el 2013-05-05 17:27:24.000000000 +0900 -@@ -1755,29 +1755,36 @@ - - (require 'mule) - --(defun mozc-leim-activate (input-method) -+(defun mozc-leim-activate (&rest input-method) - "Activate mozc-mode via LEIM. - INPUT-METHOD is not used." -- (setq inactivate-current-input-method-function 'mozc-leim-inactivate) -+ (set -+ (if (boundp 'deactivate-current-input-method-function) -+ 'deactivate-current-input-method-function -+ 'inactivate-current-input-method-function) -+ 'mozc-leim-deactivate) - (mozc-mode t)) - --(defun mozc-leim-inactivate () -- "Inactivate mozc-mode via LEIM." -+(defun mozc-leim-deactivate () -+ "Deactivate mozc-mode via LEIM." +--- unix/emacs/mozc.el.orig 2013-07-17 11:37:50.000000000 +0900 ++++ unix/emacs/mozc.el 2013-07-19 22:36:17.000000000 +0900 +@@ -1834,19 +1834,20 @@ + "Deactivate mozc-mode via LEIM." (mozc-mode nil)) -(defcustom mozc-leim-title "[Mozc]" @@ -28,27 +10,25 @@ - :type '(choice (const :tag "No indicator" nil) - (string :tag "Show an indicator")) - :group 'mozc) -+;; Defined in leim-list.el ++;; defined in leim-list.el ++;; (defcustom mozc-leim-title "[Mozc]" ++;; "Mode line string shown when mozc-mode is enabled. ++;; This indicator is not shown when you don't use LEIM." ++;; :type '(choice (const :tag "No indicator" nil) ++;; (string :tag "Show an indicator")) ++;; :group 'mozc) -(register-input-method - "japanese-mozc" - "Japanese" -- 'mozc-leim-activate +- #'mozc-leim-activate - mozc-leim-title - "Japanese input method with Mozc/Google Japanese Input.") -+;; (defcustom mozc-leim-title "[Mozc]" -+;; "Mode line string shown when mozc-mode is enabled. -+;; This indicator is not shown when you don't use LEIM." -+;; :type '(choice (const :tag "No indicator" nil) -+;; (string :tag "Show an indicator")) -+;; :group 'mozc) -+ -+;; +;; (register-input-method -+;; "japanese-mozc" -+;; "Japanese" -+;; 'mozc-leim-activate -+;; mozc-leim-title ++;; "japanese-mozc" ++;; "Japanese" ++;; #'mozc-leim-activate ++;; mozc-leim-title +;; "Japanese input method with Mozc/Google Japanese Input.") Modified: head/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc ============================================================================== --- head/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc Sat Jul 20 03:58:42 2013 (r323332) +++ head/japanese/mozc-server/files/patch-unix_ibus_mozc_engine.cc Sat Jul 20 04:02:49 2013 (r323333) @@ -1,11 +1,11 @@ ---- unix/ibus/mozc_engine.cc.orig 2013-04-21 03:48:44.433270458 +0900 -+++ unix/ibus/mozc_engine.cc 2013-04-21 04:12:50.609270610 +0900 -@@ -758,7 +758,7 @@ - // on size_t, not uint32. - string selection_text; - const uint32 selection_start = min(cursor_pos, anchor_pos); -- const uint32 selection_length = abs(relative_selected_length); -+ const uint32 selection_length = ::abs(relative_selected_length); - Util::SubString(surrounding_text, - selection_start, - selection_length, +--- unix/ibus/mozc_engine.cc.orig 2013-07-17 11:37:50.000000000 +0900 ++++ unix/ibus/mozc_engine.cc 2013-07-19 22:37:55.000000000 +0900 +@@ -265,7 +265,7 @@ + } + + const uint32 selection_start = min(cursor_pos, anchor_pos); +- const uint32 selection_length = abs(info->relative_selected_length); ++ const uint32 selection_length = ::abs(info->relative_selected_length); + info->preceding_text = surrounding_text.substr(0, selection_start); + Util::SubString(surrounding_text, + selection_start, Added: head/japanese/mozc-server/files/patch-unix_ibus_selection_monitor.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/mozc-server/files/patch-unix_ibus_selection_monitor.cc Sat Jul 20 04:02:49 2013 (r323333) @@ -0,0 +1,101 @@ +--- unix/ibus/selection_monitor.cc.orig 2013-07-20 00:29:25.000000000 +0900 ++++ unix/ibus/selection_monitor.cc 2013-07-20 00:37:48.000000000 +0900 +@@ -38,6 +38,7 @@ + + #include "base/logging.h" + #include "base/mutex.h" ++#include "base/scoped_ptr.h" + #include "base/thread.h" + #include "base/port.h" + #include "base/util.h" +@@ -47,8 +48,6 @@ + + namespace { + +-using std::unique_ptr; +- + class ScopedXcbGenericError { + public: + ScopedXcbGenericError() +@@ -69,27 +68,6 @@ + xcb_generic_error_t *error_; + }; + +-template <typename T> +-struct FreeDeleter { +- void operator()(T *ptr) const { +- free(ptr); +- } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307200402.r6K42nBc086613>