ibus, ibus-python: update to 1.5.19.

pkgsrc changes:
- pull upstream fixes for issue #2035 (check wayland during configure)
- explicitly require cldr-emoji-annotation 33.1.0.0 or higher to sync
  emoji dict files in ibus/PLIST

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

1.5.19

This release moves typing emoji annotation on the emoji dialog to the pre-edit
on each application and also isolates Ctrl-Shift-u from Ctrl-Shift-e again upon
the several requests. The shortcut keys can be customized with ibus-setup
utility.
Also pre-edit of compose keys are now enabled.
Also IBUS_DISCARD_PASSWORD environment variable is now available as the
workaround of password popup in firefox and chrome.

env IBUS_DISCARD_PASSWORD=1 firefox
or
export IBUS_DISCARD_PASSWORD_APPS='firefox,.*chrome.*'

can discard typing characters on the password entries.

Emoji features:
Move input focus on Emojier to engines' preedit 5ee3f48
ui/gtk3: Show previous emojis with "history" annotation dc5e7ee
ui/gtk3: Add num pad Enter, Down, Up, Left, Right on Emojier c6439d7
ui/gtk3: Get PangoAttrList of auxiliary text from IBusText a1f91b2
up/gtk3: Emoji misc updats 3280848 d8f901f cf4e2f1 7cef5bf caffeae
src: Fix SEGV in IBusEngine if no emoji shortcut keys 886ad36

Compose key features:
ibusenginesimple: Enable preedit for compose keys f9e3035 3a68ded

Test cases:
src: Add ibus-keypress test case 196216a
tests: Added an automation testing on console 32f2f2b
configure: Add --disable-python2 option 8d4c473
tools: Add ibus read-config --engine-id option for engine schemas ddc2284
data/dconf: Add man pages of 00-upstream-settings(5) and ibus(5) 5f44e73

Bug fixes:
client/gtk2: Add IBUS_DISCARD_PASSWORD for firefox and chrome f328fd6
Fix build errors 75a6667 68e162a b184861 c360cbd 68bd269 7bc160f 10cc30e
 37aa95f 8d302c8 428e64e 2695708 5db6e7b b94e8f2 8ab0b60
Fix ucd directory override (Jeremy Bicha) 5788be8
src: Make the call to chmod in ibus_bus_init conditional (Olivier Tilloy)
 28d0c1d
Remove a misleading "const" modifier of a return value (Takuro Ashie) 6b47e41
bus: warn deprecated --mem-profile option (Kentaro Hayashi) 0dde239
option --monitor-timeout should be removed (Ryutaroh Matsumoto) be7554c

New release:
Update translations c8a9994 999aee3
Release 1.5.19 fd9d4a9

8 files changed, 195 insertions, 21 deletions

diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile
index 830f81d819d..3630d3729cc 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.56 2018/05/25 16:41:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.57 2018/08/12 10:45:03 tsutsui Exp $
 
 .include "Makefile.common"
 
 COMMENT=	Intelligent Input Bus
 
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-BUILD_DEPENDS+=	cldr-emoji-annotation>=33.0.0.1:../../textproc/cldr-emoji-annotation
+BUILD_DEPENDS+=	cldr-emoji-annotation>=33.1.0.0:../../textproc/cldr-emoji-annotation
 BUILD_DEPENDS+=	unicode-character-database-[0-9]*:../../textproc/unicode-character-database
 BUILD_DEPENDS+=	unicode-emoji-[0-9]*:../../textproc/unicode-emoji
 
diff --git a/inputmethod/ibus/Makefile.common b/inputmethod/ibus/Makefile.common
index 39259f06236..89996e59373 100644
--- a/inputmethod/ibus/Makefile.common
+++ b/inputmethod/ibus/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2018/04/28 01:40:07 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.13 2018/08/12 10:45:03 tsutsui Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=	ibus-1.5.18
+DISTNAME=	ibus-1.5.19
 CATEGORIES=	inputmethod
 MASTER_SITES=	https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
 
diff --git a/inputmethod/ibus/PLIST b/inputmethod/ibus/PLIST
index 385bb25c677..74e7b3b22f2 100644
--- a/inputmethod/ibus/PLIST
+++ b/inputmethod/ibus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2018/04/29 21:02:48 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/08/12 10:45:03 tsutsui Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -58,6 +58,8 @@ libexec/ibus-x11
 man/man1/ibus-daemon.1
 man/man1/ibus-setup.1
 man/man1/ibus.1
+man/man5/00-upstream-settings.5
+man/man5/ibus.5
 man/man7/ibus-emoji.7
 share/GConf/gsettings/ibus.convert
 share/applications/ibus-setup.desktop
@@ -213,6 +215,7 @@ share/ibus/dicts/emoji-sk.dict
 share/ibus/dicts/emoji-sl.dict
 share/ibus/dicts/emoji-sq.dict
 share/ibus/dicts/emoji-sr.dict
+share/ibus/dicts/emoji-sr_Cyrl_BA.dict
 share/ibus/dicts/emoji-sr_Latn.dict
 share/ibus/dicts/emoji-sv.dict
 share/ibus/dicts/emoji-sw.dict
diff --git a/inputmethod/ibus/distinfo b/inputmethod/ibus/distinfo
index 908a8c79d0b..ec20f177a65 100644
--- a/inputmethod/ibus/distinfo
+++ b/inputmethod/ibus/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.19 2018/04/28 01:40:07 tsutsui Exp $
+$NetBSD: distinfo,v 1.20 2018/08/12 10:45:03 tsutsui Exp $
 
-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 (ibus-1.5.19.tar.gz) = fdda025d81247e40ad7acf953c2a0a606d18e965
+RMD160 (ibus-1.5.19.tar.gz) = 78f4511723e590cf2bfd906d3956780c951433d6
+SHA512 (ibus-1.5.19.tar.gz) = ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
+Size (ibus-1.5.19.tar.gz) = 2842274 bytes
 SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd
 SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
-SHA1 (patch-configure) = 4e41d54014a752e4aec7d995676f77d025b22448
+SHA1 (patch-configure) = 1fcb5684d91836f7b5daf5034d2836acb1589ba2
+SHA1 (patch-ui_gtk3_Makefile.am) = 0a8f2b05f5f392dc9c8c4e997680f5f822a6a62b
+SHA1 (patch-ui_gtk3_Makefile.in) = bc84d28327fd851b800ebe2652913ebdb0ed264c
+SHA1 (patch-ui_gtk3_panelbinding.vala) = 3ce9a90a0a3558ab283bae866f561956a4407581
diff --git a/inputmethod/ibus/patches/patch-configure b/inputmethod/ibus/patches/patch-configure
index 3e542f35a54..957fae8c4a7 100644
--- a/inputmethod/ibus/patches/patch-configure
+++ b/inputmethod/ibus/patches/patch-configure
@@ -1,16 +1,80 @@
-$NetBSD: patch-configure,v 1.1 2018/04/28 01:40:07 tsutsui Exp $
+$NetBSD: patch-configure,v 1.2 2018/08/12 10:45:03 tsutsui Exp $
 
-* pull upstream fix:
- https://github.com/ibus/ibus/commit/5788be80685f397c3db3bdf4e672d67cfb9b3433#diff-67e997bcfdac55191033d57a16d1408a
+- pull upstream wayland fix:
+ https://github.com/ibus/ibus/commit/aa0f4252ff965729b871c91b4ed089bf98963c0b
 
---- configure.orig	2018-03-02 08:24:44.000000000 +0000
+--- configure.orig	2018-08-08 08:30:56.000000000 +0000
 +++ configure
-@@ -20218,7 +20218,7 @@ fi
+@@ -814,6 +814,8 @@ WAYLAND_CFLAGS
+ X11_PREFIX
+ X11_LIBS
+ X11_CFLAGS
++ENABLE_GDK3_WAYLAND_FALSE
++ENABLE_GDK3_WAYLAND_TRUE
+ GTK3_LIBS
+ GTK3_CFLAGS
+ GTK2_LIBS
+@@ -17187,13 +17189,36 @@ else
+ $as_echo "yes" >&6; }
  
- # 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
+ fi
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-wayland-3.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gdk-wayland-3.0") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  enable_gdk3_wayland=yes
++else
++  enable_gdk3_wayland=no
++
++fi
+ 
+     gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
+     GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
  else
-   UCD_DIR="/usr/share/unicode/ucd"
+     enable_gtk3="no (disabled, use --enable-gtk3 to enable)"
++    enable_gdk3_wayland=no
++fi
++if test x"$enable_gdk3_wayland" != x"yes"; then
++    enable_gdk3_wayland="no (disabled, need to install gdk-wayland-3.0.pc)"
++fi
++ if test x"$enable_gdk3_wayland" = x"yes"; then
++  ENABLE_GDK3_WAYLAND_TRUE=
++  ENABLE_GDK3_WAYLAND_FALSE='#'
++else
++  ENABLE_GDK3_WAYLAND_TRUE='#'
++  ENABLE_GDK3_WAYLAND_FALSE=
+ fi
+ 
++
+ if test x"$enable_xim" = x"yes"; then
+     # Check for x11
  
+@@ -20656,6 +20681,10 @@ if test -z "${ENABLE_APPINDICATOR_TRUE}"
+   as_fn_error $? "conditional \"ENABLE_APPINDICATOR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${ENABLE_GDK3_WAYLAND_TRUE}" && test -z "${ENABLE_GDK3_WAYLAND_FALSE}"; then
++  as_fn_error $? "conditional \"ENABLE_GDK3_WAYLAND\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${ENABLE_APPINDICATOR_ENGINE_ICON_TRUE}" && test -z "${ENABLE_APPINDICATOR_ENGINE_ICON_FALSE}"; then
+   as_fn_error $? "conditional \"ENABLE_APPINDICATOR_ENGINE_ICON\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -22993,6 +23022,7 @@ Build options:
+   Build gtk3 immodule           $enable_gtk3
+   Build XIM agent server        $enable_xim
+   Build wayland support         $enable_wayland
++  Build gdk3 wayland support    $enable_gdk3_wayland
+   Build appindicator support    $enable_appindicator
+   Build appindicator engine icon $enable_appindicator_engine_icon
+   Build python library          $enable_python_library
+@@ -23033,6 +23063,7 @@ Build options:
+   Build gtk3 immodule           $enable_gtk3
+   Build XIM agent server        $enable_xim
+   Build wayland support         $enable_wayland
++  Build gdk3 wayland support    $enable_gdk3_wayland
+   Build appindicator support    $enable_appindicator
+   Build appindicator engine icon $enable_appindicator_engine_icon
+   Build python library          $enable_python_library
diff --git a/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am b/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am
new file mode 100644
index 00000000000..9bcd3c2ab63
--- /dev/null
+++ b/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am
@@ -0,0 +1,26 @@
+$NetBSD: patch-ui_gtk3_Makefile.am,v 1.1 2018/08/12 10:45:03 tsutsui Exp $
+
+- pull upstream wayland fix:
+ https://github.com/ibus/ibus/commit/aa0f4252ff965729b871c91b4ed089bf98963c0b
+
+--- ui/gtk3/Makefile.am.orig	2018-08-08 08:29:14.000000000 +0000
++++ ui/gtk3/Makefile.am
+@@ -78,7 +78,6 @@ AM_VALAFLAGS = \
+ 	--pkg=ibus-1.0 \
+ 	--pkg=config \
+ 	--pkg=xi \
+-	--pkg=gdk-wayland \
+ 	--target-glib="$(VALA_TARGET_GLIB_VERSION)" \
+ 	$(NULL)
+ 
+@@ -105,6 +104,10 @@ if ENABLE_APPINDICATOR_ENGINE_ICON
+ AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON
+ endif
+ 
++if ENABLE_GDK3_WAYLAND
++AM_VALAFLAGS += --pkg=gdk-wayland --define=USE_GDK_WAYLAND
++endif
++
+ libexec_PROGRAMS = ibus-ui-gtk3
+ 
+ ibus_ui_gtk3_SOURCES = \
diff --git a/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in b/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in
new file mode 100644
index 00000000000..4083d768d63
--- /dev/null
+++ b/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in
@@ -0,0 +1,56 @@
+$NetBSD: patch-ui_gtk3_Makefile.in,v 1.1 2018/08/12 10:45:03 tsutsui Exp $
+
+- pull upstream wayland fix:
+ https://github.com/ibus/ibus/commit/aa0f4252ff965729b871c91b4ed089bf98963c0b
+
+--- ui/gtk3/Makefile.in.orig	2018-08-08 08:31:04.000000000 +0000
++++ ui/gtk3/Makefile.in
+@@ -127,12 +127,13 @@ host_triplet = @host@
+ 
+ @ENABLE_APPINDICATOR_TRUE@am__append_4 = --define=INDICATOR
+ @ENABLE_APPINDICATOR_ENGINE_ICON_TRUE@am__append_5 = --define=INDICATOR_ENGINE_ICON
++@ENABLE_GDK3_WAYLAND_TRUE@am__append_6 = --pkg=gdk-wayland --define=USE_GDK_WAYLAND
+ libexec_PROGRAMS = ibus-ui-gtk3$(EXEEXT) $(am__EXEEXT_1)
+-@ENABLE_EMOJI_DICT_TRUE@am__append_6 = --define=EMOJI_DICT
+-@ENABLE_EMOJI_DICT_TRUE@am__append_7 = ibus-ui-emojier \
++@ENABLE_EMOJI_DICT_TRUE@am__append_7 = --define=EMOJI_DICT
++@ENABLE_EMOJI_DICT_TRUE@am__append_8 = ibus-ui-emojier \
+ @ENABLE_EMOJI_DICT_TRUE@	ibus-extension-gtk3
+-@ENABLE_EMOJI_DICT_TRUE@am__append_8 = gtkextension.xml
+-@ENABLE_EMOJI_DICT_TRUE@am__append_9 = gtkextension.xml \
++@ENABLE_EMOJI_DICT_TRUE@am__append_9 = gtkextension.xml
++@ENABLE_EMOJI_DICT_TRUE@am__append_10 = gtkextension.xml \
+ @ENABLE_EMOJI_DICT_TRUE@	$(desktop_DATA) $(desktop_in_files) \
+ @ENABLE_EMOJI_DICT_TRUE@	$(man_seven_DATA) $(man_seven_files) \
+ @ENABLE_EMOJI_DICT_TRUE@	$(NULL)
+@@ -577,7 +578,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NULL = 
+ libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
+-component_DATA = gtkpanel.xml $(NULL) $(am__append_8)
++component_DATA = gtkpanel.xml $(NULL) $(am__append_9)
+ componentdir = $(pkgdatadir)/component
+ 
+ # force include config.h before gi18n.h.
+@@ -598,10 +599,9 @@ AM_LDADD = @GOBJECT2_LIBS@ @GLIB2_LIBS@ 
+ AM_VALAFLAGS = --vapidir=$(top_builddir)/bindings/vala \
+ 	--vapidir=$(top_srcdir)/bindings/vala --pkg=posix \
+ 	--pkg=gtk+-3.0 --pkg=gdk-x11-3.0 --pkg=ibus-1.0 --pkg=config \
+-	--pkg=xi --pkg=gdk-wayland \
+-	--target-glib="$(VALA_TARGET_GLIB_VERSION)" $(NULL) \
++	--pkg=xi --target-glib="$(VALA_TARGET_GLIB_VERSION)" $(NULL) \
+ 	$(am__append_3) $(am__append_4) $(am__append_5) \
+-	$(am__append_6)
++	$(am__append_6) $(am__append_7)
+ ibus_ui_gtk3_SOURCES = \
+ 	application.vala \
+ 	bindingcommon.vala \
+@@ -627,7 +627,7 @@ ibus_ui_gtk3_LDADD = \
+ 	$(AM_LDADD) \
+ 	$(NULL)
+ 
+-CLEANFILES = gtkpanel.xml $(NULL) $(am__append_9)
++CLEANFILES = gtkpanel.xml $(NULL) $(am__append_10)
+ emoji_headers = \
+     ibusemojidialog.h   \
+     $(NULL)
diff --git a/inputmethod/ibus/patches/patch-ui_gtk3_panelbinding.vala b/inputmethod/ibus/patches/patch-ui_gtk3_panelbinding.vala
new file mode 100644
index 00000000000..93e394459c4
--- /dev/null
+++ b/inputmethod/ibus/patches/patch-ui_gtk3_panelbinding.vala
@@ -0,0 +1,22 @@
+$NetBSD: patch-ui_gtk3_panelbinding.vala,v 1.1 2018/08/12 10:45:03 tsutsui Exp $
+
+- pull upstream wayland fix:
+ https://github.com/ibus/ibus/commit/aa0f4252ff965729b871c91b4ed089bf98963c0b
+
+--- ui/gtk3/panelbinding.vala.orig	2018-08-08 08:29:14.000000000 +0000
++++ ui/gtk3/panelbinding.vala
+@@ -237,9 +237,14 @@ class PanelBinding : IBus.PanelService {
+         GLib.Object(connection : bus.get_connection(),
+                     object_path : IBus.PATH_PANEL_EXTENSION_EMOJI);
+ 
++#if USE_GDK_WAYLAND
+         Type instance_type = Gdk.Display.get_default().get_type();
+         Type wayland_type = typeof(GdkWayland.Display);
+         m_is_wayland = instance_type.is_a(wayland_type);
++#else
++        m_is_wayland = false;
++        warning("Checking Wayland is disabled");
++#endif
+ 
+         m_bus = bus;
+         m_application = application;