From 05bf66c080b98e21fd3216f752a25bde4c82ac2c Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 13 Apr 2022 05:44:06 +0000
Subject: [PATCH] Update to ibus-1.5.26.

---
 inputmethods/ibus/Makefile                               | 9 +++------
 inputmethods/ibus/distinfo                               | 4 ++--
 .../ibus/patches/patch-client_gtk2_ibusimcontext_c       | 4 ++--
 inputmethods/ibus/pkg/PLIST-main                         | 5 +++++
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/inputmethods/ibus/Makefile b/inputmethods/ibus/Makefile
index cf805c304ec..d7a8022db41 100644
--- a/inputmethods/ibus/Makefile
+++ b/inputmethods/ibus/Makefile
@@ -6,17 +6,13 @@ COMMENT-gtk4 =		IBus IM module for GTK4
 
 GH_PROJECT =		ibus
 GH_ACCOUNT =		ibus
-GH_TAGNAME =		1.5.25
+GH_TAGNAME =		1.5.26
 
 PKGNAME-main =		ibus-${GH_TAGNAME}
 PKGNAME-gtk2 =		ibus-gtk2-${GH_TAGNAME}
 PKGNAME-gtk4 =		ibus-gtk4-${GH_TAGNAME}
 
-REVISION-main =		4
-REVISION-gtk2 =		2
-REVISION-gtk4 =		3
-
-SHARED_LIBS +=  ibus-1.0             4.3      # 5.525
+SHARED_LIBS +=  ibus-1.0             4.3      # 5.526
 
 CATEGORIES =		inputmethods chinese japanese korean
 
@@ -81,6 +77,7 @@ CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS =	--disable-python2 \
+			--disable-systemd-services \
 			--enable-gtk4 \
 			--enable-introspection \
 		 	--enable-vala \
diff --git a/inputmethods/ibus/distinfo b/inputmethods/ibus/distinfo
index 29a41632a01..6d9709f7d73 100644
--- a/inputmethods/ibus/distinfo
+++ b/inputmethods/ibus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ibus-1.5.25.tar.gz) = y2+7Fm4ZzNWheew8C9pPz+hnaYAnGZPgw/zi4KnWTBY=
-SIZE (ibus-1.5.25.tar.gz) = 1414942
+SHA256 (ibus-1.5.26.tar.gz) = D62KdCgINRc9bNhbsPajMBNnkGjVwhq0nWAHuYWY0xc=
+SIZE (ibus-1.5.26.tar.gz) = 1421950
diff --git a/inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c b/inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c
index 0d4bfadbbcc..27f63977d15 100644
--- a/inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c
+++ b/inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c
@@ -1,7 +1,7 @@
 Index: client/gtk2/ibusimcontext.c
 --- client/gtk2/ibusimcontext.c.orig
 +++ client/gtk2/ibusimcontext.c
-@@ -834,10 +834,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
+@@ -841,10 +841,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
  #if !GTK_CHECK_VERSION (3, 98, 4)
      /* always install snooper */
      if (_key_snooper_id == 0) {
@@ -12,7 +12,7 @@ Index: client/gtk2/ibusimcontext.c
      }
  #endif
  
-@@ -856,10 +853,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
+@@ -863,10 +860,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
  #if !GTK_CHECK_VERSION (3, 98, 4)
      if (_key_snooper_id != 0) {
          IDEBUG ("snooper is terminated.");
diff --git a/inputmethods/ibus/pkg/PLIST-main b/inputmethods/ibus/pkg/PLIST-main
index e174591e91c..02a85bcc8b8 100644
--- a/inputmethods/ibus/pkg/PLIST-main
+++ b/inputmethods/ibus/pkg/PLIST-main
@@ -86,6 +86,11 @@ share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
 share/examples/ibus/dconf/profile/
 share/examples/ibus/dconf/profile/ibus
 @sample ${SYSCONFDIR}/dconf/profile/ibus
+share/examples/ibus/xdg/
+share/examples/ibus/xdg/Xwayland-session.d/
+@sample ${SYSCONFDIR}/xdg/Xwayland-session.d/
+share/examples/ibus/xdg/Xwayland-session.d/10-ibus-x11
+@sample ${SYSCONFDIR}/xdg/Xwayland-session.d/10-ibus-x11
 share/gettext/its/ibus.its
 share/gettext/its/ibus.loc
 share/gir-1.0/IBus-1.0.gir