Bug 170037 - [PATCH] japanese/mozc-server: remove dependency to glib20 gtk20
[PATCH] japanese/mozc-server: remove dependency to glib20 gtk20
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Daichi GOTO
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2012-07-20 23:30 UTC by freebsd
Modified: 2012-07-22 18:10 UTC (History)
0 users

See Also:


Attachments
file.diff (1.59 KB, patch)
2012-07-20 23:30 UTC, freebsd
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description freebsd 2012-07-20 23:30:18 UTC
You don't have to depend on glib/gtk when you're building mozc-server only.

ref.
http://code.google.com/p/mozc/source/browse/trunk/src/debian/changelog?r=115
http://tomcat.nyanta.jp/sb2/sb.cgi?day=20120529

How-To-Repeat: cd /usr/ports/japanese/mozc-server
make
Comment 1 Edwin Groothuis freebsd_committer 2012-07-20 23:30:30 UTC
Responsible Changed
From-To: freebsd-ports-bugs->daichi

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter freebsd_committer 2012-07-22 07:12:04 UTC
Author: daichi
Date: Sun Jul 22 06:11:53 2012
New Revision: 301297
URL: http://svn.freebsd.org/changeset/ports/301297

Log:
  improve gtk/glib dependency
  
  PR:		170037
  Submitted by:	Seiji Ariga <freebsd@khaotic.net>

Modified:
  head/japanese/mozc-server/Makefile

Modified: head/japanese/mozc-server/Makefile
==============================================================================
--- head/japanese/mozc-server/Makefile	Sun Jul 22 03:36:31 2012	(r301296)
+++ head/japanese/mozc-server/Makefile	Sun Jul 22 06:11:53 2012	(r301297)
@@ -7,7 +7,7 @@
 
 PORTNAME=	mozc
 PORTVERSION=	1.5.1090.102
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX?=	ja-
@@ -30,10 +30,7 @@ USE_OPENSSL=	yes
 
 BUILD_MOZC_LIST?=	mozc_server
 
-.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server"
-USE_GNOME+=	glib20 gtk20
-.elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
-USE_GNOME+=	gtk20
+.if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
 USE_QT4+=	gui dbus qmake_build moc_build uic_build rcc_build
 .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" || \
       ${BUILD_MOZC_LIST:Mscim_mozc} == "scim_mozc"
@@ -76,11 +73,19 @@ SSL_REINPLACE_STR=
 SSL_REINPLACE_STR+=	-e "s,%%${V}%%,${${V}},"
 .endfor
 
+.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server"
+GYP_DEFINES="use_libprotobuf=1 enable_gtk_renderer=0"
+.elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
+GYP_DEFINES="use_libprotobuf=1 enable_gtk_renderer=0"
+.else
+GYP_DEFINES="use_libprotobuf=1"
+.endif
+
 BUILD_CMD=	${SETENV} ${MAKE_ENV} ${GMAKE}
 BUILD_MOZC_CMD=	cd ${BUILD_WRKSRC} && \
 		${SETENV} BUILD_COMMAND="${WRKSRC}/mozcmake" \
 		PYTHONPATH=${WRKSRC}/third_party/gyp/local/lib/python${PYTHON_VER}/site-packages \
-		GYP_DEFINES="use_libprotobuf=1" \
+		GYP_DEFINES=${GYP_DEFINES} \
 		${PYTHON_CMD} build_mozc.py
 BUILD_GYP_CMD=	cd ${WRKSRC}/third_party/gyp && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP}
 
@@ -111,7 +116,6 @@ pre-build:
 
 # mozc_server
 .if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server"
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 PLIST_FILES+=	bin/mozc_server
 
 do-build-mozc_server:
@@ -125,7 +129,6 @@ do-install-mozc_server:
 
 # mozc_tool
 .if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 RUN_DEPENDS+=	${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model:${PORTSDIR}/japanese/tegaki-zinnia-japanese
 
 PLIST_FILES+=	bin/mozc_tool \
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Daichi GOTO freebsd_committer 2012-07-22 07:12:05 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 freebsd 2012-07-22 18:00:14 UTC
japanese/mozc-el also needs to be take care.

// Seiji Ariga


--- japanese/mozc-server/Makefile.orig  2012-07-22 12:48:40.000000000 -0400
+++ japanese/mozc-server/Makefile       2012-07-22 12:47:22.000000000 -0400
@@ -7,7 +7,7 @@

 PORTNAME=      mozc
 PORTVERSION=   1.5.1090.102
-PORTREVISION=  6
+PORTREVISION=  7
 CATEGORIES=    japanese
 MASTER_SITES=  ${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX?=        ja-
@@ -73,9 +73,9 @@
 SSL_REINPLACE_STR+=    -e "s,%%${V}%%,${${V}},"
 .endfor

-.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server"
-GYP_DEFINES="use_libprotobuf=1 enable_gtk_renderer=0"
-.elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
+.if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" || \
+    ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" || \
+    ${BUILD_MOZC_LIST:Mmozc-el} == "mozc-el"
 GYP_DEFINES="use_libprotobuf=1 enable_gtk_renderer=0"
 .else
 GYP_DEFINES="use_libprotobuf=1"