[rpms/ibus] autotool: Fix SEGV in Xorg without IBusWaylandIM

[Takao Fujiwara <tfujiwar@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/ibus
            Branch : autotool
            Commit : 3dc7cc7c9aa01247b39cbc07e2be0d85d296cc4f
            Author : Takao Fujiwara <tfujiwar@redhat.com>
            Date   : 2025-02-19T02:10:16+09:00
            Stats  : +59/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ibus/c/3dc7cc7c9aa01247b39cbc07e2be0d85d296cc4f?branch=autotool

            Log:
            Fix SEGV in Xorg without IBusWaylandIM

- Update ibus_panel_condition for Wayland desktops

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index b2111ae..37bda4d 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -28,3 +28,55 @@ index 3c0ea648..5716247d 100644
 -- 
 2.47.0
 
+From fb4d7baf7e45c84a6d2b1d8701e24087c742c285 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Wed, 19 Feb 2025 01:18:39 +0900
+Subject: [PATCH] ui/gtk3: Fix SEGV in Xorg without IBusWaylandIM
+
+---
+ ui/gtk3/application.vala    | 14 ++++++++------
+ ui/gtk3/candidatepanel.vala |  3 ++-
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/ui/gtk3/application.vala b/ui/gtk3/application.vala
+index 8f688920..82cc5397 100644
+--- a/ui/gtk3/application.vala
++++ b/ui/gtk3/application.vala
+@@ -101,12 +101,14 @@ class Application {
+         if (m_log != null)
+             m_panel.set_log(m_log, m_verbose);
+ #if USE_GDK_WAYLAND
+-        m_realize_surface_id = m_panel.realize_surface.connect(
+-                (w, s) => this.set_wayland_surface(s));
+-        m_ibus_focus_in_id = m_wayland_im.ibus_focus_in.connect(
+-                (w, o) => m_panel.set_wayland_object_path(o));
+-        m_ibus_focus_out_id = m_wayland_im.ibus_focus_out.connect(
+-                (w, o) => m_panel.set_wayland_object_path(null));
++        if (m_wayland_im != null) {
++            m_realize_surface_id = m_panel.realize_surface.connect(
++                    (w, s) => this.set_wayland_surface(s));
++            m_ibus_focus_in_id = m_wayland_im.ibus_focus_in.connect(
++                    (w, o) => m_panel.set_wayland_object_path(o));
++            m_ibus_focus_out_id = m_wayland_im.ibus_focus_out.connect(
++                    (w, o) => m_panel.set_wayland_object_path(null));
++        }
+ #endif
+         m_panel.load_settings();
+     }
+diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
+index 092fdc82..f2447703 100644
+--- a/ui/gtk3/candidatepanel.vala
++++ b/ui/gtk3/candidatepanel.vala
+@@ -436,7 +436,8 @@ public class CandidatePanel : Gtk.Box{
+ 
+     public new void hide() {
+ #if USE_GDK_WAYLAND
+-        realize_surface(null);
++        if (!BindingCommon.default_is_xdisplay())
++            realize_surface(null);
+ #endif
+         m_toplevel.hide();
+     }
+-- 
+2.47.0
+

diff --git a/ibus.spec b/ibus.spec
index 146cc93..a8bcc86 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -32,10 +32,11 @@
 
 %global ibus_xinit_condition %ibus_panel_condition
 # FIXME: How to write a condition with multiple lines
-%global ibus_panel_condition (%pcd1 or %pcd2 or %pcd3)
+%global ibus_panel_condition (%pcd1 or %pcd2 or %pcd3 or %pcd4)
 %global pcd1 budgie-desktop or cinnamon or deepin-desktop or i3
 %global pcd2 lxqt-session or lxsession or mate-panel or phosh
 %global pcd3 plasma-workspace or sugar or xfce4-session
+%global pcd4 cosmic-panel or hyprland or sway
 
 %if %with_pkg_config
 %if %{with gtk2}
@@ -62,7 +63,7 @@
 Name:           ibus
 Version:        1.5.32~beta2
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -635,6 +636,10 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Wed Feb 19 2025 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.32~beta2-3
+- Fix SEGV in Xorg without IBusWaylandIM
+- Update ibus_panel_condition for Wayland desktops
+
 * Fri Feb 14 2025 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.32~beta2-2
 - Resolves #2342280 Fix ibus start with verbose typo