CVS commit: pkgsrc/inputmethod/ibus

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Thu Aug 28 12:08:47 UTC 2025

Modified Files:
        pkgsrc/inputmethod/ibus: Makefile distinfo
Added Files:
        pkgsrc/inputmethod/ibus/patches: patch-ui_gtk3_candidatepanel.vala
            patch-ui_gtk3_panel.vala

Log Message:
ibus: pull fix for "Candidate panel remains on the screen" issue.

https://github.com/ibus/ibus/issues/2780
https://github.com/ibus/ibus/commit/2a3f38079b63c0023b3647edbf1a22a423b26728

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/inputmethod/ibus/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_candidatepanel.vala \
    pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_panel.vala

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/ibus/Makefile
diff -u pkgsrc/inputmethod/ibus/Makefile:1.113 pkgsrc/inputmethod/ibus/Makefile:1.114
--- pkgsrc/inputmethod/ibus/Makefile:1.113      Sat Jul 19 05:37:40 2025
+++ pkgsrc/inputmethod/ibus/Makefile    Thu Aug 28 12:08:47 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.113 2025/07/19 05:37:40 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2025/08/28 12:08:47 tsutsui Exp $
 
 DISTNAME=      ibus-1.5.32
 PKGNAME=       ${DISTNAME:S/-rc/rc/:S/-beta/beta/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    inputmethod
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ibus/}
 GITHUB_PROJECT=        ${PKGBASE}

Index: pkgsrc/inputmethod/ibus/distinfo
diff -u pkgsrc/inputmethod/ibus/distinfo:1.36 pkgsrc/inputmethod/ibus/distinfo:1.37
--- pkgsrc/inputmethod/ibus/distinfo:1.36       Sat May 17 18:32:24 2025
+++ pkgsrc/inputmethod/ibus/distinfo    Thu Aug 28 12:08:47 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2025/05/17 18:32:24 tsutsui Exp $
+$NetBSD: distinfo,v 1.37 2025/08/28 12:08:47 tsutsui Exp $
 
 BLAKE2s (ibus-1.5.32.tar.gz) = ff1fb8b798af776696a817d9b63ad2e414562268468c9b978d48b8e0df77f77c
 SHA512 (ibus-1.5.32.tar.gz) = 2c63cab1fe553cb8f3ce00d22f3374e396f8cb3f9e66b81b8c8c59d141eb68d036549460ac0b836e93b0261c185a33aba0fc930178fd04d142344324e1562b9c
@@ -7,3 +7,5 @@ SHA1 (patch-client_gtk2_ibusimcontext.c)
 SHA1 (patch-client_gtk3_ibusimcontext.c) = 105a2560014f8bd9699393bef3dda00a6c925c6a
 SHA1 (patch-ui_gtk3_Makefile.am) = e0b74afa665b395bb5ac5da678c57e8646bbb71a
 SHA1 (patch-ui_gtk3_Makefile.in) = e52d7d60e975bbc8d1c2807deaef8f0d09b46548
+SHA1 (patch-ui_gtk3_candidatepanel.vala) = a1d697d5b4f8d545918aca48165e2b07c47f858a
+SHA1 (patch-ui_gtk3_panel.vala) = a8fcb9ce00b260e2039c181198936cdf8a3344d4

Added files:

Index: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_candidatepanel.vala
diff -u /dev/null pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_candidatepanel.vala:1.1
--- /dev/null   Thu Aug 28 12:08:47 2025
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_candidatepanel.vala   Thu Aug 28 12:08:47 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-ui_gtk3_candidatepanel.vala,v 1.1 2025/08/28 12:08:47 tsutsui Exp $
+
+- apply upstream fix for "Candidate panel remains on the screen" problem:
+  https://github.com/ibus/ibus/issues/2780
+
+--- ui/gtk3/candidatepanel.vala.orig   2025-04-08 12:57:26.000000000 +0000
++++ ui/gtk3/candidatepanel.vala
+@@ -214,7 +214,6 @@ public class CandidatePanel : Gtk.Box{
+         m_set_preedit_text_id =
+                 Timeout.add(100,
+                             () => {
+-                                //warning("test set_preedit_text_real");
+                                 m_set_preedit_text_id = 0;
+                                 set_preedit_text_real(text, cursor);
+                                 return Source.REMOVE;
+@@ -480,7 +479,11 @@ public class CandidatePanel : Gtk.Box{
+     }
+ 
+     public new void show() {
+-        m_toplevel.show_all();
++        // m_toplevel.show_all() changes m_candidate_area.get_visible()
++        // in update_real() so show() is just used. Using no_show_all
++        // property for m_candidate_area would introduce the more
++        // complicated logic.
++        m_toplevel.show();
+     }
+ 
+     public new void hide() {
Index: pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_panel.vala
diff -u /dev/null pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_panel.vala:1.1
--- /dev/null   Thu Aug 28 12:08:47 2025
+++ pkgsrc/inputmethod/ibus/patches/patch-ui_gtk3_panel.vala    Thu Aug 28 12:08:47 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-ui_gtk3_panel.vala,v 1.1 2025/08/28 12:08:47 tsutsui Exp $
+
+- apply upstream fix for "Candidate panel remains on the screen" problem:
+  https://github.com/ibus/ibus/issues/2780
+
+--- ui/gtk3/panel.vala.orig    2025-04-08 12:57:26.000000000 +0000
++++ ui/gtk3/panel.vala
+@@ -214,7 +214,7 @@ class Panel : IBus.PanelService {
+ 
+ #if USE_GDK_WAYLAND
+     private CandidatePanel get_active_candidate_panel() {
+-        if (m_wayland_object_path == null) {
++        if (m_is_wayland && m_wayland_object_path == null) {
+             if (m_candidate_panel_x11 == null) {
+                 m_candidate_panel_x11 = candidate_panel_new(true);
+                 set_use_glyph_from_engine_lang();
+@@ -229,7 +229,7 @@ class Panel : IBus.PanelService {
+     }
+ 
+     private Switcher get_active_switcher() {
+-        if (m_wayland_object_path == null) {
++        if (m_is_wayland && m_wayland_object_path == null) {
+             if (m_switcher_x11 == null)
+                 m_switcher_x11 = switcher_new(true);
+             return m_switcher_x11;