public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] autotool: Fix ELN build
Date: Sun, 31 May 2026 02:08:31 GMT	[thread overview]
Message-ID: <178019331133.1.8769042191681831745.rpms-ibus-3dc77d7066cc@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/ibus
            Branch : autotool
            Commit : 3dc77d7066cc65d11f00f9571b9a906d1ff01c26
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2024-05-26T20:00:53-04:00
            Stats  : +0/-22 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ibus/c/3dc77d7066cc65d11f00f9571b9a906d1ff01c26?branch=autotool

            Log:
            Fix ELN build

The affected code in 1.5.30 only calls setxkbmap if present.

---
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

             reply	other threads:[~2026-05-31  2:08 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-31  2:08 Yaakov Selkowitz [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-05-31  2:08 [rpms/ibus] autotool: Fix ELN build Yaakov Selkowitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178019331133.1.8769042191681831745.rpms-ibus-3dc77d7066cc@fedoraproject.org \
    --to=yselkowi@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox