aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--japanese/mozc-server/Makefile14
-rw-r--r--japanese/mozc-server/files/patch-src-build_mozc.py16
-rw-r--r--japanese/mozc-server/files/patch-src-gyp-defines.gypi11
-rw-r--r--japanese/mozc-server/files/patch-src-unix-fcitx-fcitx.gyp34
4 files changed, 66 insertions, 9 deletions
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 14064fb8292c..4dbb2d11fe03 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -74,12 +74,13 @@ BROKEN= Does not compile: segfault
GYP_DEFINES= use_libprotobuf=1 \
channel_dev=0 \
enable_unittest=0 \
- compiler_host="${_CCTYPE}" \
- compiler_target="${_CCTYPE}" \
+ 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"
+ use_fcitx=0 \
+ 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'
BUILD_MODE= Release
BUILD_CMD= ${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${MAKE_CMD}
BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \
@@ -308,7 +309,8 @@ do-install-uim_mozc:
.if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
GYP_OPTIONS+= --noqt
GYP_DEFINES+= use_libibus=0 \
- enable_gtk_renderer=0
+ enable_gtk_renderer=0 \
+ use_fcitx=1
LIB_DEPENDS+= libfcitx-core.so:chinese/fcitx
RUN_DEPENDS+= mozc_server:japanese/mozc-server \
diff --git a/japanese/mozc-server/files/patch-src-build_mozc.py b/japanese/mozc-server/files/patch-src-build_mozc.py
index aaec0091a523..c3c4b8e93b83 100644
--- a/japanese/mozc-server/files/patch-src-build_mozc.py
+++ b/japanese/mozc-server/files/patch-src-build_mozc.py
@@ -1,6 +1,16 @@
---- src/build_mozc.py.orig 2017-01-01 14:29:01.398407000 +0900
-+++ src/build_mozc.py 2017-01-01 14:30:17.894029000 +0900
-@@ -864,7 +864,7 @@
+--- src/build_mozc.py.orig 2017-01-02 01:13:46.394876000 +0900
++++ src/build_mozc.py 2017-01-02 01:20:39.314369000 +0900
+@@ -637,9 +637,6 @@
+ else:
+ gyp_options.extend(['-D', 'use_wix=NO'])
+
+- if target_platform == 'Linux':
+- gyp_options.extend(['-D', 'enable_gtk_renderer=1'])
+-
+ # Android
+ if target_platform == 'Android':
+ android_home = GetAndroidHome(options)
+@@ -864,7 +861,7 @@
ninja = GetNinjaPath()
ninja_targets = [GetNinjaTargetName(target) for target in targets]
diff --git a/japanese/mozc-server/files/patch-src-gyp-defines.gypi b/japanese/mozc-server/files/patch-src-gyp-defines.gypi
new file mode 100644
index 000000000000..2a18930823c0
--- /dev/null
+++ b/japanese/mozc-server/files/patch-src-gyp-defines.gypi
@@ -0,0 +1,11 @@
+--- src/gyp/defines.gypi.orig 2017-01-01 15:13:15.000000000 +0900
++++ src/gyp/defines.gypi 2017-01-02 01:25:19.028785000 +0900
+@@ -71,6 +71,8 @@
+ # use_libibus represents if ibus library is used or not.
+ # This option is only for Linux.
+ 'use_libibus%': '0',
++
++ 'use_fcitx%': '0',
+ },
+ 'target_defaults': {
+ 'defines': [
diff --git a/japanese/mozc-server/files/patch-src-unix-fcitx-fcitx.gyp b/japanese/mozc-server/files/patch-src-unix-fcitx-fcitx.gyp
new file mode 100644
index 000000000000..ce05f23c0e36
--- /dev/null
+++ b/japanese/mozc-server/files/patch-src-unix-fcitx-fcitx.gyp
@@ -0,0 +1,34 @@
+--- src/unix/fcitx/fcitx.gyp.orig 2017-01-01 15:13:15.000000000 +0900
++++ src/unix/fcitx/fcitx.gyp 2017-01-02 01:52:57.325440000 +0900
+@@ -47,8 +47,14 @@
+ '../../protocol/protocol.gyp:commands_proto',
+ ],
+ 'fcitx_defines': [
+- 'LOCALEDIR="<!@(fcitx4-config --prefix)/share/locale/"',
+- ]
++ ],
++ 'conditions': [
++ ['use_fcitx==1', {
++ 'fcitx_defines': [
++ 'LOCALEDIR="<!@(fcitx4-config --prefix)/share/locale/"',
++ ]
++ }]
++ ],
+ },
+ 'targets': [
+ {
+@@ -90,8 +96,12 @@
+ '<@(fcitx_dependencies)',
+ 'gen_fcitx_mozc_i18n',
+ ],
+- 'cflags': [
+- '<!@(pkg-config --cflags <@(pkg_config_libs))',
++ 'conditions': [
++ ['use_fcitx==1', {
++ 'cflags': [
++ '<!@(pkg-config --cflags <@(pkg_config_libs))',
++ ],
++ }],
+ ],
+ 'include_dirs': [
+ '<@(fcitx_dep_include_dirs)',