public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Takao Fujiwara <tfujiwar@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] autotool: Delete Upstreamed patches
Date: Sun, 31 May 2026 02:08:27 GMT	[thread overview]
Message-ID: <178019330713.1.867559570276927851.rpms-ibus-b3ac342af126@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : b3ac342af1264e939142eb684e0cde74847670e2
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2024-04-02T22:05:05+09:00
Stats  : +0/-89 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/b3ac342af1264e939142eb684e0cde74847670e2?branch=autotool

Log:
Delete Upstreamed patches

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
deleted file mode 100644
index c1ca02e..0000000
--- a/ibus-HEAD.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 7f3bde01636213605e3b9c62d91b8f9b5635b9a6 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Sat, 23 Mar 2024 13:09:26 +0900
-Subject: [PATCH] src/ibusengine: Identify SUPER_MASK in GTK4 with MOD4_MASK
-
-Fix the regression not to save the changed modifiers.
-
-Fixes: https://github.com/ibus/ibus/commit/e4eaeb7
-BUG=https://github.com/ibus/ibus/issues/2607
----
- src/ibusengine.c | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/src/ibusengine.c b/src/ibusengine.c
-index 9cdf6479..eff4992c 100644
---- a/src/ibusengine.c
-+++ b/src/ibusengine.c
-@@ -317,7 +317,11 @@ static const guint IBUS_MODIFIER_FILTER =
-         IBUS_BUTTON2_MASK |
-         IBUS_BUTTON3_MASK |
-         IBUS_BUTTON4_MASK |
--        IBUS_BUTTON5_MASK);
-+        IBUS_BUTTON5_MASK |
-+        IBUS_SUPER_MASK |
-+        IBUS_HYPER_MASK |
-+        IBUS_META_MASK);
-+
- 
- static void
- ibus_engine_class_init (IBusEngineClass *class)
-@@ -1112,7 +1116,17 @@ ibus_engine_filter_key_event (IBusEngine *engine,
-     g_return_val_if_fail (IBUS_IS_ENGINE (engine), FALSE);
- 
-     priv = engine->priv;
--    modifiers = state & IBUS_MODIFIER_FILTER;
-+    modifiers = state;
-+    /*
-+     * GTK3 has both IBUS_SUPER_MASK & IBUS_MOD4_MASK.
-+     * GTK4 has IBUS_SUPER_MASK.
-+     * Qt5 has IBUS_MOD4_MASK.
-+     */
-+    if (modifiers & IBUS_SUPER_MASK) {
-+        modifiers &= ~IBUS_SUPER_MASK;
-+        modifiers |= IBUS_MOD4_MASK;
-+    }
-+    modifiers = modifiers & IBUS_MODIFIER_FILTER;
-     if (keyval >= IBUS_KEY_A && keyval <= IBUS_KEY_Z &&
-         (modifiers & IBUS_SHIFT_MASK) != 0) {
-         keyval = keyval - IBUS_KEY_A + IBUS_KEY_a;
-@@ -1130,10 +1144,6 @@ ibus_engine_filter_key_event (IBusEngine *engine,
-         for (; keys; keys++) {
-             if (keys->keyval == 0 && keys->keycode == 0 && keys->state == 0)
-                 break;
--            if ((keys->state != modifiers) && (keys->state & IBUS_MOD4_MASK)) {
--                keys->state &= ~IBUS_MOD4_MASK;
--                keys->state |= IBUS_SUPER_MASK;
--            }
-             if (keys->keyval == keyval &&
-                 keys->state == modifiers &&
-                 (keys->keycode == 0 || keys->keycode == keycode)) {
--- 
-2.43.0
-
-From 707832954e1aaaae9a695d9771e84a21844be605 Mon Sep 17 00:00:00 2001
-From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
-Date: Mon, 25 Mar 2024 14:40:12 +0900
-Subject: [PATCH] configure: Fix bash '=' operator for BSD
-
-BUG=https://github.com/ibus/ibus/pull/2626
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0bb8e4a1..15cb02cd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -356,7 +356,7 @@ if test x"$cross_compiling" != xyes; then
-                                  X11_LOCALEDATADIR="$X11_PREFIX/lib/X11/locale",
-                                  X11_LOCALEDATADIR="$(datadir)/X11/locale")])
- else
--    if test x"$X11_LOCALEDATADIR" == x; then
-+    if test x"$X11_LOCALEDATADIR" = x; then
-         X11_LOCALEDATADIR="$X11_PREFIX/share/X11/locale"
-     fi
-     AC_MSG_RESULT([Skipping X11 locale directory check when cross compiling. Using: $X11_LOCALEDATADIR])
--- 
-2.43.0
-

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

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-31  2:08 Takao Fujiwara [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-05-31  2:09 [rpms/ibus] autotool: Delete upstreamed patches Takao Fujiwara
2026-05-31  2:09 Takao Fujiwara
2026-05-31  2:09 Takao Fujiwara
2026-05-31  2:08 Takao Fujiwara
2026-05-31  2:08 Takao Fujiwara
2026-05-31  2:08 Takao Fujiwara
2026-05-31  2:08 Takao Fujiwara
2026-05-31  2:08 Takao Fujiwara
2026-05-31  2:08 Takao Fujiwara
2026-05-31  2:08 Takao Fujiwara
2026-05-31  2:08 Takao Fujiwara
2026-05-31  2:07 Takao Fujiwara
2026-05-31  2:07 Takao Fujiwara
2026-05-31  2:07 Takao Fujiwara
2026-05-31  2:07 Takao Fujiwara

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=178019330713.1.867559570276927851.rpms-ibus-b3ac342af126@fedoraproject.org \
    --to=tfujiwar@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