Sun Aug 12 10:45:03 2018 UTC ()
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


(tsutsui)
diff -r1.56 -r1.57 pkgsrc/inputmethod/ibus/Makefile
diff -r1.12 -r1.13 pkgsrc/inputmethod/ibus/Makefile.common
diff -r1.11 -r1.12 pkgsrc/inputmethod/ibus/PLIST
diff -r1.19 -r1.20 pkgsrc/inputmethod/ibus/distinfo
diff -r1.1 -r1.2 pkgsrc/inputmethod/ibus/patches/patch-configure
diff -r0 -r1.1 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am
diff -r0 -r1.1 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in
diff -r0 -r1.1 pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_panelbinding.vala

cvs diff -r1.56 -r1.57 pkgsrc/inputmethod/ibus/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile 2018/05/25 16:41:58 1.56
+++ pkgsrc/inputmethod/ibus/Makefile 2018/08/12 10:45:03 1.57
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.56 2018/05/25 16:41:58 ryoon Exp $ 1# $NetBSD: Makefile,v 1.57 2018/08/12 10:45:03 tsutsui Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5COMMENT= Intelligent Input Bus 5COMMENT= Intelligent Input Bus
6 6
7DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 7DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
8BUILD_DEPENDS+= cldr-emoji-annotation>=33.0.0.1:../../textproc/cldr-emoji-annotation 8BUILD_DEPENDS+= cldr-emoji-annotation>=33.1.0.0:../../textproc/cldr-emoji-annotation
9BUILD_DEPENDS+= unicode-character-database-[0-9]*:../../textproc/unicode-character-database 9BUILD_DEPENDS+= unicode-character-database-[0-9]*:../../textproc/unicode-character-database
10BUILD_DEPENDS+= unicode-emoji-[0-9]*:../../textproc/unicode-emoji 10BUILD_DEPENDS+= unicode-emoji-[0-9]*:../../textproc/unicode-emoji
11 11
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14# XXX fails without GNU msgfmt 14# XXX fails without GNU msgfmt
15_TOOLS_USE_PKGSRC.msgfmt= yes 15_TOOLS_USE_PKGSRC.msgfmt= yes
16USE_TOOLS+= pkg-config intltool gmsgfmt gmake msgmerge 16USE_TOOLS+= pkg-config intltool gmsgfmt gmake msgmerge
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19 19
20GCONF_SCHEMAS+= ibus.schemas 20GCONF_SCHEMAS+= ibus.schemas
21PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in 21PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in

cvs diff -r1.12 -r1.13 pkgsrc/inputmethod/ibus/Makefile.common (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile.common 2018/04/28 01:40:07 1.12
+++ pkgsrc/inputmethod/ibus/Makefile.common 2018/08/12 10:45:03 1.13
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.common,v 1.12 2018/04/28 01:40:07 tsutsui Exp $ 1# $NetBSD: Makefile.common,v 1.13 2018/08/12 10:45:03 tsutsui Exp $
2# 2#
3# used by inputmethod/ibus/Makefile 3# used by inputmethod/ibus/Makefile
4# used by inputmethod/ibus-python/Makefile 4# used by inputmethod/ibus-python/Makefile
5 5
6DISTNAME= ibus-1.5.18 6DISTNAME= ibus-1.5.19
7CATEGORIES= inputmethod 7CATEGORIES= inputmethod
8MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/ 8MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
9 9
10DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo
11PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches 11PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://github.com/ibus/ibus/wiki 14HOMEPAGE= https://github.com/ibus/ibus/wiki
15LICENSE= gnu-lgpl-v2.1 15LICENSE= gnu-lgpl-v2.1

cvs diff -r1.11 -r1.12 pkgsrc/inputmethod/ibus/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/PLIST 2018/04/29 21:02:48 1.11
+++ pkgsrc/inputmethod/ibus/PLIST 2018/08/12 10:45:03 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.11 2018/04/29 21:02:48 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.12 2018/08/12 10:45:03 tsutsui Exp $
2bin/ibus 2bin/ibus
3bin/ibus-daemon 3bin/ibus-daemon
4bin/ibus-setup 4bin/ibus-setup
5include/ibus-1.0/ibus.h 5include/ibus-1.0/ibus.h
6include/ibus-1.0/ibusaccelgroup.h 6include/ibus-1.0/ibusaccelgroup.h
7include/ibus-1.0/ibusattribute.h 7include/ibus-1.0/ibusattribute.h
8include/ibus-1.0/ibusattrlist.h 8include/ibus-1.0/ibusattrlist.h
9include/ibus-1.0/ibusbus.h 9include/ibus-1.0/ibusbus.h
10include/ibus-1.0/ibuscomponent.h 10include/ibus-1.0/ibuscomponent.h
11include/ibus-1.0/ibusconfig.h 11include/ibus-1.0/ibusconfig.h
12include/ibus-1.0/ibusconfigservice.h 12include/ibus-1.0/ibusconfigservice.h
13include/ibus-1.0/ibusdebug.h 13include/ibus-1.0/ibusdebug.h
14include/ibus-1.0/ibusemoji.h 14include/ibus-1.0/ibusemoji.h
@@ -48,26 +48,28 @@ lib/gtk-3.0/3.0.0/immodules/im-ibus.la @@ -48,26 +48,28 @@ lib/gtk-3.0/3.0.0/immodules/im-ibus.la
48lib/libibus-1.0.la 48lib/libibus-1.0.la
49lib/pkgconfig/ibus-1.0.pc 49lib/pkgconfig/ibus-1.0.pc
50libexec/ibus-dconf 50libexec/ibus-dconf
51libexec/ibus-engine-simple 51libexec/ibus-engine-simple
52libexec/ibus-extension-gtk3 52libexec/ibus-extension-gtk3
53libexec/ibus-gconf 53libexec/ibus-gconf
54libexec/ibus-portal 54libexec/ibus-portal
55libexec/ibus-ui-emojier 55libexec/ibus-ui-emojier
56libexec/ibus-ui-gtk3 56libexec/ibus-ui-gtk3
57libexec/ibus-x11 57libexec/ibus-x11
58man/man1/ibus-daemon.1 58man/man1/ibus-daemon.1
59man/man1/ibus-setup.1 59man/man1/ibus-setup.1
60man/man1/ibus.1 60man/man1/ibus.1
 61man/man5/00-upstream-settings.5
 62man/man5/ibus.5
61man/man7/ibus-emoji.7 63man/man7/ibus-emoji.7
62share/GConf/gsettings/ibus.convert 64share/GConf/gsettings/ibus.convert
63share/applications/ibus-setup.desktop 65share/applications/ibus-setup.desktop
64share/applications/org.freedesktop.IBus.Panel.Emojier.desktop 66share/applications/org.freedesktop.IBus.Panel.Emojier.desktop
65share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop 67share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
66share/bash-completion/completions/ibus.bash 68share/bash-completion/completions/ibus.bash
67share/dbus-1/services/org.freedesktop.IBus.service 69share/dbus-1/services/org.freedesktop.IBus.service
68share/dbus-1/services/org.freedesktop.portal.IBus.service 70share/dbus-1/services/org.freedesktop.portal.IBus.service
69share/examples/ibus/dconf/db/ibus.d/00-upstream-settings 71share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
70share/examples/ibus/dconf/profile/ibus 72share/examples/ibus/dconf/profile/ibus
71share/gconf/schemas/ibus.schemas 73share/gconf/schemas/ibus.schemas
72share/gir-1.0/IBus-1.0.gir 74share/gir-1.0/IBus-1.0.gir
73share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml 75share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
@@ -203,26 +205,27 @@ share/ibus/dicts/emoji-pa.dict @@ -203,26 +205,27 @@ share/ibus/dicts/emoji-pa.dict
203share/ibus/dicts/emoji-pl.dict 205share/ibus/dicts/emoji-pl.dict
204share/ibus/dicts/emoji-ps.dict 206share/ibus/dicts/emoji-ps.dict
205share/ibus/dicts/emoji-pt.dict 207share/ibus/dicts/emoji-pt.dict
206share/ibus/dicts/emoji-pt_PT.dict 208share/ibus/dicts/emoji-pt_PT.dict
207share/ibus/dicts/emoji-ro.dict 209share/ibus/dicts/emoji-ro.dict
208share/ibus/dicts/emoji-root.dict 210share/ibus/dicts/emoji-root.dict
209share/ibus/dicts/emoji-ru.dict 211share/ibus/dicts/emoji-ru.dict
210share/ibus/dicts/emoji-sd.dict 212share/ibus/dicts/emoji-sd.dict
211share/ibus/dicts/emoji-si.dict 213share/ibus/dicts/emoji-si.dict
212share/ibus/dicts/emoji-sk.dict 214share/ibus/dicts/emoji-sk.dict
213share/ibus/dicts/emoji-sl.dict 215share/ibus/dicts/emoji-sl.dict
214share/ibus/dicts/emoji-sq.dict 216share/ibus/dicts/emoji-sq.dict
215share/ibus/dicts/emoji-sr.dict 217share/ibus/dicts/emoji-sr.dict
 218share/ibus/dicts/emoji-sr_Cyrl_BA.dict
216share/ibus/dicts/emoji-sr_Latn.dict 219share/ibus/dicts/emoji-sr_Latn.dict
217share/ibus/dicts/emoji-sv.dict 220share/ibus/dicts/emoji-sv.dict
218share/ibus/dicts/emoji-sw.dict 221share/ibus/dicts/emoji-sw.dict
219share/ibus/dicts/emoji-ta.dict 222share/ibus/dicts/emoji-ta.dict
220share/ibus/dicts/emoji-te.dict 223share/ibus/dicts/emoji-te.dict
221share/ibus/dicts/emoji-th.dict 224share/ibus/dicts/emoji-th.dict
222share/ibus/dicts/emoji-tk.dict 225share/ibus/dicts/emoji-tk.dict
223share/ibus/dicts/emoji-to.dict 226share/ibus/dicts/emoji-to.dict
224share/ibus/dicts/emoji-tr.dict 227share/ibus/dicts/emoji-tr.dict
225share/ibus/dicts/emoji-uk.dict 228share/ibus/dicts/emoji-uk.dict
226share/ibus/dicts/emoji-ur.dict 229share/ibus/dicts/emoji-ur.dict
227share/ibus/dicts/emoji-uz.dict 230share/ibus/dicts/emoji-uz.dict
228share/ibus/dicts/emoji-vi.dict 231share/ibus/dicts/emoji-vi.dict

cvs diff -r1.19 -r1.20 pkgsrc/inputmethod/ibus/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/distinfo 2018/04/28 01:40:07 1.19
+++ pkgsrc/inputmethod/ibus/distinfo 2018/08/12 10:45:03 1.20
@@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
1$NetBSD: distinfo,v 1.19 2018/04/28 01:40:07 tsutsui Exp $ 1$NetBSD: distinfo,v 1.20 2018/08/12 10:45:03 tsutsui Exp $
2 2
3SHA1 (ibus-1.5.18.tar.gz) = fad8dbc99f5bc55e03c7d9693cbbc6c1a211ae09 3SHA1 (ibus-1.5.19.tar.gz) = fdda025d81247e40ad7acf953c2a0a606d18e965
4RMD160 (ibus-1.5.18.tar.gz) = 457d97552256b7d8245c961ea84e5dc7cde737c6 4RMD160 (ibus-1.5.19.tar.gz) = 78f4511723e590cf2bfd906d3956780c951433d6
5SHA512 (ibus-1.5.18.tar.gz) = 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3 5SHA512 (ibus-1.5.19.tar.gz) = ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
6Size (ibus-1.5.18.tar.gz) = 2760121 bytes 6Size (ibus-1.5.19.tar.gz) = 2842274 bytes
7SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd 7SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd
8SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005 8SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
9SHA1 (patch-configure) = 4e41d54014a752e4aec7d995676f77d025b22448 9SHA1 (patch-configure) = 1fcb5684d91836f7b5daf5034d2836acb1589ba2
 10SHA1 (patch-ui_gtk3_Makefile.am) = 0a8f2b05f5f392dc9c8c4e997680f5f822a6a62b
 11SHA1 (patch-ui_gtk3_Makefile.in) = bc84d28327fd851b800ebe2652913ebdb0ed264c
 12SHA1 (patch-ui_gtk3_panelbinding.vala) = 3ce9a90a0a3558ab283bae866f561956a4407581

cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/ibus/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/patches/patch-configure 2018/04/28 01:40:07 1.1
+++ pkgsrc/inputmethod/ibus/patches/patch-configure 2018/08/12 10:45:03 1.2
@@ -1,16 +1,80 @@ @@ -1,16 +1,80 @@
1$NetBSD: patch-configure,v 1.1 2018/04/28 01:40:07 tsutsui Exp $ 1$NetBSD: patch-configure,v 1.2 2018/08/12 10:45:03 tsutsui Exp $
2 2
3* pull upstream fix: 3- pull upstream wayland fix:
4 https://github.com/ibus/ibus/commit/5788be80685f397c3db3bdf4e672d67cfb9b3433#diff-67e997bcfdac55191033d57a16d1408a 4 https://github.com/ibus/ibus/commit/aa0f4252ff965729b871c91b4ed089bf98963c0b
5 5
6--- configure.orig 2018-03-02 08:24:44.000000000 +0000 6--- configure.orig 2018-08-08 08:30:56.000000000 +0000
7+++ configure 7+++ configure
8@@ -20218,7 +20218,7 @@ fi 8@@ -814,6 +814,8 @@ WAYLAND_CFLAGS
 9 X11_PREFIX
 10 X11_LIBS
 11 X11_CFLAGS
 12+ENABLE_GDK3_WAYLAND_FALSE
 13+ENABLE_GDK3_WAYLAND_TRUE
 14 GTK3_LIBS
 15 GTK3_CFLAGS
 16 GTK2_LIBS
 17@@ -17187,13 +17189,36 @@ else
 18 $as_echo "yes" >&6; }
9  19
10 # Check whether --with-ucd-dir was given. 20 fi
11 if test "${with_ucd_dir+set}" = set; then : 21+ if test -n "$PKG_CONFIG" && \
12- withval=$with_ucd_dir; UCD_DIR=$with_emoji_annotation_dir 22+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-wayland-3.0\""; } >&5
13+ withval=$with_ucd_dir; UCD_DIR=$with_ucd_dir 23+ ($PKG_CONFIG --exists --print-errors "gdk-wayland-3.0") 2>&5
 24+ ac_status=$?
 25+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 26+ test $ac_status = 0; }; then
 27+ enable_gdk3_wayland=yes
 28+else
 29+ enable_gdk3_wayland=no
 30+
 31+fi
 32
 33 gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
 34 GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
14 else 35 else
15 UCD_DIR="/usr/share/unicode/ucd" 36 enable_gtk3="no (disabled, use --enable-gtk3 to enable)"
 37+ enable_gdk3_wayland=no
 38+fi
 39+if test x"$enable_gdk3_wayland" != x"yes"; then
 40+ enable_gdk3_wayland="no (disabled, need to install gdk-wayland-3.0.pc)"
 41+fi
 42+ if test x"$enable_gdk3_wayland" = x"yes"; then
 43+ ENABLE_GDK3_WAYLAND_TRUE=
 44+ ENABLE_GDK3_WAYLAND_FALSE='#'
 45+else
 46+ ENABLE_GDK3_WAYLAND_TRUE='#'
 47+ ENABLE_GDK3_WAYLAND_FALSE=
 48 fi
 49
 50+
 51 if test x"$enable_xim" = x"yes"; then
 52 # Check for x11
16  53
 54@@ -20656,6 +20681,10 @@ if test -z "${ENABLE_APPINDICATOR_TRUE}"
 55 as_fn_error $? "conditional \"ENABLE_APPINDICATOR\" was never defined.
 56 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 57 fi
 58+if test -z "${ENABLE_GDK3_WAYLAND_TRUE}" && test -z "${ENABLE_GDK3_WAYLAND_FALSE}"; then
 59+ as_fn_error $? "conditional \"ENABLE_GDK3_WAYLAND\" was never defined.
 60+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 61+fi
 62 if test -z "${ENABLE_APPINDICATOR_ENGINE_ICON_TRUE}" && test -z "${ENABLE_APPINDICATOR_ENGINE_ICON_FALSE}"; then
 63 as_fn_error $? "conditional \"ENABLE_APPINDICATOR_ENGINE_ICON\" was never defined.
 64 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 65@@ -22993,6 +23022,7 @@ Build options:
 66 Build gtk3 immodule $enable_gtk3
 67 Build XIM agent server $enable_xim
 68 Build wayland support $enable_wayland
 69+ Build gdk3 wayland support $enable_gdk3_wayland
 70 Build appindicator support $enable_appindicator
 71 Build appindicator engine icon $enable_appindicator_engine_icon
 72 Build python library $enable_python_library
 73@@ -23033,6 +23063,7 @@ Build options:
 74 Build gtk3 immodule $enable_gtk3
 75 Build XIM agent server $enable_xim
 76 Build wayland support $enable_wayland
 77+ Build gdk3 wayland support $enable_gdk3_wayland
 78 Build appindicator support $enable_appindicator
 79 Build appindicator engine icon $enable_appindicator_engine_icon
 80 Build python library $enable_python_library

File Added: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.am
$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 = \

File Added: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_Makefile.in
$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)

File Added: pkgsrc/inputmethod/ibus/patches/Attic/patch-ui_gtk3_panelbinding.vala
$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;