diff options
Diffstat (limited to 'inputmethod')
16 files changed, 88 insertions, 148 deletions
diff --git a/inputmethod/ibus-mozc/Makefile b/inputmethod/ibus-mozc/Makefile index 2d4d6827ca0..d1f865177e9 100644 --- a/inputmethod/ibus-mozc/Makefile +++ b/inputmethod/ibus-mozc/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2014/05/18 07:42:24 obache Exp $ +# $NetBSD: Makefile,v 1.19 2014/06/15 13:08:34 ryoon Exp $ PKGNAME= ibus-${DISTNAME} -PKGREVISION= 3 INSTALLATION_DIRS+= libexec share/ibus share/ibus/component \ share/ibus-mozc diff --git a/inputmethod/mozc-renderer/Makefile b/inputmethod/mozc-renderer/Makefile index 54edc1b6904..a771732809e 100644 --- a/inputmethod/mozc-renderer/Makefile +++ b/inputmethod/mozc-renderer/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2014/02/12 23:18:04 tron Exp $ +# $NetBSD: Makefile,v 1.3 2014/06/15 13:08:34 ryoon Exp $ PKGNAME= ${DISTNAME:S/mozc-/mozc-renderer-/} -PKGREVISION= 1 CONFLICTS+= ibus-mozc<=1.13.1651.102 diff --git a/inputmethod/mozc-server/Makefile b/inputmethod/mozc-server/Makefile index 54fc612966d..c72764d8a8f 100644 --- a/inputmethod/mozc-server/Makefile +++ b/inputmethod/mozc-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2014/06/09 14:18:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.19 2014/06/15 13:08:34 ryoon Exp $ PKGNAME= ${DISTNAME:S/mozc-/mozc-server-/} -PKGREVISION= 4 INSTALLATION_DIRS+= libexec diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common index 3eb70769c89..af43fbef1da 100644 --- a/inputmethod/mozc-server/Makefile.common +++ b/inputmethod/mozc-server/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2014/05/09 07:37:09 wiz Exp $ +# $NetBSD: Makefile.common,v 1.10 2014/06/15 13:08:34 ryoon Exp $ # used by inputmethod/ibus-mozc/Makefile # used by inputmethod/mozc-elisp/Makefile # used by inputmethod/mozc-server/Makefile @@ -7,10 +7,11 @@ # used by inputmethod/uim-mozc/Makefile # -DISTNAME= mozc-1.13.1651.102 +DISTNAME= mozc-1.15.1785.102 CATEGORIES= inputmethod -MASTER_SITES= http://mozc.googlecode.com/files/ -EXTRACT_SUFX= .tar.bz2 +#MASTER_SITES= http://mozc.googlecode.com/files/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pnsft-aur/} +EXTRACT_SUFX= .tar.xz MAINTAINER= ryoon@NetBSD.org HOMEPAGE= http://code.google.com/p/mozc/ @@ -22,7 +23,7 @@ PATCHDIR= ${.CURDIR}/../../inputmethod/mozc-server/patches BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-gyp +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gyp USE_LANGUAGES= c c++ # nullptr requires -std=c++11, and -std=c++11 requires gcc 4.7 or later @@ -47,6 +48,7 @@ SUBST_FILES.gyp+= base/process.cc SUBST_FILES.gyp+= base/system_util.cc SUBST_FILES.gyp+= handwriting/zinnia_handwriting.cc SUBST_FILES.gyp+= unix/ibus/gen_mozc_xml.py +SUBST_FILES.gyp+= unix/ibus/ibus.gyp SUBST_FILES.gyp+= gyp/common.gypi SUBST_VARS.gyp+= OPENSSL_CFLAGS OPENSSL_INC OPENSSL_LDFLAGS OPENSSL_LIBS SUBST_VARS.gyp+= PREFIX QTDIR diff --git a/inputmethod/mozc-server/distinfo b/inputmethod/mozc-server/distinfo index b544455e163..e0230a3b1bb 100644 --- a/inputmethod/mozc-server/distinfo +++ b/inputmethod/mozc-server/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.7 2014/05/18 07:42:24 obache Exp $ +$NetBSD: distinfo,v 1.8 2014/06/15 13:08:34 ryoon Exp $ -SHA1 (mozc-1.13.1651.102.tar.bz2) = 24680b3d350e5332f2235b9c1342127f6ef0fd63 -RMD160 (mozc-1.13.1651.102.tar.bz2) = 260a23c2f9f3b909aefe63c865f3b87013d2fb53 -Size (mozc-1.13.1651.102.tar.bz2) = 31635636 bytes -SHA1 (uim-mozc-331.tar.xz) = 760d1deb5964358d1dc064e44d45eec38d94d9ec -RMD160 (uim-mozc-331.tar.xz) = db4df92b8adc0e6202cf7f61c326b1503e157d9b -Size (uim-mozc-331.tar.xz) = 30580 bytes -SHA1 (patch-base_base.gyp) = 329bd8614282aca28fcba30b2e593f488801118d +SHA1 (mozc-1.15.1785.102.tar.xz) = e3114c30007c9c1d6c449a015091b67a3f1f77ae +RMD160 (mozc-1.15.1785.102.tar.xz) = 972f26eaa824efe4a5a18106cae2acb68b28f869 +Size (mozc-1.15.1785.102.tar.xz) = 35417096 bytes +SHA1 (uim-mozc-334.tar.xz) = af86ce7a04b291629bd5dc56d5c1115332954a91 +RMD160 (uim-mozc-334.tar.xz) = b988667237f65e61fabf3935f83f5d21a8059f4e +Size (uim-mozc-334.tar.xz) = 30544 bytes +SHA1 (patch-base_base.gyp) = a54c372450cf2e64d1318ae434d1bfd79cc142d0 SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191 -SHA1 (patch-base_crash__report__handler.cc) = 28e581ffef8a108aff372c79b3578686472cb464 SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b SHA1 (patch-base_logging.cc) = 96ee9d1426ef1cf946a00fb15c9754603ab15bb8 SHA1 (patch-base_mutex.cc) = aed8588d4ff7b057fed072097ef09ddbc2696d31 @@ -28,11 +27,11 @@ SHA1 (patch-gui_base_locale__util.cc) = 7d1e9cf3c2c36590298496471a97b8c32010a30b SHA1 (patch-gui_config__dialog_config__dialog.cc) = aae18b7ea36fd5ff5758625875a04634ffdfd68a SHA1 (patch-gui_config__dialog_keybinding__editor.cc) = 00a6e4bb2c07e3340e188f108f0285a3aa2aceb9 SHA1 (patch-gui_config__dialog_keymap__editor.cc) = a78a4fb5c484e672b0cfecf38c6713cf74007cb5 -SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 0ce41d4522c837836bad345cf82cb4741e7af4d0 +SHA1 (patch-gui_dictionary__tool_dictionary__tool.cc) = 3652713857d03f847108952f2994ee44bfe62608 SHA1 (patch-gui_gui.gyp) = 70b6d78ca5a482b9e8fa697dbb191cccbdde1c6a -SHA1 (patch-gui_qt__libraries.gypi) = 2b00307c22380d0d1c60b5d98ce08970b0e74f09 +SHA1 (patch-gui_qt__libraries.gypi) = e92be78947dcf66211c80169b864b7c9d057b3db SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 34a7cd2a99a0082f490c3f623c7c6a856c984f8b -SHA1 (patch-gyp_common.gypi) = 69095a357de9d871c93fc8effda95568068bedab +SHA1 (patch-gyp_common.gypi) = 4859bc46c17088f29f0addd75a0af6b4f5fc3525 SHA1 (patch-handwriting_handwriting.gyp) = 0261aef287b34f4a3c8424fb1af44720ae00a85c SHA1 (patch-handwriting_zinnia.gyp) = d09ac17d17dabdbfdcb7c623193a5c72dbcacfbc SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2 @@ -42,9 +41,11 @@ SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32 SHA1 (patch-ipc_unix__ipc.cc) = d821deb2f38bf77bf6b364eb31d419c0a86c1a7f SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea SHA1 (patch-protobuf_genproto.gypi) = 601165a376bcd05983f87733285737ee043c13fe -SHA1 (patch-protobuf_protobuf.gyp) = 60abe727c1475e50295a5e811dccf8deb710e18a +SHA1 (patch-protobuf_protobuf.gyp) = c1b08a30b8f9b2ca0d7cac180891cf3d9bc257f3 SHA1 (patch-session_session.cc) = 0562f8646dc6f68e180d8ae98f00eeb0364fc473 SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465 SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95 -SHA1 (patch-unix_ibus_gen__mozc__xml.py) = a6e135a698cc04231b64808f0b2ed64191b4a5bb +SHA1 (patch-third__party_protobuf_post__process__dist.sh) = c54363572de0afc2c49b4ed06bc0eb329e4ad237 +SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 566d567ae4f911766309e035697a23350f24bbf5 +SHA1 (patch-unix_ibus_ibus.gyp) = 2fc9309216270846f7ce33d1854d9d76e65e6e96 SHA1 (patch-unix_ibus_mozc__engine.cc) = 2ce0a680a0fad1abdc646737b6b5a4c3a9e87e6e diff --git a/inputmethod/mozc-server/patches/patch-base_base.gyp b/inputmethod/mozc-server/patches/patch-base_base.gyp index 2844d9233c6..55bcba80265 100644 --- a/inputmethod/mozc-server/patches/patch-base_base.gyp +++ b/inputmethod/mozc-server/patches/patch-base_base.gyp @@ -1,8 +1,8 @@ -$NetBSD: patch-base_base.gyp,v 1.2 2013/07/20 04:34:53 ryoon Exp $ +$NetBSD: patch-base_base.gyp,v 1.3 2014/06/15 13:08:34 ryoon Exp $ ---- base/base.gyp.orig 2013-07-17 02:38:04.000000000 +0000 +--- base/base.gyp.orig 2014-05-21 10:51:31.000000000 +0000 +++ base/base.gyp -@@ -86,7 +86,7 @@ +@@ -78,7 +78,7 @@ # shared among *host* binaries and *target* binaries. This means that # you should implement *host* binaries by using limited libraries # which are also available on NDK. @@ -11,12 +11,12 @@ $NetBSD: patch-base_base.gyp,v 1.2 2013/07/20 04:34:53 ryoon Exp $ 'not (target_platform=="NaCl" and _toolset=="target")', { 'defines': [ 'HAVE_LIBRT=1', -@@ -287,23 +287,23 @@ - ], +@@ -274,23 +274,23 @@ }, }], -- ['OS=="linux" and target_platform!="Android" and ' -+ ['OS=="netbsd" or (OS=="linux" and target_platform!="Android") and ' + ['use_legacy_encryptor==1 and ' +- 'OS=="linux" and target_platform!="Android" and ' ++ 'OS=="netbsd" or (OS=="linux" and target_platform!="Android") and ' 'not (target_platform=="NaCl" and _toolset=="target")', { 'cflags': [ - '<!@(<(pkg_config_command) --cflags-only-other openssl)', diff --git a/inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc b/inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc deleted file mode 100644 index b21bd59b436..00000000000 --- a/inputmethod/mozc-server/patches/patch-base_crash__report__handler.cc +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-base_crash__report__handler.cc,v 1.3 2014/01/19 01:18:50 ryoon Exp $ - ---- base/crash_report_handler.cc.orig 2014-01-06 07:10:31.000000000 +0000 -+++ base/crash_report_handler.cc -@@ -346,7 +346,7 @@ void CrashReportHandler::SetCriticalSect - - } // namespace mozc - --#else -+#elif defined(OS_LINUX) || defined(OS_NETBSD) // OS_WIN - - namespace mozc { - -@@ -372,4 +372,4 @@ void CrashReportHandler::SetCriticalSect - - } // namespace mozc - --#endif -+#endif // OS_WIN OS_LINUX OS_NETBSD diff --git a/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc b/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc index b6b75368250..71dbc15a1e9 100644 --- a/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc +++ b/inputmethod/mozc-server/patches/patch-gui_dictionary__tool_dictionary__tool.cc @@ -1,22 +1,8 @@ -$NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.4 2014/01/19 01:18:50 ryoon Exp $ +$NetBSD: patch-gui_dictionary__tool_dictionary__tool.cc,v 1.5 2014/06/15 13:08:34 ryoon Exp $ ---- gui/dictionary_tool/dictionary_tool.cc.orig 2014-01-06 07:10:48.000000000 +0000 +--- gui/dictionary_tool/dictionary_tool.cc.orig 2014-05-21 10:51:22.000000000 +0000 +++ gui/dictionary_tool/dictionary_tool.cc -@@ -194,11 +194,11 @@ class MultiByteTextLineIterator - } - - bool IsAvailable() const { -- return *(ifs_.get()); -+ return (ifs_.get())->good() || (ifs_.get())->eof(); - } - - bool Next(string *line) { -- if (!*(ifs_.get())) { -+ if (!IsAvailable()) { - return false; - } - -@@ -341,7 +341,7 @@ DictionaryTool::DictionaryTool(QWidget * +@@ -347,7 +347,7 @@ DictionaryTool::DictionaryTool(QWidget * #endif // !ENABLE_CLOUD_SYNC // main window diff --git a/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi b/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi index d570118eb2d..dcae6ac363d 100644 --- a/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi +++ b/inputmethod/mozc-server/patches/patch-gui_qt__libraries.gypi @@ -1,6 +1,6 @@ -$NetBSD: patch-gui_qt__libraries.gypi,v 1.2 2013/09/07 18:42:14 ryoon Exp $ +$NetBSD: patch-gui_qt__libraries.gypi,v 1.3 2014/06/15 13:08:34 ryoon Exp $ ---- gui/qt_libraries.gypi.orig 2013-08-28 05:26:12.000000000 +0000 +--- gui/qt_libraries.gypi.orig 2014-05-21 10:51:21.000000000 +0000 +++ gui/qt_libraries.gypi @@ -84,7 +84,7 @@ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', @@ -11,12 +11,3 @@ $NetBSD: patch-gui_qt__libraries.gypi,v 1.2 2013/09/07 18:42:14 ryoon Exp $ 'conditions': [ ['qt_dir', { 'libraries': [ -@@ -112,7 +112,7 @@ - # Workarounds related with clang. - ['clang==1', { - 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="netbsd"', { - 'cflags': [ - # Temporal workaround against following false warning in Clang. - # http://lists.cs.uiuc.edu/pipermail/cfe-dev/2012-June/022477.html diff --git a/inputmethod/mozc-server/patches/patch-gyp_common.gypi b/inputmethod/mozc-server/patches/patch-gyp_common.gypi index 3bdf6a80e34..98f8bdd47cd 100644 --- a/inputmethod/mozc-server/patches/patch-gyp_common.gypi +++ b/inputmethod/mozc-server/patches/patch-gyp_common.gypi @@ -1,25 +1,17 @@ -$NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ +$NetBSD: patch-gyp_common.gypi,v 1.5 2014/06/15 13:08:34 ryoon Exp $ ---- gyp/common.gypi.orig 2014-01-06 07:10:31.000000000 +0000 +--- gyp/common.gypi.orig 2014-05-21 10:51:27.000000000 +0000 +++ gyp/common.gypi -@@ -92,6 +92,7 @@ - '-include base/namespace.h', - '-pipe', - '-pthread', -+ '-std=c++0x', - ], - # linux_cflags will be used in Linux except for NaCl. - 'linux_cflags': [ -@@ -137,7 +138,7 @@ - 'clang_bin_dir': '/Applications/Xcode.app/Contents/Developer/Toolchains' - '/XcodeDefault.xctoolchain/usr/bin/', +@@ -165,7 +165,7 @@ + 'compiler_host': 'gcc', + 'compiler_host_version_int': 406, # GCC 4.6 or higher }], - ['target_platform=="Linux"', { + ['target_platform=="Linux" or target_platform=="NetBSD"', { # enable_gtk_renderer represents if mozc_renderer is supported on Linux # or not. - 'enable_gtk_renderer%': 1, -@@ -195,7 +196,7 @@ + 'compiler_target': 'gcc', +@@ -217,7 +217,7 @@ # server_dir represents the directory where mozc_server is # installed. This option is only for Linux. @@ -28,7 +20,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ # Represents the directory where the source code of protobuf is # extracted. This value is ignored when 'use_libprotobuf' is 1. -@@ -286,7 +287,7 @@ +@@ -311,7 +311,7 @@ ['channel_dev==1', { 'defines': ['CHANNEL_DEV'], }], @@ -37,7 +29,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ 'ldflags': [ '<@(linux_ldflags)', ], -@@ -451,7 +452,7 @@ +@@ -505,7 +505,7 @@ }, }, 'conditions': [ @@ -46,7 +38,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ 'cflags': [ '<@(debug_extra_cflags)', ], -@@ -489,7 +490,7 @@ +@@ -552,7 +552,7 @@ }, }, 'conditions': [ @@ -55,7 +47,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ 'cflags': [ '<@(release_extra_cflags)', ], -@@ -753,6 +754,22 @@ +@@ -808,6 +808,22 @@ }], ], }], diff --git a/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp b/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp index 9470ea409cd..40c79dbfde4 100644 --- a/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp +++ b/inputmethod/mozc-server/patches/patch-protobuf_protobuf.gyp @@ -1,17 +1,8 @@ -$NetBSD: patch-protobuf_protobuf.gyp,v 1.3 2014/01/19 01:18:50 ryoon Exp $ +$NetBSD: patch-protobuf_protobuf.gyp,v 1.4 2014/06/15 13:08:34 ryoon Exp $ ---- protobuf/protobuf.gyp.orig 2014-01-06 07:10:31.000000000 +0000 +--- protobuf/protobuf.gyp.orig 2014-05-21 10:49:57.000000000 +0000 +++ protobuf/protobuf.gyp -@@ -161,7 +161,7 @@ - ], - 'conditions': [ - # for gcc and clang -- ['OS=="linux" or OS=="mac"', { -+ ['OS=="linux" or OS=="mac" or OS=="netbsd"', { - 'cflags': [ - '-Wno-conversion-null', # coded_stream.cc uses NULL to bool. - '-Wno-unused-function', -@@ -201,7 +201,7 @@ +@@ -211,7 +211,7 @@ '<(protobuf_root)/src', ], 'conditions': [ @@ -20,7 +11,7 @@ $NetBSD: patch-protobuf_protobuf.gyp,v 1.3 2014/01/19 01:18:50 ryoon Exp $ 'conditions': [ ['use_libprotobuf!=1', { 'cflags': [ -@@ -237,7 +237,7 @@ +@@ -247,7 +247,7 @@ }, 'conditions': [ # use system-installed protoc on Linux diff --git a/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh b/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh new file mode 100644 index 00000000000..65475a90882 --- /dev/null +++ b/inputmethod/mozc-server/patches/patch-third__party_protobuf_post__process__dist.sh @@ -0,0 +1,13 @@ +$NetBSD: patch-third__party_protobuf_post__process__dist.sh,v 1.1 2014/06/15 13:08:34 ryoon Exp $ + +--- third_party/protobuf/post_process_dist.sh.orig 2014-05-21 10:51:38.000000000 +0000 ++++ third_party/protobuf/post_process_dist.sh +@@ -15,7 +15,7 @@ + # non-testdata .txt files are converted to Windows-style line endings. + # 5) Cleans up after itself. + +-if [ "$1" == "" ]; then ++if [ "$1" = "" ]; then + echo "USAGE: $1 DISTFILE" >&2 + exit 1 + fi diff --git a/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py b/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py index 48d0eb356dd..bb8f41cccc4 100644 --- a/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py +++ b/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py @@ -1,36 +1,9 @@ -$NetBSD: patch-unix_ibus_gen__mozc__xml.py,v 1.5 2014/05/18 07:42:24 obache Exp $ +$NetBSD: patch-unix_ibus_gen__mozc__xml.py,v 1.6 2014/06/15 13:08:34 ryoon Exp $ * Fix for pkgsrc installation. ---- unix/ibus/gen_mozc_xml.py.orig 2014-01-06 07:10:26.000000000 +0000 +--- unix/ibus/gen_mozc_xml.py.orig 2014-05-21 10:49:56.000000000 +0000 +++ unix/ibus/gen_mozc_xml.py -@@ -47,7 +47,7 @@ import sys - IBUS_COMPONENT_PROPS = { - 'name': 'com.google.IBus.Mozc', - 'description': '%(product_name)s Component', -- 'exec': '%(ibus_mozc_path)s --ibus', -+ 'exec': '@PREFIX@/libexec/ibus-engine-mozc --ibus', - # TODO(mazda): Generate the version number. - 'version': '0.0.0.0', - 'author': 'Google Inc.', -@@ -60,7 +60,7 @@ IBUS_COMPONENT_PROPS = { - IBUS_ENGINE_COMMON_PROPS = { - 'description': '%(product_name)s (Japanese Input Method)', - 'language': 'ja', -- 'icon': '%(ibus_mozc_icon_path)s', -+ 'icon': '@PREFIX@/share/ibus-mozc/product_icon.png', - 'rank': '80', - } - -@@ -68,7 +68,7 @@ IBUS_ENGINE_COMMON_PROPS = { - IBUS_1_5_ENGINE_COMMON_PROPS = { - 'description': '%(product_name)s (Japanese Input Method)', - 'language': 'ja', -- 'icon': '%(ibus_mozc_icon_path)s', -+ 'icon': '@PREFIX@/share/ibus-mozc/product_icon.png', - 'rank': '80', - 'symbol': 'あ', - } @@ -93,6 +93,22 @@ IBUS_ENGINES_PROPS = { 'longname': ['%(product_name)s'], 'layout': ['default'], diff --git a/inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp b/inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp new file mode 100644 index 00000000000..575a8b45094 --- /dev/null +++ b/inputmethod/mozc-server/patches/patch-unix_ibus_ibus.gyp @@ -0,0 +1,15 @@ +$NetBSD: patch-unix_ibus_ibus.gyp,v 1.1 2014/06/15 13:08:34 ryoon Exp $ + +--- unix/ibus/ibus.gyp.orig 2014-05-21 10:49:56.000000000 +0000 ++++ unix/ibus/ibus.gyp +@@ -31,8 +31,8 @@ + 'variables': { + 'relative_dir': 'unix/ibus', + 'gen_out_dir': '<(SHARED_INTERMEDIATE_DIR)/<(relative_dir)', +- 'ibus_mozc_icon_path%': '/usr/share/ibus-mozc/product_icon.png', +- 'ibus_mozc_path%': '/usr/lib/ibus-mozc/ibus-engine-mozc', ++ 'ibus_mozc_icon_path%': '@PREFIX@/share/ibus-mozc/product_icon.png', ++ 'ibus_mozc_path%': '@PREFIX@/libexec/ibus-engine-mozc', + # enable_x11_selection_monitor represents if ibus_mozc uses X11 selection + # monitor or not. + 'enable_x11_selection_monitor%': 1, diff --git a/inputmethod/mozc-tool/Makefile b/inputmethod/mozc-tool/Makefile index 8a4f00ebdfd..d3472305893 100644 --- a/inputmethod/mozc-tool/Makefile +++ b/inputmethod/mozc-tool/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2014/02/12 23:18:04 tron Exp $ +# $NetBSD: Makefile,v 1.17 2014/06/15 13:08:34 ryoon Exp $ PKGNAME= ${DISTNAME:S/mozc-/mozc-tool-/} -PKGREVISION= 1 INSTALLATION_DIRS+= libexec diff --git a/inputmethod/uim-mozc/Makefile b/inputmethod/uim-mozc/Makefile index 6cdad4b815c..c3db3f96423 100644 --- a/inputmethod/uim-mozc/Makefile +++ b/inputmethod/uim-mozc/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2014/05/31 14:24:23 obache Exp $ +# $NetBSD: Makefile,v 1.4 2014/06/15 13:08:34 ryoon Exp $ PKGNAME= uim-${DISTNAME} -PKGREVISION= 2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} uim-mozc-331.tar.xz -SITES.uim-mozc-331.tar.xz= ${MASTER_SITE_SOURCEFORGE:=pnsft-aur/} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} uim-mozc-334.tar.xz +SITES.uim-mozc-334.tar.xz= ${MASTER_SITE_SOURCEFORGE:=pnsft-aur/} CONFLICTS+= ibus-mozc<=1.13.1651.102 @@ -22,8 +21,8 @@ SUBST_FILES.mozc_tool= scm/mozc-custom.scm SUBST_SED.mozc_tool= -e 's,/usr/lib/mozc/mozc_tool,${PREFIX}/libexec/mozc_tool,g' post-extract: - mv ${WRKDIR}/uim-mozc-331/uim ${WRKSRC}/unix - mv ${WRKDIR}/uim-mozc-331/scm ${WRKSRC} + mv ${WRKDIR}/uim-mozc-334/uim ${WRKSRC}/unix + mv ${WRKDIR}/uim-mozc-334/scm ${WRKSRC} do-build: cd ${WRKSRC} && env ${MAKE_ENV} \ |