From 3dc77d7066cc65d11f00f9571b9a906d1ff01c26 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Sun, 26 May 2024 20:00:13 -0400
Subject: [PATCH] Fix ELN build

The affected code in 1.5.30 only calls setxkbmap if present.
---
 ibus-xx-disable-setxkbmap.patch | 20 --------------------
 ibus.spec                       |  2 --
 2 files changed, 22 deletions(-)
 delete mode 100644 ibus-xx-disable-setxkbmap.patch

diff --git a/ibus-xx-disable-setxkbmap.patch b/ibus-xx-disable-setxkbmap.patch
deleted file mode 100644
index fd08ec1..0000000
--- a/ibus-xx-disable-setxkbmap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/tests/ibus-keypress.c b/src/tests/ibus-keypress.c
-index bab05398..41f16b98 100644
---- a/src/tests/ibus-keypress.c
-+++ b/src/tests/ibus-keypress.c
-@@ -272,12 +272,15 @@ create_window ()
- static void
- test_keypress (void)
- {
-+#if 0
-     int status = 0;
-     GError *error = NULL;
- 
-+    /* setxkbmap is not available in RHEL10 */
-     g_spawn_command_line_sync ("setxkbmap -layout us",
-                                NULL, NULL,
-                                &status, &error);
-+#endif
-     g_assert (register_ibus_engine ());
- 
-     create_window ();
diff --git a/ibus.spec b/ibus.spec
index 11057ce..273d97a 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -76,8 +76,6 @@ Patch1:         %{name}-1385349-segv-bus-proxy.patch
 %if %{without xinit}
 # Use mutter window manager in RHEL CI
 Patch100:       %{name}-xx-desktop-testing-mutter.patch
-# Disable to run setxkbmap
-Patch101:       %{name}-xx-disable-setxkbmap.patch
 %endif
 
 # autoreconf requires autopoint but not po.m4