Attachment #133735 for bug #178250

View | Details | Raw Unified | Return to bug 178250
Collapse All | Expand All

Lines 25-36 Link Here

(-)/usr/ports/japanese/mozc-server/Makefile (-12 / +14 lines)
25		25
26	BUILD_MOZC_LIST?= mozc_server	26	BUILD_MOZC_LIST?= mozc_server
27		27
28	GYP_OPTIONS=	28	GYP_OPTIONS=
29	.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" \|\| \	29	.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" \|\| \
30	${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" \|\| \	30	${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" \|\| \
31	${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" \|\| \	31	${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" \|\| \
32	${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"	32	${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"
33	GYP_OPTIONS= --noqt	33	GYP_OPTIONS= --noqt
		34	.elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
		35	USE_QT4+= corelib gui
34	.endif	36	.endif
35		37
36	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
Lines 60-66 Link Here
60	.endfor	62	.endfor
61	LOCALBASE_PTN= ${LOCALBASE:S/\\/\\\\/g:S/"/\"/g:S/\$/\\$/g:S/,/\,/g}	63	LOCALBASE_PTN= ${LOCALBASE:S/\\/\\\\/g:S/"/\"/g:S/\$/\\$/g:S/,/\,/g}
62		64
63	BUILD_MODE= Release	65	BUILD_MODE= Release
64	BUILD_CMD= ${SETENV} ${MAKE_ENV} ${GMAKE}	66	BUILD_CMD= ${SETENV} ${MAKE_ENV} ${GMAKE}
65	BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \	67	BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \
66	${SETENV} BUILD_COMMAND="${WRKSRC}/mozcmake" \	68	${SETENV} BUILD_COMMAND="${WRKSRC}/mozcmake" \
Lines 74-81 Link Here
74	${LOCALBASE_REPLACE_FILES}	76	${LOCALBASE_REPLACE_FILES}
75	cd ${WRKSRC} && \	77	cd ${WRKSRC} && \
76	${REINPLACE_CMD} ${SSL_REINPLACE_STR} base/base.gyp	78	${REINPLACE_CMD} ${SSL_REINPLACE_STR} base/base.gyp
77	${MKDIR} -p ${WRKSRC}/mozc_build_tools/linux	79	${MKDIR} ${WRKSRC}/mozc_build_tools/linux
78	${LN} -sf ${LOCALBASE}/bin/protoc ${WRKSRC}/mozc_build_tools/linux/	80	${LN} -sf ${LOCALBASE}/bin/protoc ${WRKSRC}/mozc_build_tools/linux/
79	.if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"	81	.if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc"
80	cd ${WRKSRC} && \	82	cd ${WRKSRC} && \
81	${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \	83	${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \
Lines 99-106 Link Here
99		101
100	# mozc_server	102	# mozc_server
101	.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server"	103	.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server"
102	BUILD_DEPENDS+= glib:${PORTSDIR}/devel/glib20 \	104	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20 \
103	gtk:${PORTSDIR}/x11-toolkits/gtk20	105	${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc:${PORTSDIR}/x11-toolkits/gtk20 \
		106	${LOCALBASE}/libdata/pkgconfig/zinnia.pc:${PORTSDIR}/japanese/zinnia
104	PLIST_FILES+= bin/mozc_server	107	PLIST_FILES+= bin/mozc_server
105		108
106	do-build-mozc_server:	109	do-build-mozc_server:
Lines 116-123 Link Here
116	# mozc_tool	119	# mozc_tool
117	.if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"	120	.if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
118	LIB_DEPENDS+= zinnia.0:${PORTSDIR}/japanese/zinnia	121	LIB_DEPENDS+= zinnia.0:${PORTSDIR}/japanese/zinnia
119	BUILD_DEPENDS+= gtk:${PORTSDIR}/x11-toolkits/gtk20	122	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc:${PORTSDIR}/x11-toolkits/gtk20
120	USE_QT4+= corelib gui
121	RUN_DEPENDS+= ${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model:${PORTSDIR}/japanese/tegaki-zinnia-japanese	123	RUN_DEPENDS+= ${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model:${PORTSDIR}/japanese/tegaki-zinnia-japanese
122		124
123	PLIST_FILES+= bin/mozc_tool \	125	PLIST_FILES+= bin/mozc_tool \
Lines 164-170 Link Here
164	${DATADIR_REL}/icons/product_logo.png \	166	${DATADIR_REL}/icons/product_logo.png \
165	${DATADIR_REL}/icons/properties.png \	167	${DATADIR_REL}/icons/properties.png \
166	${DATADIR_REL}/icons/tool.png \	168	${DATADIR_REL}/icons/tool.png \
167	share/ibus/component/mozc.xml	169	share/ibus/component/mozc.xml
168	PLIST_DIRS+= ${DATADIR_REL}/icons ${DATADIR_REL}	170	PLIST_DIRS+= ${DATADIR_REL}/icons ${DATADIR_REL}
169		171
170	do-build-ibus_mozc:	172	do-build-ibus_mozc:
Lines 202-208 Link Here
202		204
203	LIB_DEPENDS+= fcitx-config.4:${PORTSDIR}/chinese/fcitx \	205	LIB_DEPENDS+= fcitx-config.4:${PORTSDIR}/chinese/fcitx \
204	zinnia.0:${PORTSDIR}/japanese/zinnia	206	zinnia.0:${PORTSDIR}/japanese/zinnia
205	BUILD_DEPENDS+= glib:${PORTSDIR}/devel/glib20	207	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20
206	RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \	208	RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \
207	mozc_tool:${PORTSDIR}/japanese/mozc-tool \	209	mozc_tool:${PORTSDIR}/japanese/mozc-tool \
208	mozc_server_start:${PORTSDIR}/japanese/mozc-additions	210	mozc_server_start:${PORTSDIR}/japanese/mozc-additions
Lines 264-271 Link Here
264	.if ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"	266	.if ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el"
265	LIB_DEPENDS+= zinnia.0:${PORTSDIR}/japanese/zinnia	267	LIB_DEPENDS+= zinnia.0:${PORTSDIR}/japanese/zinnia
266	BUILD_DEPENDS+= emacs:${PORTSDIR}/editors/emacs \	268	BUILD_DEPENDS+= emacs:${PORTSDIR}/editors/emacs \
267	glib:${PORTSDIR}/devel/glib20 \	269	${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20 \
268	gtk:${PORTSDIR}/x11-toolkits/gtk20	270	${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc:${PORTSDIR}/x11-toolkits/gtk20
269	RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \	271	RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \
270	mozc_server_start:${PORTSDIR}/japanese/mozc-additions	272	mozc_server_start:${PORTSDIR}/japanese/mozc-additions
271		273

Lines 1-5 Link Here

(-)/usr/ports/japanese/mozc-server/files/patch-gyp_common.gypi (-4 / +12 lines)
1	--- gyp/common.gypi.orig 2013-04-21 03:48:45.395416165 +0900	1	--- gyp/common.gypi.orig 2013-03-29 13:33:42.000000000 +0900
2	+++ gyp/common.gypi 2013-04-21 08:31:10.191270448 +0900	2	+++ gyp/common.gypi 2013-04-29 22:28:19.000000000 +0900
3	@@ -58,7 +58,7 @@	3	@@ -58,7 +58,7 @@
4	# warning_cflags will be shared with Mac and Linux.	4	# warning_cflags will be shared with Mac and Linux.
5	'warning_cflags': [	5	'warning_cflags': [
Lines 9-15 Link Here
9	'-Wno-char-subscripts',	9	'-Wno-char-subscripts',
10	'-Wno-sign-compare',	10	'-Wno-sign-compare',
11	'-Wno-deprecated-declarations',	11	'-Wno-deprecated-declarations',
12	@@ -194,7 +194,7 @@	12	@@ -90,6 +90,7 @@
		13	# Libraries for GNU/Linux environment.
		14	'linux_ldflags': [
		15	'-pthread',
		16	+ '-fstack-protector',
		17	],
		18
		19	# 'conditions' is put inside of 'variables' so that we can use
		20	@@ -194,7 +195,7 @@
13	# - http://code.google.com/p/protobuf/issues/detail?id=128	21	# - http://code.google.com/p/protobuf/issues/detail?id=128
14	# - http://code.google.com/p/protobuf/issues/detail?id=370	22	# - http://code.google.com/p/protobuf/issues/detail?id=370
15	# for the background information.	23	# for the background information.
Lines 18-24 Link Here
18		26
19	# use_libzinnia represents if zinnia library is used or not.	27	# use_libzinnia represents if zinnia library is used or not.
20	# This option is only for Linux.	28	# This option is only for Linux.
21	@@ -735,6 +735,12 @@	29	@@ -735,6 +736,12 @@
22	# <unordered_map> and <unordered_set>.	30	# <unordered_map> and <unordered_set>.
23	'-Wno-deprecated',	31	'-Wno-deprecated',
24	],	32	],

Return to bug 178250