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:44 GMT [thread overview]
Message-ID: <178019332453.1.8709869598103556794.rpms-ibus-bf2314574e85@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ibus
Branch : autotool
Commit : bf2314574e85b13e28485b75b4b46b7c43b6ce54
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date : 2024-10-23T10:53:17+09:00
Stats : +0/-681 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ibus/c/bf2314574e85b13e28485b75b4b46b7c43b6ce54?branch=autotool
Log:
Delete upstreamed patches
---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
deleted file mode 100644
index edb5adf..0000000
--- a/ibus-HEAD.patch
+++ /dev/null
@@ -1,681 +0,0 @@
-From c13c54ec14ebdc8b39dda09b636daedee3ea6458 Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Thu, 26 Sep 2024 12:11:05 -0700
-Subject: [PATCH] bus: use va_marshaller to avoid GValue boxing
-
-Building your own marshaller list is most of the way there to get better
-signal performance, but you can go a bit further by having it generate
-va_marshallers and set those too.
-
-Not only do va_marshallers allow you to avoid the GValue boxing, it allows
-you to also get better profiling data at runtime.
-
-BUG=https://github.com/ibus/ibus/pull/2683
----
- bus/Makefile.am | 4 +--
- bus/dbusimpl.c | 9 ++++++
- bus/engineproxy.c | 60 +++++++++++++++++++++++++++++++++++++
- bus/inputcontext.c | 74 +++++++++++++++++++++++++++++++++++++++++++++-
- 4 files changed, 144 insertions(+), 3 deletions(-)
-
-diff --git a/bus/Makefile.am b/bus/Makefile.am
-index 99715a15..bd3481b9 100644
---- a/bus/Makefile.am
-+++ b/bus/Makefile.am
-@@ -99,12 +99,12 @@ BUILT_SOURCES = \
-
- # gen marshal
- marshalers.h: marshalers.list
-- $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=bus_marshal $(srcdir)/marshalers.list --header --internal > $@.tmp && \
-+ $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=bus_marshal $(srcdir)/marshalers.list --header --internal --valist-marshallers > $@.tmp && \
- mv $@.tmp $@
-
- marshalers.c: marshalers.h marshalers.list
- $(AM_V_GEN) (echo "#include \"marshalers.h\""; \
-- $(GLIB_GENMARSHAL) --prefix=bus_marshal $(srcdir)/marshalers.list --body --internal) > $@.tmp && \
-+ $(GLIB_GENMARSHAL) --prefix=bus_marshal $(srcdir)/marshalers.list --body --internal --valist-marshallers) > $@.tmp && \
- mv $@.tmp $@
-
- if ENABLE_EMOJI_DICT
-diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
-index 110d864a..fa8b860d 100644
---- a/bus/dbusimpl.c
-+++ b/bus/dbusimpl.c
-@@ -576,6 +576,9 @@ bus_dbus_impl_class_init (BusDBusImplClass *class)
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING);
-+ g_signal_set_va_marshaller (dbus_signals[NAME_OWNER_CHANGED],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECT_STRING_STRING_STRINGv);
-
- dbus_signals[NAME_LOST] =
- g_signal_new (I_("name-lost"),
-@@ -588,6 +591,9 @@ bus_dbus_impl_class_init (BusDBusImplClass *class)
- 2,
- BUS_TYPE_CONNECTION,
- G_TYPE_STRING);
-+ g_signal_set_va_marshaller (dbus_signals[NAME_LOST],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECT_STRINGv);
-
- dbus_signals[NAME_ACQUIRED] =
- g_signal_new (I_("name-acquired"),
-@@ -600,6 +606,9 @@ bus_dbus_impl_class_init (BusDBusImplClass *class)
- 2,
- BUS_TYPE_CONNECTION,
- G_TYPE_STRING);
-+ g_signal_set_va_marshaller (dbus_signals[NAME_ACQUIRED],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECT_STRINGv);
- }
-
- static void
-diff --git a/bus/engineproxy.c b/bus/engineproxy.c
-index b3e16066..20f89cef 100644
---- a/bus/engineproxy.c
-+++ b/bus/engineproxy.c
-@@ -189,6 +189,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- G_TYPE_NONE,
- 1,
- IBUS_TYPE_TEXT);
-+ g_signal_set_va_marshaller (engine_signals[COMMIT_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECTv);
-
- engine_signals[FORWARD_KEY_EVENT] =
- g_signal_new (I_("forward-key-event"),
-@@ -202,6 +205,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- G_TYPE_UINT,
- G_TYPE_UINT,
- G_TYPE_UINT);
-+ g_signal_set_va_marshaller (engine_signals[FORWARD_KEY_EVENT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__UINT_UINT_UINTv);
-
- engine_signals[DELETE_SURROUNDING_TEXT] =
- g_signal_new (I_("delete-surrounding-text"),
-@@ -214,6 +220,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- 2,
- G_TYPE_INT,
- G_TYPE_UINT);
-+ g_signal_set_va_marshaller (engine_signals[DELETE_SURROUNDING_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__INT_UINTv);
-
- engine_signals[REQUIRE_SURROUNDING_TEXT] =
- g_signal_new (I_("require-surrounding-text"),
-@@ -224,6 +233,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[REQUIRE_SURROUNDING_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[UPDATE_PREEDIT_TEXT] =
- g_signal_new (I_("update-preedit-text"),
-@@ -238,6 +250,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- G_TYPE_UINT,
- G_TYPE_BOOLEAN,
- G_TYPE_UINT);
-+ g_signal_set_va_marshaller (engine_signals[UPDATE_PREEDIT_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECT_UINT_BOOLEAN_UINTv);
-
- engine_signals[SHOW_PREEDIT_TEXT] =
- g_signal_new (I_("show-preedit-text"),
-@@ -248,6 +263,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[SHOW_PREEDIT_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[HIDE_PREEDIT_TEXT] =
- g_signal_new (I_("hide-preedit-text"),
-@@ -258,6 +276,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[HIDE_PREEDIT_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[UPDATE_AUXILIARY_TEXT] =
- g_signal_new (I_("update-auxiliary-text"),
-@@ -270,6 +291,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- 2,
- IBUS_TYPE_TEXT,
- G_TYPE_BOOLEAN);
-+ g_signal_set_va_marshaller (engine_signals[UPDATE_AUXILIARY_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECT_BOOLEANv);
-
- engine_signals[SHOW_AUXILIARY_TEXT] =
- g_signal_new (I_("show-auxiliary-text"),
-@@ -280,6 +304,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[SHOW_AUXILIARY_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[HIDE_AUXILIARY_TEXT] =
- g_signal_new (I_("hide-auxiliary-text"),
-@@ -290,6 +317,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[HIDE_AUXILIARY_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[UPDATE_LOOKUP_TABLE] =
- g_signal_new (I_("update-lookup-table"),
-@@ -302,6 +332,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- 2,
- IBUS_TYPE_LOOKUP_TABLE,
- G_TYPE_BOOLEAN);
-+ g_signal_set_va_marshaller (engine_signals[UPDATE_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECT_BOOLEANv);
-
- engine_signals[SHOW_LOOKUP_TABLE] =
- g_signal_new (I_("show-lookup-table"),
-@@ -312,6 +345,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[SHOW_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[HIDE_LOOKUP_TABLE] =
- g_signal_new (I_("hide-lookup-table"),
-@@ -322,6 +358,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[HIDE_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[PAGE_UP_LOOKUP_TABLE] =
- g_signal_new (I_("page-up-lookup-table"),
-@@ -332,6 +371,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[PAGE_UP_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[PAGE_DOWN_LOOKUP_TABLE] =
- g_signal_new (I_("page-down-lookup-table"),
-@@ -342,6 +384,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[PAGE_DOWN_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[CURSOR_UP_LOOKUP_TABLE] =
- g_signal_new (I_("cursor-up-lookup-table"),
-@@ -352,6 +397,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[CURSOR_UP_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[CURSOR_DOWN_LOOKUP_TABLE] =
- g_signal_new (I_("cursor-down-lookup-table"),
-@@ -362,6 +410,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (engine_signals[CURSOR_DOWN_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- engine_signals[REGISTER_PROPERTIES] =
- g_signal_new (I_("register-properties"),
-@@ -373,6 +424,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- G_TYPE_NONE,
- 1,
- IBUS_TYPE_PROP_LIST);
-+ g_signal_set_va_marshaller (engine_signals[REGISTER_PROPERTIES],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECTv);
-
- engine_signals[UPDATE_PROPERTY] =
- g_signal_new (I_("update-property"),
-@@ -384,6 +438,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- G_TYPE_NONE,
- 1,
- IBUS_TYPE_PROPERTY);
-+ g_signal_set_va_marshaller (engine_signals[UPDATE_PROPERTY],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECTv);
-
- engine_signals[PANEL_EXTENSION] =
- g_signal_new (I_("panel-extension"),
-@@ -395,6 +452,9 @@ bus_engine_proxy_class_init (BusEngineProxyClass *class)
- G_TYPE_NONE,
- 1,
- IBUS_TYPE_EXTENSION_EVENT);
-+ g_signal_set_va_marshaller (engine_signals[PANEL_EXTENSION],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECTv);
-
- text_empty = ibus_text_new_from_static_string ("");
- g_object_ref_sink (text_empty);
-diff --git a/bus/inputcontext.c b/bus/inputcontext.c
-index 85358241..9a133c88 100644
---- a/bus/inputcontext.c
-+++ b/bus/inputcontext.c
-@@ -422,6 +422,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- G_TYPE_UINT,
- G_TYPE_UINT,
- G_TYPE_UINT);
-+ g_signal_set_va_marshaller (context_signals[PROCESS_KEY_EVENT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_BOOLEAN__UINT_UINT_UINTv);
-
- context_signals[SET_CURSOR_LOCATION] =
- g_signal_new (I_("set-cursor-location"),
-@@ -436,6 +439,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- G_TYPE_INT,
- G_TYPE_INT,
- G_TYPE_INT);
-+ g_signal_set_va_marshaller (context_signals[SET_CURSOR_LOCATION],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__INT_INT_INT_INTv);
-
- context_signals[SET_CURSOR_LOCATION_RELATIVE] =
- g_signal_new (I_("set-cursor-location-relative"),
-@@ -450,6 +456,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- G_TYPE_INT,
- G_TYPE_INT,
- G_TYPE_INT);
-+ g_signal_set_va_marshaller (context_signals[SET_CURSOR_LOCATION_RELATIVE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__INT_INT_INT_INTv);
-
- context_signals[FOCUS_IN] =
- g_signal_new (I_("focus-in"),
-@@ -459,6 +468,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- NULL, NULL,
- bus_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-+ g_signal_set_va_marshaller (context_signals[FOCUS_IN],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[FOCUS_OUT] =
- g_signal_new (I_("focus-out"),
-@@ -468,6 +480,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- NULL, NULL,
- bus_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-+ g_signal_set_va_marshaller (context_signals[FOCUS_OUT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[UPDATE_PREEDIT_TEXT] =
- g_signal_new (I_("update-preedit-text"),
-@@ -481,6 +496,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- IBUS_TYPE_TEXT,
- G_TYPE_UINT,
- G_TYPE_BOOLEAN);
-+ g_signal_set_va_marshaller (context_signals[UPDATE_PREEDIT_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECT_UINT_BOOLEANv);
-
- context_signals[SHOW_PREEDIT_TEXT] =
- g_signal_new (I_("show-preedit-text"),
-@@ -491,6 +509,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (context_signals[SHOW_PREEDIT_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[HIDE_PREEDIT_TEXT] =
- g_signal_new (I_("hide-preedit-text"),
-@@ -501,6 +522,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (context_signals[HIDE_PREEDIT_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[UPDATE_AUXILIARY_TEXT] =
- g_signal_new (I_("update-auxiliary-text"),
-@@ -513,6 +537,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- 2,
- IBUS_TYPE_TEXT,
- G_TYPE_BOOLEAN);
-+ g_signal_set_va_marshaller (context_signals[UPDATE_AUXILIARY_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECT_BOOLEANv);
-
- context_signals[SHOW_AUXILIARY_TEXT] =
- g_signal_new (I_("show-auxiliary-text"),
-@@ -523,6 +550,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (context_signals[SHOW_AUXILIARY_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[HIDE_AUXILIARY_TEXT] =
- g_signal_new (I_("hide-auxiliary-text"),
-@@ -533,6 +563,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (context_signals[HIDE_AUXILIARY_TEXT],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[UPDATE_LOOKUP_TABLE] =
- g_signal_new (I_("update-lookup-table"),
-@@ -545,6 +578,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- 2,
- IBUS_TYPE_LOOKUP_TABLE,
- G_TYPE_BOOLEAN);
-+ g_signal_set_va_marshaller (context_signals[UPDATE_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECT_BOOLEANv);
-
- context_signals[SHOW_LOOKUP_TABLE] =
- g_signal_new (I_("show-lookup-table"),
-@@ -554,6 +590,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- NULL, NULL,
- bus_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-+ g_signal_set_va_marshaller (context_signals[SHOW_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[HIDE_LOOKUP_TABLE] =
- g_signal_new (I_("hide-lookup-table"),
-@@ -563,6 +602,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- NULL, NULL,
- bus_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-+ g_signal_set_va_marshaller (context_signals[HIDE_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[PAGE_UP_LOOKUP_TABLE] =
- g_signal_new (I_("page-up-lookup-table"),
-@@ -572,6 +614,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- NULL, NULL,
- bus_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-+ g_signal_set_va_marshaller (context_signals[PAGE_UP_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[PAGE_DOWN_LOOKUP_TABLE] =
- g_signal_new (I_("page-down-lookup-table"),
-@@ -581,6 +626,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- NULL, NULL,
- bus_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-+ g_signal_set_va_marshaller (context_signals[PAGE_DOWN_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[CURSOR_UP_LOOKUP_TABLE] =
- g_signal_new (I_("cursor-up-lookup-table"),
-@@ -590,6 +638,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- NULL, NULL,
- bus_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-+ g_signal_set_va_marshaller (context_signals[CURSOR_UP_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[CURSOR_DOWN_LOOKUP_TABLE] =
- g_signal_new (I_("cursor-down-lookup-table"),
-@@ -599,6 +650,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- NULL, NULL,
- bus_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-+ g_signal_set_va_marshaller (context_signals[CURSOR_DOWN_LOOKUP_TABLE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- context_signals[REGISTER_PROPERTIES] =
- g_signal_new (I_("register-properties"),
-@@ -610,6 +664,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- G_TYPE_NONE,
- 1,
- IBUS_TYPE_PROP_LIST);
-+ g_signal_set_va_marshaller (context_signals[REGISTER_PROPERTIES],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECTv);
-
- context_signals[UPDATE_PROPERTY] =
- g_signal_new (I_("update-property"),
-@@ -621,6 +678,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- G_TYPE_NONE,
- 1,
- IBUS_TYPE_PROPERTY);
-+ g_signal_set_va_marshaller (context_signals[UPDATE_PROPERTY],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECTv);
-
- context_signals[ENGINE_CHANGED] =
- g_signal_new (I_("engine-changed"),
-@@ -631,6 +691,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- bus_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
-+ g_signal_set_va_marshaller (context_signals[ENGINE_CHANGED],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__VOIDv);
-
- /* This signal is not for notifying an event on this object, but is for
- * requesting an engine as the name shows.
-@@ -646,7 +709,10 @@ bus_input_context_class_init (BusInputContextClass *class)
- bus_marshal_OBJECT__STRING,
- IBUS_TYPE_ENGINE_DESC,
- 1,
-- G_TYPE_STRING);
-+ G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);
-+ g_signal_set_va_marshaller (context_signals[REQUEST_ENGINE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__STRINGv);
-
- context_signals[SET_CONTENT_TYPE] =
- g_signal_new (I_("set-content-type"),
-@@ -659,6 +725,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- 2,
- G_TYPE_UINT,
- G_TYPE_UINT);
-+ g_signal_set_va_marshaller (context_signals[SET_CONTENT_TYPE],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__UINT_UINTv);
-
- context_signals[PANEL_EXTENSION] =
- g_signal_new (I_("panel-extension"),
-@@ -670,6 +739,9 @@ bus_input_context_class_init (BusInputContextClass *class)
- G_TYPE_NONE,
- 1,
- IBUS_TYPE_EXTENSION_EVENT);
-+ g_signal_set_va_marshaller (context_signals[PANEL_EXTENSION],
-+ G_TYPE_FROM_CLASS (class),
-+ bus_marshal_VOID__OBJECTv);
-
- text_empty = ibus_text_new_from_string ("");
- g_object_ref_sink (text_empty);
---
-2.46.1
-
-From c0b27e50fbfff50fcbdae4cb33afd889b1dde6d8 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Tue, 24 Sep 2024 19:13:46 +0900
-Subject: [PATCH] ui/gtk3: Wait for hide-preedit-text signal for Emoji category
-
-IBusEngineSimple calls HidePreeditText D-Bus signal with focus-out
-signal so Emojier should wait for it before launch the dialog.
-
-BUG=rhbz#2310892
----
- ui/gtk3/panelbinding.vala | 28 +++++++++++++++++++++++++---
- 1 file changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala
-index caad1b0b..10d09d75 100644
---- a/ui/gtk3/panelbinding.vala
-+++ b/ui/gtk3/panelbinding.vala
-@@ -3,7 +3,7 @@
- * ibus - The Input Bus
- *
- * Copyright(c) 2018 Peng Huang <shawn.p.huang@gmail.com>
-- * Copyright(c) 2018-2021 Takao Fujwiara <takao.fujiwara1@gmail.com>
-+ * Copyright(c) 2018-2024 Takao Fujwiara <takao.fujiwara1@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -217,6 +217,7 @@ class PanelBinding : IBus.PanelService {
- private IBusEmojier? m_emojier;
- private uint m_emojier_set_emoji_lang_id;
- private uint m_emojier_focus_commit_text_id;
-+ private uint m_emojier_focus_emoji_category_id;
- private string[] m_emojier_favorites = {};
- private Gtk.CssProvider m_css_provider;
- private const uint PRELOAD_ENGINES_DELAY_TIME = 30000;
-@@ -912,8 +913,14 @@ class PanelBinding : IBus.PanelService {
- true);
- string params = event.get_params();
- if (params == "category-list") {
-- key_press_space();
-- show_preedit_and_candidate(true);
-+ if (m_emojier_focus_emoji_category_id > 0)
-+ return;
-+ m_emojier_focus_emoji_category_id =
-+ GLib.Timeout.add_seconds(1, () => {
-+ info("Timeout to show Emoji category list.");
-+ show_category_list_real();
-+ return false;
-+ });
- }
- }
-
-@@ -962,6 +969,15 @@ class PanelBinding : IBus.PanelService {
- if (m_is_wayland && m_preedit.get_text() == "")
- return;
- show_preedit_and_candidate(false);
-+
-+ /* Clicking on "Emoji Choice" will call ibus_engine_simple_focus_out()
-+ * -> PanelBinding.hide_preedit_text() with IBusEngineSimple but not
-+ * other engines.
-+ */
-+ if (m_emojier_focus_emoji_category_id > 0) {
-+ GLib.Source.remove(m_emojier_focus_emoji_category_id);
-+ show_category_list_real();
-+ }
- }
-
-
-@@ -1128,6 +1144,12 @@ class PanelBinding : IBus.PanelService {
- show_preedit_and_candidate(show_candidate);
- }
-
-+ private void show_category_list_real() {
-+ key_press_space();
-+ show_preedit_and_candidate(true);
-+ m_emojier_focus_emoji_category_id = 0;
-+ }
-+
- private void candidate_clicked_lookup_table_real(uint index,
- uint button,
- uint state,
---
-2.46.0
-
-From eb92f6f1a3401ad8b1b884c1ceab5dbdc4942403 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Fri, 4 Oct 2024 21:34:02 +0900
-Subject: [PATCH] configure: Add --with-python-overrides-dir option
-
-The default GI directory is /usr in Flatpak but the directory is readonly
-with `flatpak-builder` and the Flatpak specific GI files are installed in
-/app GI directory.
-
-Fixes: https://github.com/ibus/ibus/commit/20b29c1
----
- configure.ac | 28 +++++++++++++++------------
- test/org.test.IBus.Fedoraproject.json | 4 ++--
- test/org.test.IBus.Freedesktop.json | 4 ++--
- test/org.test.IBus.GNOME.json | 4 ++--
- 4 files changed, 22 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ec392a81..453c83ba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -512,24 +512,27 @@ AM_CONDITIONAL([ENABLE_DAEMON], [true])
-
- PYGOBJECT_REQUIRED=3.0.0
-
-+# Define Python overrides dir.
- # When IBus is built with the Json files in test directory, the build
--# tries to install IBus.py file into pyoverridesdir
--# but the directory is readonly with `flatpak-builder`
--AC_ARG_ENABLE(pygobject,
-- AS_HELP_STRING([--disable-pygobject],
-- [Disable pygobject.]),
-- [enable_pygobject=$enableval],
-- [enable_pygobject=yes]
-+# tries to install IBus.py file into pyoverridesdir.
-+# The default GI directory is /usr in Flatpak but the directory is readonly
-+# with `flatpak-builder` and the Flatpak specific GI files are installed in
-+# /app GI directory.
-+AC_ARG_WITH(python-overrides-dir,
-+ AS_HELP_STRING([--with-python-overrides-dir[=DIR]],
-+ [Select Python overrides dir]),
-+ pyoverridesdir=$with_python_overrides_dir
- )
-
--if test "x$enable_pygobject" = "xyes"; then
-- PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
-- [enable_pygobject=yes], [enable_pygobject=no])
--fi
-+PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
-+ [enable_pygobject=yes], [enable_pygobject=no])
-+
- if test "x$enable_pygobject" = "xyes"; then
- PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
-
-- pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
-+ if test x"$pyoverridesdir" = x""; then
-+ pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
-+ fi
- AC_SUBST(pyoverridesdir)
-
- if test x"$enable_python2" = x"yes"; then
-@@ -935,6 +938,7 @@ Build options:
- CFLAGS $CFLAGS
- PYTHON $PYTHON
- PYTHON2 $PYTHON2
-+ Python overrides dir $pyoverridesdir
- Enable python2 $enable_python2
- Gtk2 immodule dir $GTK2_IM_MODULEDIR
- Gtk3 immodule dir $GTK3_IM_MODULEDIR
---
-2.46.1
-
next 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 [rpms/ibus] autotool: Delete Upstreamed patches Takao Fujiwara
2026-05-31 2:08 [rpms/ibus] autotool: Delete upstreamed patches 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=178019332453.1.8709869598103556794.rpms-ibus-bf2314574e85@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