[rpms/ibus] autotool: Resolves #2448611 Check WAYLAND_DISPLAY in ibus.conf

[rpms/ibus] autotool: Resolves #2448611 Check WAYLAND_DISPLAY in ibus.conf

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : ddc82fbbea30615c0749832ff5f6a1aa4ce1231e
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2026-03-19T12:13:55+09:00
Stats  : +17/-4 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/ddc82fbbea30615c0749832ff5f6a1aa4ce1231e?branch=autotool

Log:
Resolves #2448611 Check WAYLAND_DISPLAY in ibus.conf

---
diff --git a/ibus-xinput b/ibus-xinput
index 1f63513..660b62b 100644
--- a/ibus-xinput
+++ b/ibus-xinput
@@ -1,18 +1,20 @@
 XIM=ibus
+# imsettings does not support "ibus start" yet.
 XIM_PROGRAM="/usr/bin/ibus-daemon"
 ICON="ibus"
 XIM_ARGS="-r --xim"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"
-QT_IM_MODULES='wayland;ibus'
-GTK_IM_MODULE='wayland:ibus'
+GTK_IM_MODULE=ibus
 NOT_RUN=gnome3
 # IMSETTINGS_IGNORE_SESSION concatenate the current session name and type x11 or
 # wayland. The current session name is calculated by get_destop()
 # in /usr/libexec/imsettings-functions and the value is case-sensitive.
 IMSETTINGS_IGNORE_SESSION=KDE-wayland
 
-if test -f /usr/lib64/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so || \
+if test -f /usr/lib64/qt6/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so || \
+   test -f /usr/lib/qt6/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so || \
+   test -f /usr/lib64/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so || \
    test -f /usr/lib/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so || \
    test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so || \
    test -f /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so;
@@ -21,3 +23,11 @@ then
 else
     QT_IM_MODULE=xim
 fi
+
+# imsettings does not support QT_IM_MODULES environment yet.
+if test "x$WAYLAND_DISPLAY" != "x" ; then
+    if test "x$QT_IM_MODULE" = "xibus" ; then
+        QT_IM_MODULE=
+    fi
+    GTK_IM_MODULE='wayland:ibus'
+fi

diff --git a/ibus.spec b/ibus.spec
index f10ccc2..cd7ebc7 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -58,7 +58,7 @@
 Name:           ibus
 Version:        1.5.34~rc1
 # 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
@@ -583,6 +583,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Thu Mar 19 2026 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.34~rc1-3
+- Resolves #2448611 Check WAYLAND_DISPLAY in ibus.conf
+
 * Tue Mar 17 2026 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.34~rc1-2
 - Disable ibus-xinit in LXQT and XFCE Spins