public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ibus] autotool: Disable ibus-xinit in LXQT and XFCE Spins
@ 2026-05-31  2:09 Takao Fujiwara
  0 siblings, 0 replies; only message in thread
From: Takao Fujiwara @ 2026-05-31  2:09 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

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

            Log:
            Disable ibus-xinit in LXQT and XFCE Spins

Currently xfce4-session package includes /usr/share/xsessions/xfce.desktop
file and XFCE Spin installs the X11 session by default, and
lxqt-x11-session package includes /usr/share/xsessions/lxqt.desktop file
and LXQt Spin also installs the X11 session by default.
However imsettings still runs ibus-daemon directly and it causes a
trouble in the Wayland desktop sessions.
I decided the Wayland Spins should not install ibus-xinit by default
even if they also includes X11 sessions until imsettings is fixed.

---
diff --git a/ibus-xinput b/ibus-xinput
index 3bf9974..1f63513 100644
--- a/ibus-xinput
+++ b/ibus-xinput
@@ -4,7 +4,8 @@ ICON="ibus"
 XIM_ARGS="-r --xim"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"
-GTK_IM_MODULE=ibus
+QT_IM_MODULES='wayland;ibus'
+GTK_IM_MODULE='wayland: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()

diff --git a/ibus.spec b/ibus.spec
index fb602d5..f10ccc2 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -24,8 +24,12 @@
 # FIXME: How to write a condition with multiple lines
 %global ibus_panel_condition (%pcd1 or %pcd2 or %pcd3 or %wcd1 or %wcd2)
 %global pcd1 cinnamon or deepin-desktop or i3
-%global pcd2 lxqt-x11-session or lxsession or mate-panel or phosh or awesome
-%global pcd3 sugar or xfce4-session
+# Currently imsettings invokes ibus-dameon directly and that way no longer work
+# in Wayland.
+# Comment out lxqt-x11-session until it's installed by default in LXQt Spin
+# Comment out xfce4-session until it's installed by default in XFCE Spin
+%global pcd2 lxsession or mate-panel or phosh or awesome
+%global pcd3 sugar
 %global wcd1 cosmic-panel or hyprland or sway or waybar or lxqt-wayland-session
 %global wcd2 budgie-desktop or plasma-workspace or xfce4-session-wayland-session
 
@@ -54,7 +58,7 @@
 Name:           ibus
 Version:        1.5.34~rc1
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -579,6 +583,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Tue Mar 17 2026 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.34~rc1-2
+- Disable ibus-xinit in LXQT and XFCE Spins
+
 * Mon Mar 16 2026 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.34~rc1-1
 - Bump to 1.5.34-rc1
 - Update translations

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-05-31  2:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-31  2:09 [rpms/ibus] autotool: Disable ibus-xinit in LXQT and XFCE Spins Takao Fujiwara

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox