[rpms/ibus] autotool: Delete upstreamed patches

[Takao Fujiwara <tfujiwar@redhat.com>]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : ec18df2f392f98aa112d868849c96e85e93aefc2
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2025-02-07T09:27:44+09:00
Stats  : +0/-302 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/ec18df2f392f98aa112d868849c96e85e93aefc2?branch=autotool

Log:
Delete upstreamed patches

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
deleted file mode 100644
index 6c9f183..0000000
--- a/ibus-HEAD.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From c5748e6257e7f203595784e9a10e144e86379a80 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Tue, 21 Jan 2025 20:37:20 +0900
-Subject: [PATCH] client/wayland: Fix repeating key between focus
-
----
- client/wayland/ibuswaylandim.c | 22 ++++++++++++++++++++++
- tools/main.vala                |  4 +++-
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/client/wayland/ibuswaylandim.c b/client/wayland/ibuswaylandim.c
-index 98efb1cb..066f7cbd 100644
---- a/client/wayland/ibuswaylandim.c
-+++ b/client/wayland/ibuswaylandim.c
-@@ -161,6 +161,7 @@ struct _IBusWaylandKeyEvent
-     int count;
-     guint count_cb_id;
-     guint repeat_rate_id;
-+    char *ibus_object_path;
-     gboolean retval;
- };
- typedef struct _IBusWaylandKeyEvent IBusWaylandKeyEvent;
-@@ -1312,6 +1313,12 @@ _process_key_event_repeat_rate_cb (gpointer user_data)
-         event->repeat_rate_id = 0;
-         return G_SOURCE_REMOVE;
-     }
-+    if (g_strcmp0 (event->ibus_object_path,
-+                   g_dbus_proxy_get_object_path (
-+                           G_DBUS_PROXY (priv->ibuscontext)))) {
-+        event->repeat_rate_id = 0;
-+        return G_SOURCE_REMOVE;
-+    }
-     switch (_use_sync_mode) {
-     case 1:
-         _process_key_event_sync (wlim, event);
-@@ -1349,6 +1356,14 @@ _process_key_event_repeat_delay_cb (gpointer user_data)
-         event->count_cb_id = 0;
-         return G_SOURCE_REMOVE;
-     }
-+    /* The focus is changed. */
-+    if (g_strcmp0 (event->ibus_object_path,
-+                   g_dbus_proxy_get_object_path (
-+                           G_DBUS_PROXY (priv->ibuscontext)))) {
-+        event->count_cb_id = 0;
-+        g_clear_pointer (&event->ibus_object_path, g_free);
-+        return G_SOURCE_REMOVE;
-+    }
- 
-     if (event->count)
-         return G_SOURCE_CONTINUE;
-@@ -1400,6 +1415,9 @@ key_event_check_repeat (IBusWaylandIM       *wlim,
-             g_source_remove (repeating_event.count_cb_id);
-             repeating_event.count_cb_id = 0;
-         }
-+        g_clear_pointer (&repeating_event.ibus_object_path, g_free);
-+        if (!priv->ibuscontext)
-+            return FALSE;
-         source = g_timeout_source_new (priv->repeat_delay);
-         g_source_attach (source, NULL);
-         g_source_unref (source);
-@@ -1407,6 +1425,9 @@ key_event_check_repeat (IBusWaylandIM       *wlim,
-         memcpy (&repeating_event, event, sizeof (IBusWaylandKeyEvent));
-         repeating_event.count_cb_id = g_source_get_id (source);
-         repeating_event.count = 0;
-+        repeating_event.ibus_object_path =
-+                       g_strdup (g_dbus_proxy_get_object_path (
-+                               G_DBUS_PROXY (priv->ibuscontext)));
-         g_source_set_callback (source, _process_key_event_repeat_delay_cb,
-                                &repeating_event, NULL);
-     } else {
-@@ -1418,6 +1439,7 @@ key_event_check_repeat (IBusWaylandIM       *wlim,
-             g_source_remove (repeating_event.count_cb_id);
-             repeating_event.count_cb_id = 0;
-         }
-+        g_clear_pointer (&repeating_event.ibus_object_path, g_free);
-     }
-     return TRUE;
- }
-diff --git a/tools/main.vala b/tools/main.vala
-index fae3b9f1..3c0ea648 100644
---- a/tools/main.vala
-+++ b/tools/main.vala
-@@ -87,6 +87,7 @@ name_appeared_handler(GLib.DBusConnection connection,
-     loop = null;
- }
- 
-+
- private void
- kde_virtual_keyboard_avail_cb(GLib.DBusConnection connection,
-                               string?             sender_name,
-@@ -258,7 +259,7 @@ bool start_daemon_in_wayland(bool     restart,
-                              string[] _argv) {
- 
-     check_wayland_protocols();
--    if (!is_wayland_session) {
-+    if (!is_wayland_session && verbose) {
-         stderr.printf("Cannot find the Wayland input-method protocol.\n");
-         return false;
-     }
-@@ -318,6 +319,7 @@ bool start_daemon_in_wayland(bool     restart,
- }
- #endif
- 
-+
- bool
- start_daemon_with_dbus_systemd(GLib.DBusConnection connection,
-                                bool                restart,
--- 
-2.47.0
-
-From aac5446e8c98db934912b9b15a1ef92c3b7e4c8c Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Fri, 24 Jan 2025 09:40:31 +0900
-Subject: [PATCH 1/2] src: Fix declaration errors with GCC 15
-
-BUG=rhbz#2340629
----
- src/ibuscomposetable.c | 2 +-
- src/ibusenginesimple.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
-index abf51244..cf865c37 100644
---- a/src/ibuscomposetable.c
-+++ b/src/ibuscomposetable.c
-@@ -1362,7 +1362,7 @@ ibus_compose_table_new_with_list (GList   *compose_list,
-     gsize s_size_total, s_size_16bit, v_size_32bit, v_index_32bit;
-     guint n = 0, m = 0;
-     int i, j;
--    gpointer rawdata;
-+    gpointer rawdata = NULL;
-     guint16 *ibus_compose_seqs = NULL;
-     guint16 *ibus_compose_seqs_32bit_first = NULL;
-     guint32 *ibus_compose_seqs_32bit_second = NULL;
-diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
-index a2715ab6..ec4a70ac 100644
---- a/src/ibusenginesimple.c
-+++ b/src/ibusenginesimple.c
-@@ -501,7 +501,7 @@ check_hex (IBusEngineSimple *simple,
- }
- 
- static IBusEngineDict *
--load_emoji_dict ()
-+load_emoji_dict (void)
- {
-     IBusEngineDict *emoji_dict;
-     GList *keys;
-@@ -544,7 +544,7 @@ check_emoji_table (IBusEngineSimple       *simple,
-         g_object_ref_sink (priv->lookup_table);
-     }
-     if (emoji_dict == NULL)
--        emoji_dict = priv->emoji_dict = load_emoji_dict (simple);
-+        emoji_dict = priv->emoji_dict = load_emoji_dict ();
- 
-     if (emoji_dict == NULL || emoji_dict->dict == NULL)
-         return FALSE;
--- 
-2.47.0
-
-From d039b95b1af14fd34167a4ca038938cef2ea41ca Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Fri, 24 Jan 2025 10:01:11 +0900
-Subject: [PATCH 2/2] util/IMdkit: Fix incompatible-pointer-types in TransportSW.checkAddr
-
-BUG=rhbz#2340629
----
- util/IMdkit/Xi18n.h           | 18 ++++++++++--------
- util/IMdkit/i18nMethod.c      |  3 ++-
- util/IMdkit/i18nOffsetCache.c | 10 ++++++----
- 3 files changed, 18 insertions(+), 13 deletions(-)
-
-diff --git a/util/IMdkit/Xi18n.h b/util/IMdkit/Xi18n.h
-index 79dd9619..09097bb6 100644
---- a/util/IMdkit/Xi18n.h
-+++ b/util/IMdkit/Xi18n.h
-@@ -3,7 +3,7 @@
-          Copyright (C) 1994-1995 Sun Microsystems, Inc.
-          Copyright (C) 1993-1994 Hewlett-Packard Company
-          Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
--         Copyright (C) 2014 Red Hat, Inc.
-+         Copyright (C) 2014-2025 Red Hat, Inc.
-  
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without fee,
-@@ -71,13 +71,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #define I18N_SET	1
- #define I18N_GET	2
- 
--typedef struct
--{
--    char        *transportname;
--    int         namelen;
--    Bool        (*checkAddr) ();
--} TransportSW;
--
- typedef struct _XIMPending
- {
-     unsigned    char *p;
-@@ -172,6 +165,15 @@ typedef struct _Xi18nClient
- 
- typedef struct _Xi18nCore *Xi18n;
- 
-+typedef struct _TransportSW TransportSW;
-+
-+struct _TransportSW
-+{
-+    char        *transportname;
-+    int         namelen;
-+    Bool        (*checkAddr) (Xi18n, TransportSW *, char *);
-+};
-+
- /*
-  * Callback Struct for XIM Protocol
-  */
-diff --git a/util/IMdkit/i18nMethod.c b/util/IMdkit/i18nMethod.c
-index 9c44e7fe..7f343d87 100644
---- a/util/IMdkit/i18nMethod.c
-+++ b/util/IMdkit/i18nMethod.c
-@@ -2,6 +2,7 @@
-  
-          Copyright 1994, 1995 by Sun Microsystems, Inc.
-          Copyright 1993, 1994 by Hewlett-Packard Company
-+         Copyright (C) 2014-2025 Red Hat, Inc.
-  
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without fee,
-@@ -89,7 +90,7 @@ TransportSW _TransR[] =
- #ifdef DNETCONN
-     {"decnet",          6, _Xi18nCheckTransAddress},
- #endif
--    {(char *) NULL,     0, (Bool (*) ()) NULL}
-+    {(char *) NULL,     0, (Bool (*) (Xi18n, TransportSW *, char *))NULL}
- };
- 
- static Bool GetInputStyles (Xi18n i18n_core, XIMStyles **p_style)
-diff --git a/util/IMdkit/i18nOffsetCache.c b/util/IMdkit/i18nOffsetCache.c
-index e2fe8c6b..cab974c7 100644
---- a/util/IMdkit/i18nOffsetCache.c
-+++ b/util/IMdkit/i18nOffsetCache.c
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
-- * Copyright (C) 2014 Red Hat, Inc.
-+ * Copyright (C) 2014-2025 Red Hat, Inc.
-  *
-  * Permission to use, copy, modify, distribute, and sell this
-  * software and its documentation for any purpose is hereby granted
-@@ -83,10 +83,12 @@ void _Xi18nSetPropertyOffset (Xi18nOffsetCache *offset_cache, Atom key,
-     }
- 
-     if (++offset_cache->size > offset_cache->capacity) {
--        offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
--        offset_cache->data = (Xi18nAtomOffsetPair *) realloc (data,
-+        Xi18nAtomOffsetPair *pair = (Xi18nAtomOffsetPair *) realloc (data,
-                 offset_cache->capacity * sizeof (Xi18nAtomOffsetPair));
--        if (offset_cache->data == NULL) {
-+        offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
-+        if (pair) {
-+            offset_cache->data = pair;
-+        } else {
-             offset_cache->data = data;
-             --offset_cache->size;
-         }
--- 
-2.47.0
-
-From 4364c53e2f9f8c6207a0c0210a023394172c7909 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Fri, 24 Jan 2025 13:38:17 +0900
-Subject: [PATCH] src/ibuskeysyms: Fix typo IBUS_KEY_Ukranian_je
-
----
- src/ibuskeysyms.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ibuskeysyms.h b/src/ibuskeysyms.h
-index 3c2e0d0e..0578f8b6 100644
---- a/src/ibuskeysyms.h
-+++ b/src/ibuskeysyms.h
-@@ -2,8 +2,8 @@
- /* vim:set et sts=4: */
- /* ibus - The Input Bus
-  * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang@gmail.com>
-- * Copyright (C) 2013-2024 Takao Fujiwara <takao.fujiwara1@gmail.com>
-- * Copyright (C) 2008-2024 Red Hat, Inc.
-+ * Copyright (C) 2013-2025 Takao Fujiwara <takao.fujiwara1@gmail.com>
-+ * Copyright (C) 2008-2025 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -916,7 +916,7 @@
- #define IBUS_KEY_Macedonia_gje 0x6a2
- #define IBUS_KEY_Cyrillic_io 0x6a3
- #define IBUS_KEY_Ukrainian_ie 0x6a4
--#define IBUS_KEY_Ukranian_ie 0x6a4 /* deprecated */
-+#define IBUS_KEY_Ukranian_je 0x6a4 /* deprecated */
- #define IBUS_KEY_Macedonia_dse 0x6a5
- #define IBUS_KEY_Ukrainian_i 0x6a6
- #define IBUS_KEY_Ukranian_i 0x6a6 /* deprecated */
--- 
-2.47.0
-