[rpms/ibus] rawhide: Fix meson -Dgtk2=disabled

[rpms/ibus] rawhide: Fix meson -Dgtk2=disabled

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : rawhide
Commit : f1ac4df0822d0e6f7001e57c4da5452dc9a9d3f2
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2026-06-04T12:04:04+09:00
Stats  : +74/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/f1ac4df0822d0e6f7001e57c4da5452dc9a9d3f2?branch=rawhide

Log:
Fix meson -Dgtk2=disabled

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index e69de29..e4301fd 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -0,0 +1,69 @@
+From 25f693aef6587496e4e4cd1491c485eb945a66f0 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Thu, 4 Jun 2026 11:13:52 +0900
+Subject: [PATCH] meson: Fix meson -Dgtk2=disabled
+
+tools/meson.build file requires `gtk2_im_module_dir`.
+
+Closes: #2915
+---
+ bindings/vala/meson.build | 2 +-
+ meson.build               | 8 +++++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/bindings/vala/meson.build b/bindings/vala/meson.build
+index ae27dc6e..053233f6 100644
+--- a/bindings/vala/meson.build
++++ b/bindings/vala/meson.build
+@@ -39,7 +39,7 @@ xi_vapi = declare_dependency(
+   ],
+ )
+ 
+-if get_option('emoji-dict')
++if get_option('emoji-dict') and enable_gtk3
+   # Lordy lordy
+   libibus_emoji_dialog_sources = files(
+     meson.current_source_dir() / '../../ui/gtk3/candidatearea.vala',
+diff --git a/meson.build b/meson.build
+index 5da449b7..843791ef 100644
+--- a/meson.build
++++ b/meson.build
+@@ -121,6 +121,8 @@ if enable_gtk2
+     gtk2_im_module_dir = get_option('prefix') / get_option('libdir') / \
+         'gtk-2.0' / gtk2_binary_version / 'immodules'
+   endif
++else
++  gtk2_im_module_dir = ''
+ endif
+ 
+ enable_gtk3 = get_option('gtk3')
+@@ -141,6 +143,7 @@ else
+   if get_option('ui')
+     error('UI option requires GTK3')
+   endif
++  gtk3_im_module_dir = ''
+ endif
+ 
+ enable_gtk4 = get_option('gtk4')
+@@ -154,6 +157,8 @@ if enable_gtk4
+     gtk4_im_module_dir = get_option('prefix') / get_option('libdir') / \
+         'gtk-4.0' / gtk4_binary_version / 'immodules'
+   endif
++else
++  gtk4_im_module_dir = ''
+ endif
+ 
+ # X11 / XIM
+@@ -398,7 +403,8 @@ summary({
+   'Build gtk4 immodule':           enable_gtk4,
+   'Build XIM agent server':        enable_xim,
+   'Build wayland support':         enable_wayland,
+-  'Build gdk3 wayland support':    gdk3_wayland_dep.found(),
++  'Build gdk3 wayland support':    enable_gtk3 ?
++                                     gdk3_wayland_dep.found() : false,
+   'Build appindicator support':    get_option('appindicator'),
+   'Build memconf modules':         enable_memconf,
+   'Build dconf modules':           enable_dconf,
+-- 
+2.54.0
+

diff --git a/ibus.spec b/ibus.spec
index 79c8d78..b959d44 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -48,7 +48,7 @@
 Name:           ibus
 Version:        1.5.35~alpha1
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -57,6 +57,7 @@ Source1:        https://github.com/ibus/%name/releases/download/%{source_version
 Source2:        %{name}-xinput
 Source3:        %{name}.conf.5
 # Patch0:         %%{name}-HEAD.patch
+Patch0:         %{name}-HEAD.patch
 Patch1:         %{name}-2444009-wayland-xkb-lv-tilde.patch
 # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
 Patch2:         %{name}-1385349-segv-bus-proxy.patch
@@ -547,6 +548,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Thu Jun 04 2026 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.35~alpha1-4
+- Fix meson -Dgtk2=disabled
+
 * Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 1.5.35~alpha1-3
 - Rebuilt for Python 3.15