ports/163737: [patch] optional support for GTK3 in textproc/ibus

[Kuan-Chung Chiu]

>Number:         163737
>Category:       ports
>Synopsis:       [patch] optional support for GTK3 in textproc/ibus
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 31 14:20:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Kuan-Chung Chiu
>Release:        
>Organization:
N/A
>Environment:
>Description:
Add option to enable building gtk3 client in textproc/ibus
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN ibus.orig/Makefile ibus/Makefile
--- ibus.orig/Makefile	2011-12-31 20:06:27.000000000 +0800
+++ ibus/Makefile	2011-12-31 22:12:21.000000000 +0800
@@ -7,7 +7,7 @@
 
 PORTNAME=	ibus
 PORTVERSION=	1.3.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -32,6 +32,7 @@
 GCONF_SCHEMAS=	ibus.schemas
 
 OPTIONS=	ISOCODES "Use isocodecs" on \
+		GTK3 "Install GTK3 client" off \
 		VALA "Install vala binding" on \
 		GINTRO "Install GObject Introspection data" on
 
@@ -53,6 +54,14 @@
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if defined(WITH_GTK3)
+USE_GNOME+=	gtk30
+CONFIGURE_ARGS+=	--enable-gtk3
+PLIST_SUB+=	GTK3=""
+.else
+PLIST_SUB+=	GTK3="@comment "
+.endif
+
 .if defined(WITH_VALA)
 CONFIGURE_ARGS+=	--enable-vala
 PLIST_SUB+=	VALA=""
@@ -80,11 +89,17 @@
 	@${REINPLACE_CMD} -e 's|setpgrp ()|setpgrp (0,0)|g' ${WRKSRC}/bus/main.c
 
 post-install:
+	@if [ -x gtk-query-immodules-3.0 ]; then \
+		gtk-query-immodules-3.0 --update-cache ; \
+	fi
 	@gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
 
 post-deinstall:
+	@if [ -x gtk-query-immodules-3.0 ]; then \
+		gtk-query-immodules-3.0 --update-cache ; \
+	fi
 	@gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
 
 .include <bsd.port.post.mk>
diff -ruN ibus.orig/pkg-plist ibus/pkg-plist
--- ibus.orig/pkg-plist	2011-12-31 20:06:27.000000000 +0800
+++ ibus/pkg-plist	2011-12-31 21:52:18.000000000 +0800
@@ -235,6 +235,8 @@
 include/ibus-1.0/ibusxml.h
 lib/gtk-2.0/2.10.0/immodules/im-ibus.la
 lib/gtk-2.0/2.10.0/immodules/im-ibus.so
+%%GTK3%%lib/gtk-3.0/3.0.0/immodules/im-ibus.la
+%%GTK3%%lib/gtk-3.0/3.0.0/immodules/im-ibus.so
 lib/libibus.la
 lib/libibus.so
 lib/libibus.so.2


>Release-Note:
>Audit-Trail:
>Unformatted: