ibus, ibus-python: update to 1.5.18.

pkgsrc changes:
- explicitly specify USE_TOOLS+=gmsgfmt to handle msgfmt --desktop
- pull an upstream change to fix a configure bug in 1.5.18
- use a new unicode character database

Upstream changes (from https://github.com/ibus/ibus/releases):

1.5.18

* tools: Do not change keymaps with 'use-system-keyboard-layout' c360818
* src: Fix GVariant leaks (Carlos Garnacho) 1cbe867
* src: Added some error handlings from a code review f5e0752
* src: Add libgobject.so to LDADD for Debian libtool (Danny) a28fa74
* src: Reintroduce the hex mode keybind with an environment variable
  (Aaron Muir Hamilton) 88b9a93
* ui/gtk3: Translate input method name in ibus (Peng Wu) 0ab0dd3
* Added DBus filtering against malware bfe57d2
* Implement Unicode choice on Emojier e17c998 4cfd5ad d1ebb3d fc54b0c afe60c1
* Implement ibus-extension-gtk3 for the global keybinding fb07f64 c57b7c3
* Disable panel extension for 'gdm' and 'liveuser' user 7ccbd21 ece320b
* ui/gtk3: Set title string in gnome-shell 56c67b1
* Add ISSUE_TEMPLATE ff611a4 9f2699c
* Updated translations 366963d 73b420f

5 files changed, 38 insertions, 11 deletions

diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile
index 825ba961f78..8b1308c1a65 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.52 2018/04/16 14:34:43 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2018/04/28 01:40:07 tsutsui Exp $
 
-PKGREVISION= 4
 .include "Makefile.common"
 
 COMMENT=	Intelligent Input Bus
 
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 BUILD_DEPENDS+=	cldr-emoji-annotation-[0-9]*:../../textproc/cldr-emoji-annotation
+BUILD_DEPENDS+=	unicode-character-database-[0-9]*:../../textproc/unicode-character-database
 BUILD_DEPENDS+=	unicode-emoji-[0-9]*:../../textproc/unicode-emoji
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config intltool msgfmt gmake
+USE_TOOLS+=	pkg-config intltool gmsgfmt gmake
 USE_LANGUAGES=	c c++
 USE_PKGLOCALEDIR=	yes
 
@@ -29,6 +29,7 @@ CONFIGURE_ARGS+=	--enable-introspection=yes
 CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
 CONFIGURE_ARGS+=	--with-unicode-emoji-dir=${PREFIX}/share/unicode/emoji
 CONFIGURE_ARGS+=	--with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations
+CONFIGURE_ARGS+=	--with-ucd-dir=${PREFIX}/share/unicode/ucd
 
 SUBST_CLASSES+=		dbus
 SUBST_STAGE.dbus=	post-configure
diff --git a/inputmethod/ibus/Makefile.common b/inputmethod/ibus/Makefile.common
index ad948ba065e..39259f06236 100644
--- a/inputmethod/ibus/Makefile.common
+++ b/inputmethod/ibus/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.11 2017/11/05 04:19:15 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.12 2018/04/28 01:40:07 tsutsui Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=	ibus-1.5.17
+DISTNAME=	ibus-1.5.18
 CATEGORIES=	inputmethod
 MASTER_SITES=	https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
 
diff --git a/inputmethod/ibus/PLIST b/inputmethod/ibus/PLIST
index 04e10850fa4..aeb286e433f 100644
--- a/inputmethod/ibus/PLIST
+++ b/inputmethod/ibus/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2017/11/05 04:19:15 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/04/28 01:40:07 tsutsui Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
 include/ibus-1.0/ibus.h
+include/ibus-1.0/ibusaccelgroup.h
 include/ibus-1.0/ibusattribute.h
 include/ibus-1.0/ibusattrlist.h
 include/ibus-1.0/ibusbus.h
@@ -36,8 +37,10 @@ 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/ibusunicode.h
 include/ibus-1.0/ibusutil.h
 include/ibus-1.0/ibusversion.h
+include/ibus-1.0/ibusxevent.h
 include/ibus-1.0/ibusxml.h
 lib/girepository-1.0/IBus-1.0.typelib
 lib/gtk-2.0/2.10.0/immodules/im-ibus.la
@@ -46,6 +49,7 @@ lib/libibus-1.0.la
 lib/pkgconfig/ibus-1.0.pc
 libexec/ibus-dconf
 libexec/ibus-engine-simple
+libexec/ibus-extension-gtk3
 libexec/ibus-gconf
 libexec/ibus-portal
 libexec/ibus-ui-emojier
@@ -57,6 +61,8 @@ man/man1/ibus.1
 man/man7/ibus-emoji.7
 share/GConf/gsettings/ibus.convert
 share/applications/ibus-setup.desktop
+share/applications/org.freedesktop.IBus.Panel.Emojier.desktop
+share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
 share/bash-completion/completions/ibus.bash
 share/dbus-1/services/org.freedesktop.IBus.service
 share/dbus-1/services/org.freedesktop.portal.IBus.service
@@ -119,6 +125,7 @@ share/gtk-doc/html/ibus/up-insensitive.png
 share/gtk-doc/html/ibus/up.png
 share/ibus/component/dconf.xml
 share/ibus/component/gconf.xml
+share/ibus/component/gtkextension.xml
 share/ibus/component/gtkpanel.xml
 share/ibus/component/simple.xml
 share/ibus/dicts/emoji-af.dict
@@ -204,6 +211,8 @@ share/ibus/dicts/emoji-vi.dict
 share/ibus/dicts/emoji-zh.dict
 share/ibus/dicts/emoji-zh_Hant.dict
 share/ibus/dicts/emoji-zu.dict
+share/ibus/dicts/unicode-blocks.dict
+share/ibus/dicts/unicode-names.dict
 share/ibus/keymaps/common
 share/ibus/keymaps/in
 share/ibus/keymaps/jp
diff --git a/inputmethod/ibus/distinfo b/inputmethod/ibus/distinfo
index ec4ca3cb73f..908a8c79d0b 100644
--- a/inputmethod/ibus/distinfo
+++ b/inputmethod/ibus/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.18 2017/11/05 04:19:15 tsutsui Exp $
+$NetBSD: distinfo,v 1.19 2018/04/28 01:40:07 tsutsui Exp $
 
-SHA1 (ibus-1.5.17.tar.gz) = 2e2039757d7e8e60f4101b8d197b6fb972f2e787
-RMD160 (ibus-1.5.17.tar.gz) = cc622a536cc3cce572c16f751203f87c8ed5ba08
-SHA512 (ibus-1.5.17.tar.gz) = 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
-Size (ibus-1.5.17.tar.gz) = 2522960 bytes
+SHA1 (ibus-1.5.18.tar.gz) = fad8dbc99f5bc55e03c7d9693cbbc6c1a211ae09
+RMD160 (ibus-1.5.18.tar.gz) = 457d97552256b7d8245c961ea84e5dc7cde737c6
+SHA512 (ibus-1.5.18.tar.gz) = 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
+Size (ibus-1.5.18.tar.gz) = 2760121 bytes
 SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd
 SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
+SHA1 (patch-configure) = 4e41d54014a752e4aec7d995676f77d025b22448
diff --git a/inputmethod/ibus/patches/patch-configure b/inputmethod/ibus/patches/patch-configure
new file mode 100644
index 00000000000..3e542f35a54
--- /dev/null
+++ b/inputmethod/ibus/patches/patch-configure
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.1 2018/04/28 01:40:07 tsutsui Exp $
+
+* pull upstream fix:
+ https://github.com/ibus/ibus/commit/5788be80685f397c3db3bdf4e672d67cfb9b3433#diff-67e997bcfdac55191033d57a16d1408a
+
+--- configure.orig	2018-03-02 08:24:44.000000000 +0000
++++ configure
+@@ -20218,7 +20218,7 @@ fi
+ 
+ # Check whether --with-ucd-dir was given.
+ if test "${with_ucd_dir+set}" = set; then :
+-  withval=$with_ucd_dir; UCD_DIR=$with_emoji_annotation_dir
++  withval=$with_ucd_dir; UCD_DIR=$with_ucd_dir
+ else
+   UCD_DIR="/usr/share/unicode/ucd"
+