Update ibus to 1.4.1.

2012-02-07 ibus 1.4.1 stable release
* Many bug fixings.

2011-09-23 ibus 1.4.0 stable release
* Remove libdbus dependence, use glib gdbus instead.
* Support surrounding text feature.
* Add dconf config backend.
* Add memory config backend.
* Support replacing ibus panel on the fly.
* Add asynchronous API.
* Remove most blocking function call in daemon.
* Improve gobject-introspection support.
* Improve vala language support.
* Improve unit test.
* Many bug fixes.

4 files changed, 64 insertions, 70 deletions

diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile
index a11c042a323..8c5e0acd988 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2012/03/09 12:34:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/22 13:57:30 obache Exp $
 #
 
-DISTNAME=	ibus-1.3.9
-PKGREVISION=	6
+DISTNAME=	ibus-1.4.1
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://ibus.googlecode.com/files/
 
@@ -29,27 +28,23 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ARGS+=	--enable-gtk2
 CONFIGURE_ARGS+=	--disable-gtk3
+CONFIGURE_ARGS+=	--enable-surrounding-text
 
-BUILD_DEFS+=	PKG_SYSCONFBASE
+SUBST_CLASSES+=		dbus
+SUBST_STAGE.dbus=	post-configure
+SUBST_FILES.dbus=	src/ibusshare.c
+SUBST_SED.dbus=		-e 's,/var/lib/dbus/machine-id,${VARBASE}/db/dbus/machine-id,g'
 
-EXAMPLESDIR=		${PREFIX}/share/examples/ibus
-
-INSTALL_MAKE_FLAGS+=	sysconfdir=${EXAMPLESDIR}
-
-MAKE_DIRS+=		${PKG_SYSCONFBASE}/xdg/autostart
-CONF_FILES+=		${EXAMPLESDIR}/xdg/autostart/ibus.desktop \
-			${PKG_SYSCONFBASE}/xdg/autostart/ibus.desktop
+BUILD_DEFS+=	PKG_SYSCONFBASE VARBASE
 
 BUILDLINK_API_DEPENDS.GConf+=		GConf>=2.12
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.18
+BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.26.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 PY_PATCHPLIST=	yes
 .include "../../lang/python/extension.mk"
-BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.74
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-dbus+=		${PYPKGPREFIX}-dbus>=0.83.0
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
diff --git a/inputmethod/ibus/PLIST b/inputmethod/ibus/PLIST
index 96fe8b05a9d..622462355f2 100644
--- a/inputmethod/ibus/PLIST
+++ b/inputmethod/ibus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/07 01:48:31 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/04/22 13:57:30 obache Exp $
 bin/ibus-daemon
 bin/ibus-setup
 include/ibus-1.0/ibus.h
@@ -8,8 +8,6 @@ include/ibus-1.0/ibusbus.h
 include/ibus-1.0/ibuscomponent.h
 include/ibus-1.0/ibusconfig.h
 include/ibus-1.0/ibusconfigservice.h
-include/ibus-1.0/ibusconnection.h
-include/ibus-1.0/ibusdbus.h
 include/ibus-1.0/ibusdebug.h
 include/ibus-1.0/ibusengine.h
 include/ibus-1.0/ibusenginedesc.h
@@ -19,28 +17,25 @@ include/ibus-1.0/ibusfactory.h
 include/ibus-1.0/ibushotkey.h
 include/ibus-1.0/ibusinputcontext.h
 include/ibus-1.0/ibuskeymap.h
+include/ibus-1.0/ibuskeys.h
 include/ibus-1.0/ibuskeysyms.h
 include/ibus-1.0/ibuslookuptable.h
-include/ibus-1.0/ibusmainloop.h
-include/ibus-1.0/ibusmarshalers.h
-include/ibus-1.0/ibusmessage.h
 include/ibus-1.0/ibusobject.h
 include/ibus-1.0/ibusobservedpath.h
 include/ibus-1.0/ibuspanelservice.h
-include/ibus-1.0/ibuspendingcall.h
 include/ibus-1.0/ibusproperty.h
 include/ibus-1.0/ibusproplist.h
 include/ibus-1.0/ibusproxy.h
 include/ibus-1.0/ibusserializable.h
-include/ibus-1.0/ibusserver.h
 include/ibus-1.0/ibusservice.h
 include/ibus-1.0/ibusshare.h
 include/ibus-1.0/ibustext.h
 include/ibus-1.0/ibustypes.h
+include/ibus-1.0/ibusutil.h
 include/ibus-1.0/ibusversion.h
 include/ibus-1.0/ibusxml.h
 lib/gtk-2.0/2.10.0/immodules/im-ibus.la
-lib/libibus.la
+lib/libibus-1.0.la
 lib/pkgconfig/ibus-1.0.pc
 ${PYSITELIB}/ibus/__init__.py
 ${PYSITELIB}/ibus/__init__.pyc
@@ -152,7 +147,6 @@ libexec/ibus-ui-gtk
 libexec/ibus-x11
 share/applications/ibus-setup.desktop
 share/applications/ibus.desktop
-share/examples/ibus/xdg/autostart/ibus.desktop
 share/gconf/schemas/ibus.schemas
 share/gtk-doc/html/ibus/IBusAttrList.html
 share/gtk-doc/html/ibus/IBusAttribute.html
@@ -160,7 +154,6 @@ share/gtk-doc/html/ibus/IBusBus.html
 share/gtk-doc/html/ibus/IBusComponent.html
 share/gtk-doc/html/ibus/IBusConfig.html
 share/gtk-doc/html/ibus/IBusConfigService.html
-share/gtk-doc/html/ibus/IBusConnection.html
 share/gtk-doc/html/ibus/IBusEngine.html
 share/gtk-doc/html/ibus/IBusEngineDesc.html
 share/gtk-doc/html/ibus/IBusFactory.html
@@ -175,7 +168,6 @@ share/gtk-doc/html/ibus/IBusPropList.html
 share/gtk-doc/html/ibus/IBusProperty.html
 share/gtk-doc/html/ibus/IBusProxy.html
 share/gtk-doc/html/ibus/IBusSerializable.html
-share/gtk-doc/html/ibus/IBusServer.html
 share/gtk-doc/html/ibus/IBusService.html
 share/gtk-doc/html/ibus/IBusText.html
 share/gtk-doc/html/ibus/ch01.html
@@ -186,16 +178,12 @@ share/gtk-doc/html/ibus/ch05.html
 share/gtk-doc/html/ibus/ch06.html
 share/gtk-doc/html/ibus/home.png
 share/gtk-doc/html/ibus/ibus-IBusKeysyms.html
-share/gtk-doc/html/ibus/ibus-IBusMessage.html
-share/gtk-doc/html/ibus/ibus-IBusPendingCall.html
 share/gtk-doc/html/ibus/ibus-ibusdebug.html
 share/gtk-doc/html/ibus/ibus-ibuserror.html
-share/gtk-doc/html/ibus/ibus-ibusmainloop.html
 share/gtk-doc/html/ibus/ibus-ibusshare.html
 share/gtk-doc/html/ibus/ibus-ibustypes.html
 share/gtk-doc/html/ibus/ibus-ibusversion.html
 share/gtk-doc/html/ibus/ibus-ibusxml.html
-share/gtk-doc/html/ibus/ibus.devhelp
 share/gtk-doc/html/ibus/ibus.devhelp2
 share/gtk-doc/html/ibus/index.html
 share/gtk-doc/html/ibus/index.sgml
@@ -206,6 +194,7 @@ share/gtk-doc/html/ibus/up.png
 share/ibus/component/gconf.xml
 share/ibus/component/gtkpanel.xml
 share/ibus/keymaps/common
+share/ibus/keymaps/in
 share/ibus/keymaps/jp
 share/ibus/keymaps/kr
 share/ibus/keymaps/modifiers
@@ -219,6 +208,9 @@ share/ibus/setup/enginecombobox.pyo
 share/ibus/setup/enginetreeview.py
 share/ibus/setup/enginetreeview.pyc
 share/ibus/setup/enginetreeview.pyo
+share/ibus/setup/i18n.py
+share/ibus/setup/i18n.pyc
+share/ibus/setup/i18n.pyo
 share/ibus/setup/icon.py
 share/ibus/setup/icon.pyc
 share/ibus/setup/icon.pyo
@@ -238,6 +230,9 @@ share/ibus/ui/gtk/engineabout.pyo
 share/ibus/ui/gtk/handle.py
 share/ibus/ui/gtk/handle.pyc
 share/ibus/ui/gtk/handle.pyo
+share/ibus/ui/gtk/i18n.py
+share/ibus/ui/gtk/i18n.pyc
+share/ibus/ui/gtk/i18n.pyo
 share/ibus/ui/gtk/icon.py
 share/ibus/ui/gtk/icon.pyc
 share/ibus/ui/gtk/icon.pyo
@@ -271,36 +266,43 @@ share/icons/hicolor/scalable/apps/ibus-engine.svg
 share/icons/hicolor/scalable/apps/ibus-keyboard.svg
 share/icons/hicolor/scalable/apps/ibus-setup.svg
 share/icons/hicolor/scalable/apps/ibus.svg
-share/locale/ar/LC_MESSAGES/ibus.mo
-share/locale/as/LC_MESSAGES/ibus.mo
-share/locale/bn_IN/LC_MESSAGES/ibus.mo
-share/locale/ca/LC_MESSAGES/ibus.mo
-share/locale/da/LC_MESSAGES/ibus.mo
-share/locale/de/LC_MESSAGES/ibus.mo
-share/locale/es/LC_MESSAGES/ibus.mo
-share/locale/fr/LC_MESSAGES/ibus.mo
-share/locale/gu/LC_MESSAGES/ibus.mo
-share/locale/hi/LC_MESSAGES/ibus.mo
-share/locale/hu/LC_MESSAGES/ibus.mo
-share/locale/it/LC_MESSAGES/ibus.mo
-share/locale/ja/LC_MESSAGES/ibus.mo
-share/locale/kn/LC_MESSAGES/ibus.mo
-share/locale/ko/LC_MESSAGES/ibus.mo
-share/locale/ml/LC_MESSAGES/ibus.mo
-share/locale/mr/LC_MESSAGES/ibus.mo
-share/locale/or/LC_MESSAGES/ibus.mo
-share/locale/pa/LC_MESSAGES/ibus.mo
-share/locale/pl/LC_MESSAGES/ibus.mo
-share/locale/pt_BR/LC_MESSAGES/ibus.mo
-share/locale/ru/LC_MESSAGES/ibus.mo
-share/locale/sr/LC_MESSAGES/ibus.mo
-share/locale/sr@latin/LC_MESSAGES/ibus.mo
-share/locale/ta/LC_MESSAGES/ibus.mo
-share/locale/te/LC_MESSAGES/ibus.mo
-share/locale/vi/LC_MESSAGES/ibus.mo
-share/locale/zh_CN/LC_MESSAGES/ibus.mo
-share/locale/zh_HK/LC_MESSAGES/ibus.mo
-share/locale/zh_TW/LC_MESSAGES/ibus.mo
+share/locale/ar/LC_MESSAGES/ibus10.mo
+share/locale/as/LC_MESSAGES/ibus10.mo
+share/locale/bn_IN/LC_MESSAGES/ibus10.mo
+share/locale/ca/LC_MESSAGES/ibus10.mo
+share/locale/da/LC_MESSAGES/ibus10.mo
+share/locale/de/LC_MESSAGES/ibus10.mo
+share/locale/en_GB/LC_MESSAGES/ibus10.mo
+share/locale/es/LC_MESSAGES/ibus10.mo
+share/locale/fa/LC_MESSAGES/ibus10.mo
+share/locale/fr/LC_MESSAGES/ibus10.mo
+share/locale/gu/LC_MESSAGES/ibus10.mo
+share/locale/hi/LC_MESSAGES/ibus10.mo
+share/locale/hu/LC_MESSAGES/ibus10.mo
+share/locale/it/LC_MESSAGES/ibus10.mo
+share/locale/ja/LC_MESSAGES/ibus10.mo
+share/locale/kn/LC_MESSAGES/ibus10.mo
+share/locale/ko/LC_MESSAGES/ibus10.mo
+share/locale/lv/LC_MESSAGES/ibus10.mo
+share/locale/ml/LC_MESSAGES/ibus10.mo
+share/locale/mr/LC_MESSAGES/ibus10.mo
+share/locale/nl/LC_MESSAGES/ibus10.mo
+share/locale/or/LC_MESSAGES/ibus10.mo
+share/locale/pa/LC_MESSAGES/ibus10.mo
+share/locale/pl/LC_MESSAGES/ibus10.mo
+share/locale/pt_BR/LC_MESSAGES/ibus10.mo
+share/locale/ru/LC_MESSAGES/ibus10.mo
+share/locale/sr/LC_MESSAGES/ibus10.mo
+share/locale/sr@latin/LC_MESSAGES/ibus10.mo
+share/locale/ta/LC_MESSAGES/ibus10.mo
+share/locale/te/LC_MESSAGES/ibus10.mo
+share/locale/tg/LC_MESSAGES/ibus10.mo
+share/locale/uk/LC_MESSAGES/ibus10.mo
+share/locale/vi/LC_MESSAGES/ibus10.mo
+share/locale/zh_CN/LC_MESSAGES/ibus10.mo
+share/locale/zh_HK/LC_MESSAGES/ibus10.mo
+share/locale/zh_TW/LC_MESSAGES/ibus10.mo
+share/vala/vapi/ibus-1.0.deps
 share/vala/vapi/ibus-1.0.vapi
 @pkgdir share/pixmaps
 @pkgdir share/ibus/icons
diff --git a/inputmethod/ibus/buildlink3.mk b/inputmethod/ibus/buildlink3.mk
index 194cc69b11c..12d07efb627 100644
--- a/inputmethod/ibus/buildlink3.mk
+++ b/inputmethod/ibus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2012/03/03 00:12:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2012/04/22 13:57:30 obache Exp $
 #
 
 BUILDLINK_TREE+=	ibus
@@ -6,13 +6,10 @@ BUILDLINK_TREE+=	ibus
 .if !defined(IBUS_BUILDLINK3_MK)
 IBUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ibus+=	ibus>=1.2.0.20091024
-BUILDLINK_ABI_DEPENDS.ibus+=	ibus>=1.3.9nb5
+BUILDLINK_API_DEPENDS.ibus+=	ibus>=1.4.0
 BUILDLINK_PKGSRCDIR.ibus?=	../../inputmethod/ibus
 
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .endif	# IBUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ibus
diff --git a/inputmethod/ibus/distinfo b/inputmethod/ibus/distinfo
index 7d5dfce2cf7..eaae5f911b5 100644
--- a/inputmethod/ibus/distinfo
+++ b/inputmethod/ibus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/11/25 10:55:43 obache Exp $
+$NetBSD: distinfo,v 1.4 2012/04/22 13:57:30 obache Exp $
 
-SHA1 (ibus-1.3.9.tar.gz) = 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138
-RMD160 (ibus-1.3.9.tar.gz) = 8cf8712d29369bb1934c0d9d66ce5f15953a60d0
-Size (ibus-1.3.9.tar.gz) = 1380081 bytes
+SHA1 (ibus-1.4.1.tar.gz) = 4cc045553885d35a118ec4b44c2694910209509e
+RMD160 (ibus-1.4.1.tar.gz) = 4003fc9392c59ce35048689aa50a941cfd151cff
+Size (ibus-1.4.1.tar.gz) = 1479412 bytes