Sun May 18 07:42:24 2014 UTC ()
fixes icon path for ibus-mozc with ibus-1.5.


(obache)
diff -r1.17 -r1.18 pkgsrc/inputmethod/ibus-mozc/Makefile
diff -r1.6 -r1.7 pkgsrc/inputmethod/mozc-server/distinfo
diff -r1.4 -r1.5 pkgsrc/inputmethod/mozc-server/patches/patch-unix_ibus_gen__mozc__xml.py
cvs diff -r1.17 -r1.18 pkgsrc/inputmethod/ibus-mozc/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-mozc/Makefile 2014/02/12 23:18:04 1.17
+++ pkgsrc/inputmethod/ibus-mozc/Makefile 2014/05/18 07:42:24 1.18
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.17 2014/02/12 23:18:04 tron Exp $ 1# $NetBSD: Makefile,v 1.18 2014/05/18 07:42:24 obache Exp $
2 2
3PKGNAME= ibus-${DISTNAME} 3PKGNAME= ibus-${DISTNAME}
4PKGREVISION= 2 4PKGREVISION= 3
5 5
6INSTALLATION_DIRS+= libexec share/ibus share/ibus/component \ 6INSTALLATION_DIRS+= libexec share/ibus share/ibus/component \
7 share/ibus-mozc 7 share/ibus-mozc
8 8
9DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 9DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
10DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer 10DEPENDS+= mozc-renderer-[0-9]*:../../inputmethod/mozc-renderer
11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server 11DEPENDS+= mozc-server-[0-9]*:../../inputmethod/mozc-server
12DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool 12DEPENDS+= mozc-tool-[0-9]*:../../inputmethod/mozc-tool
13 13
14do-build: 14do-build:
15 cd ${WRKSRC} && env ${MAKE_ENV} \ 15 cd ${WRKSRC} && env ${MAKE_ENV} \
16 ${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \ 16 ${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
17 unix/ibus/ibus.gyp:ibus_mozc 17 unix/ibus/ibus.gyp:ibus_mozc
cvs diff -r1.6 -r1.7 pkgsrc/inputmethod/mozc-server/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-server/distinfo 2014/01/20 10:39:29 1.6
+++ pkgsrc/inputmethod/mozc-server/distinfo 2014/05/18 07:42:24 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.6 2014/01/20 10:39:29 ryoon Exp $ 1$NetBSD: distinfo,v 1.7 2014/05/18 07:42:24 obache Exp $
2 2
3SHA1 (mozc-1.13.1651.102.tar.bz2) = 24680b3d350e5332f2235b9c1342127f6ef0fd63 3SHA1 (mozc-1.13.1651.102.tar.bz2) = 24680b3d350e5332f2235b9c1342127f6ef0fd63
4RMD160 (mozc-1.13.1651.102.tar.bz2) = 260a23c2f9f3b909aefe63c865f3b87013d2fb53 4RMD160 (mozc-1.13.1651.102.tar.bz2) = 260a23c2f9f3b909aefe63c865f3b87013d2fb53
5Size (mozc-1.13.1651.102.tar.bz2) = 31635636 bytes 5Size (mozc-1.13.1651.102.tar.bz2) = 31635636 bytes
6SHA1 (uim-mozc-331.tar.xz) = 760d1deb5964358d1dc064e44d45eec38d94d9ec 6SHA1 (uim-mozc-331.tar.xz) = 760d1deb5964358d1dc064e44d45eec38d94d9ec
7RMD160 (uim-mozc-331.tar.xz) = db4df92b8adc0e6202cf7f61c326b1503e157d9b 7RMD160 (uim-mozc-331.tar.xz) = db4df92b8adc0e6202cf7f61c326b1503e157d9b
8Size (uim-mozc-331.tar.xz) = 30580 bytes 8Size (uim-mozc-331.tar.xz) = 30580 bytes
9SHA1 (patch-base_base.gyp) = 329bd8614282aca28fcba30b2e593f488801118d 9SHA1 (patch-base_base.gyp) = 329bd8614282aca28fcba30b2e593f488801118d
10SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191 10SHA1 (patch-base_cpu__stats.cc) = cda8bbcbc963d8ed635435375cc80ee5e7ca2191
11SHA1 (patch-base_crash__report__handler.cc) = 28e581ffef8a108aff372c79b3578686472cb464 11SHA1 (patch-base_crash__report__handler.cc) = 28e581ffef8a108aff372c79b3578686472cb464
12SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b 12SHA1 (patch-base_iconv.cc) = 1bf65dfc6152bf152cbe2714835a61436df2a48b
13SHA1 (patch-base_logging.cc) = 96ee9d1426ef1cf946a00fb15c9754603ab15bb8 13SHA1 (patch-base_logging.cc) = 96ee9d1426ef1cf946a00fb15c9754603ab15bb8
14SHA1 (patch-base_mutex.cc) = aed8588d4ff7b057fed072097ef09ddbc2696d31 14SHA1 (patch-base_mutex.cc) = aed8588d4ff7b057fed072097ef09ddbc2696d31
@@ -36,15 +36,15 @@ SHA1 (patch-gyp_common.gypi) = 69095a357 @@ -36,15 +36,15 @@ SHA1 (patch-gyp_common.gypi) = 69095a357
36SHA1 (patch-handwriting_handwriting.gyp) = 0261aef287b34f4a3c8424fb1af44720ae00a85c 36SHA1 (patch-handwriting_handwriting.gyp) = 0261aef287b34f4a3c8424fb1af44720ae00a85c
37SHA1 (patch-handwriting_zinnia.gyp) = d09ac17d17dabdbfdcb7c623193a5c72dbcacfbc 37SHA1 (patch-handwriting_zinnia.gyp) = d09ac17d17dabdbfdcb7c623193a5c72dbcacfbc
38SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2 38SHA1 (patch-handwriting_zinnia__handwriting.cc) = dd9363f470bf4a27fed40602f02127cb130042b2
39SHA1 (patch-ipc_ipc__path__manager.cc) = c96fbac6d1d81ddd7f999c30bdc2539ee2df2564 39SHA1 (patch-ipc_ipc__path__manager.cc) = c96fbac6d1d81ddd7f999c30bdc2539ee2df2564
40SHA1 (patch-ipc_ipc__path__manager__test.cc) = 90ea81daef93dc1ad5cee792ced26a9a2939fbdf 40SHA1 (patch-ipc_ipc__path__manager__test.cc) = 90ea81daef93dc1ad5cee792ced26a9a2939fbdf
41SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32 41SHA1 (patch-ipc_named__event.cc) = 92283261e7580569587e43156f13567b593c9a32
42SHA1 (patch-ipc_unix__ipc.cc) = d821deb2f38bf77bf6b364eb31d419c0a86c1a7f 42SHA1 (patch-ipc_unix__ipc.cc) = d821deb2f38bf77bf6b364eb31d419c0a86c1a7f
43SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea 43SHA1 (patch-net_net.gyp) = 937b28ad663605373d6b772097318b17dbea2eea
44SHA1 (patch-protobuf_genproto.gypi) = 601165a376bcd05983f87733285737ee043c13fe 44SHA1 (patch-protobuf_genproto.gypi) = 601165a376bcd05983f87733285737ee043c13fe
45SHA1 (patch-protobuf_protobuf.gyp) = 60abe727c1475e50295a5e811dccf8deb710e18a 45SHA1 (patch-protobuf_protobuf.gyp) = 60abe727c1475e50295a5e811dccf8deb710e18a
46SHA1 (patch-session_session.cc) = 0562f8646dc6f68e180d8ae98f00eeb0364fc473 46SHA1 (patch-session_session.cc) = 0562f8646dc6f68e180d8ae98f00eeb0364fc473
47SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465 47SHA1 (patch-session_session__converter__interface.h) = 93bda6e51b9a9ac7146aa23ac0aa28bb017a4465
48SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95 48SHA1 (patch-session_session__test.cc) = a256caec45a45f4eaab0555ecc18cea09c417d95
49SHA1 (patch-unix_ibus_gen__mozc__xml.py) = 9d7e1da07854c2244a22ffe5034fabb25d16d266 49SHA1 (patch-unix_ibus_gen__mozc__xml.py) = a6e135a698cc04231b64808f0b2ed64191b4a5bb
50SHA1 (patch-unix_ibus_mozc__engine.cc) = 2ce0a680a0fad1abdc646737b6b5a4c3a9e87e6e 50SHA1 (patch-unix_ibus_mozc__engine.cc) = 2ce0a680a0fad1abdc646737b6b5a4c3a9e87e6e
cvs diff -r1.4 -r1.5 pkgsrc/inputmethod/mozc-server/patches/Attic/patch-unix_ibus_gen__mozc__xml.py (expand / switch to unified diff)

--- pkgsrc/inputmethod/mozc-server/patches/Attic/patch-unix_ibus_gen__mozc__xml.py 2014/01/19 01:18:50 1.4
+++ pkgsrc/inputmethod/mozc-server/patches/Attic/patch-unix_ibus_gen__mozc__xml.py 2014/05/18 07:42:24 1.5
@@ -1,37 +1,46 @@ @@ -1,37 +1,46 @@
1$NetBSD: patch-unix_ibus_gen__mozc__xml.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ 1$NetBSD: patch-unix_ibus_gen__mozc__xml.py,v 1.5 2014/05/18 07:42:24 obache Exp $
2 2
3* Fix for pkgsrc installation. 3* Fix for pkgsrc installation.
4 4
5--- unix/ibus/gen_mozc_xml.py.orig 2014-01-06 07:10:26.000000000 +0000 5--- unix/ibus/gen_mozc_xml.py.orig 2014-01-06 07:10:26.000000000 +0000
6+++ unix/ibus/gen_mozc_xml.py 6+++ unix/ibus/gen_mozc_xml.py
7@@ -47,7 +47,7 @@ import sys 7@@ -47,7 +47,7 @@ import sys
8 IBUS_COMPONENT_PROPS = { 8 IBUS_COMPONENT_PROPS = {
9 'name': 'com.google.IBus.Mozc', 9 'name': 'com.google.IBus.Mozc',
10 'description': '%(product_name)s Component', 10 'description': '%(product_name)s Component',
11- 'exec': '%(ibus_mozc_path)s --ibus', 11- 'exec': '%(ibus_mozc_path)s --ibus',
12+ 'exec': '@PREFIX@/libexec/ibus-engine-mozc --ibus', 12+ 'exec': '@PREFIX@/libexec/ibus-engine-mozc --ibus',
13 # TODO(mazda): Generate the version number. 13 # TODO(mazda): Generate the version number.
14 'version': '0.0.0.0', 14 'version': '0.0.0.0',
15 'author': 'Google Inc.', 15 'author': 'Google Inc.',
16@@ -60,7 +60,7 @@ IBUS_COMPONENT_PROPS = { 16@@ -60,7 +60,7 @@ IBUS_COMPONENT_PROPS = {
17 IBUS_ENGINE_COMMON_PROPS = { 17 IBUS_ENGINE_COMMON_PROPS = {
18 'description': '%(product_name)s (Japanese Input Method)', 18 'description': '%(product_name)s (Japanese Input Method)',
19 'language': 'ja', 19 'language': 'ja',
20- 'icon': '%(ibus_mozc_icon_path)s', 20- 'icon': '%(ibus_mozc_icon_path)s',
21+ 'icon': '@PREFIX@/share/ibus-mozc/product_icon.png', 21+ 'icon': '@PREFIX@/share/ibus-mozc/product_icon.png',
22 'rank': '80', 22 'rank': '80',
23 } 23 }
24  24
 25@@ -68,7 +68,7 @@ IBUS_ENGINE_COMMON_PROPS = {
 26 IBUS_1_5_ENGINE_COMMON_PROPS = {
 27 'description': '%(product_name)s (Japanese Input Method)',
 28 'language': 'ja',
 29- 'icon': '%(ibus_mozc_icon_path)s',
 30+ 'icon': '@PREFIX@/share/ibus-mozc/product_icon.png',
 31 'rank': '80',
 32 'symbol': 'あ',
 33 }
25@@ -93,6 +93,22 @@ IBUS_ENGINES_PROPS = { 34@@ -93,6 +93,22 @@ IBUS_ENGINES_PROPS = {
26 'longname': ['%(product_name)s'], 35 'longname': ['%(product_name)s'],
27 'layout': ['default'], 36 'layout': ['default'],
28 }, 37 },
29+ 'NetBSD': { 38+ 'NetBSD': {
30+ # DO NOT change the engine name 'mozc-jp'. The names is referenced by 39+ # DO NOT change the engine name 'mozc-jp'. The names is referenced by
31+ # unix/ibus/mozc_engine.cc. 40+ # unix/ibus/mozc_engine.cc.
32+ 'name': ['mozc-jp'], 41+ 'name': ['mozc-jp'],
33+ 'longname': ['%(product_name)s'], 42+ 'longname': ['%(product_name)s'],
34+ 'layout': ['jp'], 43+ 'layout': ['jp'],
35+ }, 44+ },
36+ # On NetBSD (IBus >= 1.5), we use special label 'default' for the keyboard 45+ # On NetBSD (IBus >= 1.5), we use special label 'default' for the keyboard
37+ # layout. 46+ # layout.