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] f45: Delete upstreamed patches
Date: Tue, 22 Sep 2026 11:48:19 GMT [thread overview]
Message-ID: <179007769926.1.1429857864738936392.rpms-ibus-df30eb419dce@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ibus
Branch : f45
Commit : df30eb419dceb395aebe525e2de5e3c7a4aa382c
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date : 2026-09-22T20:45:59+09:00
Stats : +0/-117 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ibus/c/df30eb419dceb395aebe525e2de5e3c7a4aa382c?branch=f45
Log:
Delete upstreamed patches
---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
deleted file mode 100644
index 6054b2f..0000000
--- a/ibus-HEAD.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 1a331e695d84fc6bae8f2d11c52d4776df49647b Mon Sep 17 00:00:00 2001
-From: Sebastian Keller <skeller@gnome.org>
-Date: Thu, 27 Aug 2026 21:07:58 +0200
-Subject: [PATCH] src: Fix IBusAttrList leak when converting text
-
-After 5bbe88a1 the attribute list set on the text was getting leaked
-when the list passed to `ibus_attr_list_copy_format_to_*()` had a length
-of 0. In that case the list is already non-floating before the copy
-function adds a ref and returns it. This then is passed to
-`ibus_text_set_attributes()` which calls `g_object_ref_sink()`. Since
-the list is not floating, this adds another ref that would not be added
-in the length > 0 case. This surplus ref is causing the list to be
-leaked.
-
-To fix this leak we need to unref the list after calling
-`ibus_text_set_attributes()`.
-
-However in the length > 0 case the new list returned by
-`ibus_attr_list_copy_format_to_*()` is floating, so this would drop the
-refcount to 0. To avoid this we need to ensure that if the list is floating the
-floating ref is sunk before calling `ibus_text_set_attributes()`, so the
-call to `g_object_ref_sink()` in there adds a ref, such that we can
-safely unref this after the call to `ibus_text_set_attributes()`.
-
-This also keeps the guarantee that the list is not floating anymore
-after converting text to not regress the issue fixed by 5bbe88a1.
-
-Fixes: https://github.com/ibus/ibus/commit/5bbe88a1
-Closes: https://github.com/ibus/ibus/issues/2941
----
- src/ibusinputcontext.c | 20 ++++++++++++++++++--
- src/ibuspanelservice.c | 20 ++++++++++++++++++--
- 2 files changed, 36 insertions(+), 4 deletions(-)
-
-diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
-index bdfd166d..d0e162fc 100644
---- a/src/ibusinputcontext.c
-+++ b/src/ibusinputcontext.c
-@@ -569,8 +569,16 @@ ibus_input_context_convert_text (IBusInputContext *context,
- text->text, error->message);
- g_error_free (error);
- }
-- if (new_attrs)
-+ if (new_attrs) {
-+#if GLIB_CHECK_VERSION (2, 70, 0)
-+ g_object_take_ref (new_attrs);
-+#else
-+ if (g_object_is_floating (new_attrs)
-+ g_object_ref_sink (new_attrs);
-+#endif
- ibus_text_set_attributes (text, new_attrs);
-+ g_object_unref (new_attrs);
-+ }
- break;
- case IBUS_PREEDIT_FORMAT_HINT:
- new_attrs = ibus_attr_list_copy_format_to_hint (text->attrs, &error);
-@@ -579,8 +587,16 @@ ibus_input_context_convert_text (IBusInputContext *context,
- text->text, error->message);
- g_error_free (error);
- }
-- if (new_attrs)
-+ if (new_attrs) {
-+#if GLIB_CHECK_VERSION (2, 70, 0)
-+ g_object_take_ref (new_attrs);
-+#else
-+ if (g_object_is_floating (new_attrs)
-+ g_object_ref_sink (new_attrs);
-+#endif
- ibus_text_set_attributes (text, new_attrs);
-+ g_object_unref (new_attrs);
-+ }
- break;
- default:
- g_assert_not_reached ();
-diff --git a/src/ibuspanelservice.c b/src/ibuspanelservice.c
-index 14cca3ec..18404a39 100644
---- a/src/ibuspanelservice.c
-+++ b/src/ibuspanelservice.c
-@@ -1203,8 +1203,16 @@ ibus_panel_convert_text (IBusPanelService *panel,
- text->text, error->message);
- g_error_free (error);
- }
-- if (new_attrs)
-+ if (new_attrs) {
-+#if GLIB_CHECK_VERSION (2, 70, 0)
-+ g_object_take_ref (new_attrs);
-+#else
-+ if (g_object_is_floating (new_attrs)
-+ g_object_ref_sink (new_attrs);
-+#endif
- ibus_text_set_attributes (text, new_attrs);
-+ g_object_unref (new_attrs);
-+ }
- break;
- case IBUS_PREEDIT_FORMAT_HINT:
- new_attrs = ibus_attr_list_copy_format_to_hint (text->attrs, &error);
-@@ -1213,8 +1221,16 @@ ibus_panel_convert_text (IBusPanelService *panel,
- text->text, error->message);
- g_error_free (error);
- }
-- if (new_attrs)
-+ if (new_attrs) {
-+#if GLIB_CHECK_VERSION (2, 70, 0)
-+ g_object_take_ref (new_attrs);
-+#else
-+ if (g_object_is_floating (new_attrs)
-+ g_object_ref_sink (new_attrs);
-+#endif
- ibus_text_set_attributes (text, new_attrs);
-+ g_object_unref (new_attrs);
-+ }
- break;
- default:
- g_assert_not_reached ();
---
-2.55.0
-
next reply other threads:[~2026-09-22 11:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-22 11:48 Takao Fujiwara [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-08-12 3:34 [rpms/ibus] f45: Delete upstreamed patches 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=179007769926.1.1429857864738936392.rpms-ibus-df30eb419dce@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