public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ibus] autotool: Resolves #2340629 FTBFS in Fedora rawhide/f42
@ 2026-05-31 2:08 Takao Fujiwara
0 siblings, 0 replies; only message in thread
From: Takao Fujiwara @ 2026-05-31 2:08 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ibus
Branch : autotool
Commit : e360296224bfd028bc31c78da50069279b23386f
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date : 2025-01-24T10:08:48+09:00
Stats : +272/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/ibus/c/e360296224bfd028bc31c78da50069279b23386f?branch=autotool
Log:
Resolves #2340629 FTBFS in Fedora rawhide/f42
---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index e69de29..1986dc8 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -0,0 +1,266 @@
+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
+
diff --git a/ibus.spec b/ibus.spec
index f932d0d..6ad04d8 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -62,7 +62,7 @@
Name: ibus
Version: 1.5.32~beta1
# https://github.com/fedora-infra/rpmautospec/issues/101
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1-or-later
URL: https://github.com/ibus/%name/wiki
@@ -71,6 +71,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
# Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
Patch1: %{name}-1385349-segv-bus-proxy.patch
@@ -638,6 +639,10 @@ dconf update || :
%{_datadir}/installed-tests/ibus
%changelog
+* Fri Jan 24 2025 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.32~beta1-3
+- Resolves #2340629 declaration errors with GCC 15
+- Resolves #2340629 incompatible-pointer-types in TransportSW.checkAddr
+
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.32~beta1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-05-31 2:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-31 2:08 [rpms/ibus] autotool: Resolves #2340629 FTBFS in Fedora rawhide/f42 Takao Fujiwara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox