ibus, ibus-python: update to 1.5.17. PR pkg/52694

pkgsrc changes:
* handle emoji-dict support in CONFIGURE_ARGS
* de-fuzz patches

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

1.5.17

* ui/gtk3: Emojier supports Ctrl-c,v,x and Ctrl-Shift-c 081d09f
* Make all emoji dicts for fully qualified ad80999
* ui/gtk3: Fix SEGV of Emojier on de_DE.UTF-8 bc0f913
* ui/gtk3: Do not activate emoji cells on mouse until mouse moves 98f70ee
* ui/gtk3: Fix SEGV of XKeysymToKeycode() on Wayland 91bebf0
* client/gtk2: include the scaling factor in Wayland (Xiang Fan) 6a3301d
* Implement ibus portal (Alexander Larsson) 203a3df 35ce624 9772e80 9937a0e
    3e01bab
* ui/gtk3: Switcher should ignore mouse until it moves d788918
* client/gtk2: Do not send key events to GtkIMContextSimple bbfb3d7 d784e04
* ui/gtk3: Fix PropertyPanel position in workarea 0632cbb
* ui/gtk3: Fix to enable menu button on PropertyPanel 4a54163
* ui/gtk3: Increase timeout of window filter in PropertyPanel 53d1f9e
* ui/gtk3: Unset GDK_CORE_DEVICE_EVENTS d37c8bb
* ui/gtk3: Unref Panel and Indicator when double panels run dfe21a2
* Fix a typo in configure.ac (Felix Yan) e6bab7a
* Typo fix (Mario Bodemann) c1b93f9
* Fix build issues 4fe3050 21bac47 79aebc5
* engine: Add Malay and Mongolian keymaps 44d0535
* Update translations 8cb149b 56b5126

1.5.16

* Implement shortcut keys on emoji dialog 58f6140
* Move language setting from IBusEmojier to ibus-setup 0efb1c5
* Works ibus emoji command for Wayland (Peng Wu) 648f58a 2f8982a da33672
    290f786 aba81ac 61fa8ea
* Enable to type multiple code points on Emojier 8b6f9fa
* Emoji misc enhancements. 9dbea34 31ed31e c580845 fbe3de1 50e344a cb0a36c
    4b8d7ba edcb4a0 1159093 0836c3f 086fc54
* Change emoji modal dialog to focused dialog c6cdf21
* Change to use Unicode Emoji files instead of EmojiOne files 2f73064
* Add ibus-emoji man mapge 5f653d3 f6c2e2d
* Make more readable error messages if emoji xml files are missed bd7e0ba
    1643007
* Fix IBusEmojiDialog_1_0_gir_LIBS for --as-needed LDFLAGS c3168d4
* bus: Add error messages for g_dbus_server_new_sync 4e02857
* tools: Fix ibus emoji SEGV when language is changed. 7e477d5
* client/x11: Add XSetIOErrorHandler() for GNOME3 desktop ab6c38c
* Update translations 21e6c00
* Release 1.5.16 ccc602d

You can get Unicode emoji files from http://www.unicode.org/Public/emoji/4.0/
or Fedora provides unicode-emoji package. The version 4.0 is recommended since
5.0 is not released officially yet.
You can get emoji annotation files from https://github.com/fujiwarat/
cldr-emoji-annotation or Fedora provides cldr-emoji-annotation package.

1.5.15

* Fix GVariant leaks (Eric R. Schulz) 997e5cb
* ui/gtk3: Fix radio buttons on Property Panel ceb6a9b
* Update translations 708e5e5
* Fix warning messages during panel resizes af66ace
* src: Hide lookup table if emoji annotation does not hit e795eda
* src: Enable to type digit to commit emoji on lookup window 4d86e59
* src: Enable PageUp, PageDown, CandidateClick buttons with emoji lookup
    faf5e3c
* ui/gtk3: support scroll event in candidates panel (Peng Wu) 52b7272
* src: Avoid emoji typing during Unicode typing f80dcc9
* ui/gtk3: Fix panel CSS format for GTK 3.22 aacf5ad
* util/IMdkit: Fix the range of memset() in i18nIc.c 371535b
* ui/gtk3: Refactor color of a selected candidate on lookup window bdc83bc
* ui/gtk3: Free normal_color in CandidateArea b8f5553
* ui/gtk3: Refactor to set panel icon b498ff5
* ui/gtk3: Fix typo in switcher.get_input_context_path() fcb90f7
* bus: fix service file when --disable-xim is specified (Marc-Antoine
    Perennou) 993289f
* Fix memory leak in IBus.Bus.get_global_engine() (Eric R. Schulz) 0a24481
* Move emoji implementation from IBusEngineSimple to IBusPanel 02d99aa
* setup: Set emoji preview text on font setting 13bf503
* Add 'ibus emoji' command for no ibus panel desktops c37989a
* Release 1.5.15 f7f3bc8
* Fix a build failure with --disable-emoji-dict 641c3cb

You can get emoji.json with npm install -g emojione or Fedora provides
nodejs-emojione-json package.
You can get emoji annotation files from https://github.com/fujiwarat/
cldr-emoji-annotation or Fedora provides cldr-emoji-annotation package.

1.5.14

* Don't warn if DISPLAY is not set (Matthias Clasen) 0432aa6
* Install a DBus service file (Rui Matos) 84c18f1
* configure: don't hardcode pkg-config (Marc-Antoine Perennou) b210c0d
* conf/gconf: Fix SEGV in ibus_config_gconf_get_values a186059
* client/gtk2: Fix SEGV with Wayland display 3ef21fe
* ui/gtk3: Fix panel CSS format for GTK 3.20 a598ae2
* engine: Implement Emoji typing with XKB engines 160d3c9
* engine: Add emoji-list.html 0ed644c
* engine: Use annotations/en.xml from unocode.org but not emoji-list.html
    0ee1896
* Fix typo in configure.ac f88c487
* tests/ibus-engine-switch: Don't try to remove non-existing GSource 20068d9
* Fix make dist eee7a13
* Fix Croatian language code in simple.xml 028624f
* Replace deprecated GSimpleAsyncResult with GTask since GLib 2.46 239d363

You can get emoji.json with npm install -g emojione or Fedora provides
nodejs-emojione-json package.

6 files changed, 123 insertions, 25 deletions

diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile
index 68f78629e65..31e44a500e1 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.47 2017/02/12 06:25:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2017/11/05 04:19:15 tsutsui Exp $
 
-PKGREVISION= 3
 .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-emoji-[0-9]*:../../textproc/unicode-emoji
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -25,6 +26,8 @@ CONFIGURE_ARGS+=	--enable-gtk3
 CONFIGURE_ARGS+=	--enable-surrounding-text
 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
 
 SUBST_CLASSES+=		dbus
 SUBST_STAGE.dbus=	post-configure
diff --git a/inputmethod/ibus/Makefile.common b/inputmethod/ibus/Makefile.common
index 1aeddfc790f..ad948ba065e 100644
--- a/inputmethod/ibus/Makefile.common
+++ b/inputmethod/ibus/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.10 2017/08/16 21:22:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.11 2017/11/05 04:19:15 tsutsui Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=	ibus-1.5.13
+DISTNAME=	ibus-1.5.17
 CATEGORIES=	inputmethod
 MASTER_SITES=	https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
 
diff --git a/inputmethod/ibus/PLIST b/inputmethod/ibus/PLIST
index 979677d4be2..04e10850fa4 100644
--- a/inputmethod/ibus/PLIST
+++ b/inputmethod/ibus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2015/07/31 13:03:45 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/11/05 04:19:15 tsutsui Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -10,6 +10,7 @@ include/ibus-1.0/ibuscomponent.h
 include/ibus-1.0/ibusconfig.h
 include/ibus-1.0/ibusconfigservice.h
 include/ibus-1.0/ibusdebug.h
+include/ibus-1.0/ibusemoji.h
 include/ibus-1.0/ibusengine.h
 include/ibus-1.0/ibusenginedesc.h
 include/ibus-1.0/ibusenginesimple.h
@@ -46,14 +47,19 @@ lib/pkgconfig/ibus-1.0.pc
 libexec/ibus-dconf
 libexec/ibus-engine-simple
 libexec/ibus-gconf
+libexec/ibus-portal
+libexec/ibus-ui-emojier
 libexec/ibus-ui-gtk3
 libexec/ibus-x11
 man/man1/ibus-daemon.1
 man/man1/ibus-setup.1
 man/man1/ibus.1
+man/man7/ibus-emoji.7
 share/GConf/gsettings/ibus.convert
 share/applications/ibus-setup.desktop
 share/bash-completion/completions/ibus.bash
+share/dbus-1/services/org.freedesktop.IBus.service
+share/dbus-1/services/org.freedesktop.portal.IBus.service
 share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
 share/examples/ibus/dconf/profile/ibus
 share/gconf/schemas/ibus.schemas
@@ -67,6 +73,7 @@ share/gtk-doc/html/ibus/IBusConfig.html
 share/gtk-doc/html/ibus/IBusConfigService.html
 share/gtk-doc/html/ibus/IBusEngine.html
 share/gtk-doc/html/ibus/IBusEngineDesc.html
+share/gtk-doc/html/ibus/IBusEngineSimple.html
 share/gtk-doc/html/ibus/IBusFactory.html
 share/gtk-doc/html/ibus/IBusHotkeyProfile.html
 share/gtk-doc/html/ibus/IBusInputContext.html
@@ -83,7 +90,6 @@ share/gtk-doc/html/ibus/IBusSerializable.html
 share/gtk-doc/html/ibus/IBusService.html
 share/gtk-doc/html/ibus/IBusText.html
 share/gtk-doc/html/ibus/annotation-glossary.html
-share/gtk-doc/html/ibus/api-index-deprecated.html
 share/gtk-doc/html/ibus/api-index-full.html
 share/gtk-doc/html/ibus/ch01.html
 share/gtk-doc/html/ibus/ch02.html
@@ -92,7 +98,6 @@ share/gtk-doc/html/ibus/ch04.html
 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/IBusEngineSimple.html
 share/gtk-doc/html/ibus/ibus-IBusKeysyms.html
 share/gtk-doc/html/ibus/ibus-ibusdebug.html
 share/gtk-doc/html/ibus/ibus-ibuserror.html
@@ -105,7 +110,6 @@ share/gtk-doc/html/ibus/ibus-ibusversion.html
 share/gtk-doc/html/ibus/ibus-ibusxml.html
 share/gtk-doc/html/ibus/ibus.devhelp2
 share/gtk-doc/html/ibus/index.html
-share/gtk-doc/html/ibus/index.sgml
 share/gtk-doc/html/ibus/left-insensitive.png
 share/gtk-doc/html/ibus/left.png
 share/gtk-doc/html/ibus/right-insensitive.png
@@ -117,12 +121,98 @@ share/ibus/component/dconf.xml
 share/ibus/component/gconf.xml
 share/ibus/component/gtkpanel.xml
 share/ibus/component/simple.xml
+share/ibus/dicts/emoji-af.dict
+share/ibus/dicts/emoji-am.dict
+share/ibus/dicts/emoji-ar.dict
+share/ibus/dicts/emoji-as.dict
+share/ibus/dicts/emoji-az.dict
+share/ibus/dicts/emoji-be.dict
+share/ibus/dicts/emoji-bg.dict
+share/ibus/dicts/emoji-bn.dict
+share/ibus/dicts/emoji-bs.dict
+share/ibus/dicts/emoji-ca.dict
+share/ibus/dicts/emoji-cs.dict
+share/ibus/dicts/emoji-cy.dict
+share/ibus/dicts/emoji-da.dict
+share/ibus/dicts/emoji-de.dict
+share/ibus/dicts/emoji-de_CH.dict
+share/ibus/dicts/emoji-el.dict
+share/ibus/dicts/emoji-en.dict
+share/ibus/dicts/emoji-en_001.dict
+share/ibus/dicts/emoji-es.dict
+share/ibus/dicts/emoji-es_419.dict
+share/ibus/dicts/emoji-et.dict
+share/ibus/dicts/emoji-eu.dict
+share/ibus/dicts/emoji-fa.dict
+share/ibus/dicts/emoji-fi.dict
+share/ibus/dicts/emoji-fil.dict
+share/ibus/dicts/emoji-fr.dict
+share/ibus/dicts/emoji-ga.dict
+share/ibus/dicts/emoji-gl.dict
+share/ibus/dicts/emoji-gu.dict
+share/ibus/dicts/emoji-he.dict
+share/ibus/dicts/emoji-hi.dict
+share/ibus/dicts/emoji-hr.dict
+share/ibus/dicts/emoji-hu.dict
+share/ibus/dicts/emoji-hy.dict
+share/ibus/dicts/emoji-id.dict
+share/ibus/dicts/emoji-is.dict
+share/ibus/dicts/emoji-it.dict
+share/ibus/dicts/emoji-ja.dict
+share/ibus/dicts/emoji-ka.dict
+share/ibus/dicts/emoji-kk.dict
+share/ibus/dicts/emoji-km.dict
+share/ibus/dicts/emoji-kn.dict
+share/ibus/dicts/emoji-ko.dict
+share/ibus/dicts/emoji-ky.dict
+share/ibus/dicts/emoji-lo.dict
+share/ibus/dicts/emoji-lt.dict
+share/ibus/dicts/emoji-lv.dict
+share/ibus/dicts/emoji-mk.dict
+share/ibus/dicts/emoji-ml.dict
+share/ibus/dicts/emoji-mn.dict
+share/ibus/dicts/emoji-mr.dict
+share/ibus/dicts/emoji-ms.dict
+share/ibus/dicts/emoji-my.dict
+share/ibus/dicts/emoji-nb.dict
+share/ibus/dicts/emoji-ne.dict
+share/ibus/dicts/emoji-nl.dict
+share/ibus/dicts/emoji-or.dict
+share/ibus/dicts/emoji-pa.dict
+share/ibus/dicts/emoji-pl.dict
+share/ibus/dicts/emoji-pt.dict
+share/ibus/dicts/emoji-pt_PT.dict
+share/ibus/dicts/emoji-ro.dict
+share/ibus/dicts/emoji-root.dict
+share/ibus/dicts/emoji-ru.dict
+share/ibus/dicts/emoji-si.dict
+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_Latn.dict
+share/ibus/dicts/emoji-sv.dict
+share/ibus/dicts/emoji-sw.dict
+share/ibus/dicts/emoji-ta.dict
+share/ibus/dicts/emoji-te.dict
+share/ibus/dicts/emoji-th.dict
+share/ibus/dicts/emoji-tr.dict
+share/ibus/dicts/emoji-uk.dict
+share/ibus/dicts/emoji-ur.dict
+share/ibus/dicts/emoji-uz.dict
+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/keymaps/common
 share/ibus/keymaps/in
 share/ibus/keymaps/jp
 share/ibus/keymaps/kr
 share/ibus/keymaps/modifiers
 share/ibus/keymaps/us
+share/ibus/setup/emojilang.py
+share/ibus/setup/emojilang.pyc
+share/ibus/setup/emojilang.pyo
 share/ibus/setup/engineabout.py
 share/ibus/setup/engineabout.pyc
 share/ibus/setup/engineabout.pyo
@@ -163,6 +253,7 @@ share/locale/bg/LC_MESSAGES/ibus10.mo
 share/locale/bn/LC_MESSAGES/ibus10.mo
 share/locale/bn_IN/LC_MESSAGES/ibus10.mo
 share/locale/ca/LC_MESSAGES/ibus10.mo
+share/locale/cs/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
@@ -170,6 +261,7 @@ share/locale/es/LC_MESSAGES/ibus10.mo
 share/locale/et/LC_MESSAGES/ibus10.mo
 share/locale/eu/LC_MESSAGES/ibus10.mo
 share/locale/fa/LC_MESSAGES/ibus10.mo
+share/locale/fi/LC_MESSAGES/ibus10.mo
 share/locale/fr/LC_MESSAGES/ibus10.mo
 share/locale/gu/LC_MESSAGES/ibus10.mo
 share/locale/he/LC_MESSAGES/ibus10.mo
@@ -182,6 +274,7 @@ 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/mn/LC_MESSAGES/ibus10.mo
 share/locale/mr/LC_MESSAGES/ibus10.mo
 share/locale/nb/LC_MESSAGES/ibus10.mo
 share/locale/nl/LC_MESSAGES/ibus10.mo
@@ -190,8 +283,10 @@ 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/sq/LC_MESSAGES/ibus10.mo
 share/locale/sr/LC_MESSAGES/ibus10.mo
 share/locale/sr@latin/LC_MESSAGES/ibus10.mo
+share/locale/sv/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
diff --git a/inputmethod/ibus/distinfo b/inputmethod/ibus/distinfo
index cac99992bfb..ec4ca3cb73f 100644
--- a/inputmethod/ibus/distinfo
+++ b/inputmethod/ibus/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2016/03/02 22:59:00 ryoon Exp $
+$NetBSD: distinfo,v 1.18 2017/11/05 04:19:15 tsutsui Exp $
 
-SHA1 (ibus-1.5.13.tar.gz) = 054a5a884329f2d3295d8f992566e7db72cf283b
-RMD160 (ibus-1.5.13.tar.gz) = 0c8177a9e66e31589bd070caf285797fef1da062
-SHA512 (ibus-1.5.13.tar.gz) = bffb3cecf984ec6e383a111b4e62506390f083476f59404e2e9b90251e6e06853d7f1dc06194456ab5064b5d375820510be1ab12ebd29b966d6a7f5b8aca07ab
-Size (ibus-1.5.13.tar.gz) = 2194054 bytes
-SHA1 (patch-client_gtk2_ibusimcontext.c) = 31e72d06884858476097f04591004ce46b6074c1
-SHA1 (patch-client_gtk3_ibusimcontext.c) = 543192191d14d61ae3e193de6ffda7b099969a1a
+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 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd
+SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
diff --git a/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c b/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c
index 98581a62b28..dbca2e60fc3 100644
--- a/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c
+++ b/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.1 2013/11/12 02:57:43 dholland Exp $
+$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.2 2017/11/05 04:19:15 tsutsui Exp $
 
 NetBSD 6.99.25's gcc says:
    error: #pragma GCC diagnostic not allowed inside functions
 
---- client/gtk2/ibusimcontext.c~	2013-09-20 03:15:51.000000000 +0000
+--- client/gtk2/ibusimcontext.c.orig	2017-10-22 10:31:49.000000000 +0000
 +++ client/gtk2/ibusimcontext.c
-@@ -509,6 +509,9 @@ daemon_name_vanished (GDBusConnection *c
+@@ -559,6 +559,9 @@ daemon_name_vanished (GDBusConnection *c
      _daemon_is_running = FALSE;
  }
  
@@ -15,7 +15,7 @@ NetBSD 6.99.25's gcc says:
  static void
  ibus_im_context_class_init (IBusIMContextClass *class)
  {
-@@ -593,10 +596,7 @@ ibus_im_context_class_init (IBusIMContex
+@@ -642,10 +645,7 @@ ibus_im_context_class_init (IBusIMContex
  
      /* always install snooper */
      if (_key_snooper_id == 0) {
@@ -26,7 +26,7 @@ NetBSD 6.99.25's gcc says:
      }
  
      _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-@@ -607,21 +607,22 @@ ibus_im_context_class_init (IBusIMContex
+@@ -656,21 +656,22 @@ ibus_im_context_class_init (IBusIMContex
                                                NULL,
                                                NULL);
  }
diff --git a/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c b/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c
index d1ba74e7a33..6200ce5ebc7 100644
--- a/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c
+++ b/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.1 2013/11/12 02:57:43 dholland Exp $
+$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.2 2017/11/05 04:19:15 tsutsui Exp $
 
 NetBSD 6.99.25's gcc says:
    error: #pragma GCC diagnostic not allowed inside functions
 
---- client/gtk3/ibusimcontext.c~	2013-09-20 03:15:51.000000000 +0000
+--- client/gtk3/ibusimcontext.c.orig	2017-10-22 10:31:49.000000000 +0000
 +++ client/gtk3/ibusimcontext.c
-@@ -509,6 +509,9 @@ daemon_name_vanished (GDBusConnection *c
+@@ -559,6 +559,9 @@ daemon_name_vanished (GDBusConnection *c
      _daemon_is_running = FALSE;
  }
  
@@ -15,7 +15,7 @@ NetBSD 6.99.25's gcc says:
  static void
  ibus_im_context_class_init (IBusIMContextClass *class)
  {
-@@ -593,10 +596,7 @@ ibus_im_context_class_init (IBusIMContex
+@@ -642,10 +645,7 @@ ibus_im_context_class_init (IBusIMContex
  
      /* always install snooper */
      if (_key_snooper_id == 0) {
@@ -26,7 +26,7 @@ NetBSD 6.99.25's gcc says:
      }
  
      _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-@@ -607,21 +607,22 @@ ibus_im_context_class_init (IBusIMContex
+@@ -656,21 +656,22 @@ ibus_im_context_class_init (IBusIMContex
                                                NULL,
                                                NULL);
  }