rpms/ibus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add active-surrounding-text property to IBusEngine

Browse Source 
- Refactor surrounding text warning & free focus-id tables
This commit is contained in:
Takao Fujiwara 2023-01-25 17:52:16 +09:00
parent c025d186e9
commit a3f0af0844
3 changed files with 1227 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ibus-1385349-segv-bus-proxy.patch
View File

@ -1,6 +1,6 @@
From eb9eaa6b52d5beb4aff0a45dcd2b97a4071029ea Mon Sep 17 00:00:00 2001 From 5749b4861ffcaf8083d97c6bf9858257373596ce Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com> From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Wed, 7 Dec 2022 11:11:09 +0900 Date: Wed, 25 Jan 2023 17:26:47 +0900
Subject: [PATCH] Fix SEGV in bus_panel_proxy_focus_in() Subject: [PATCH] Fix SEGV in bus_panel_proxy_focus_in()
rhbz#1350291 SEGV in BUS_IS_CONNECTION(skip_connection) in rhbz#1350291 SEGV in BUS_IS_CONNECTION(skip_connection) in
@ -143,10 +143,10 @@ index 59787a80..af2fbde2 100644
if (incoming) { if (incoming) {
/* is incoming message */ /* is incoming message */
diff --git a/bus/engineproxy.c b/bus/engineproxy.c diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index fd1f34fb..57c061ba 100644 index b3e16066..ba479b59 100644
--- a/bus/engineproxy.c --- a/bus/engineproxy.c
+++ b/bus/engineproxy.c +++ b/bus/engineproxy.c
@@ -690,10 +690,12 @@ bus_engine_proxy_g_signal (GDBusProxy *proxy, @@ -693,10 +693,12 @@ bus_engine_proxy_g_signal (GDBusProxy *proxy,
g_return_if_reached (); g_return_if_reached ();
} }
@ -160,7 +160,7 @@ index fd1f34fb..57c061ba 100644
{ {
GDBusProxyFlags flags; GDBusProxyFlags flags;
BusEngineProxy *engine; BusEngineProxy *engine;
@@ -704,12 +706,20 @@ bus_engine_proxy_new_internal (const gchar *path, @@ -706,12 +708,20 @@ bus_engine_proxy_new_internal (const gchar *path,
g_assert (path); g_assert (path);
g_assert (IBUS_IS_ENGINE_DESC (desc)); g_assert (IBUS_IS_ENGINE_DESC (desc));
g_assert (G_IS_DBUS_CONNECTION (connection)); g_assert (G_IS_DBUS_CONNECTION (connection));
@ -182,7 +182,7 @@ index fd1f34fb..57c061ba 100644
"desc", desc, "desc", desc,
"g-connection", connection, "g-connection", connection,
"g-interface-name", IBUS_INTERFACE_ENGINE, "g-interface-name", IBUS_INTERFACE_ENGINE,
@@ -717,6 +727,12 @@ bus_engine_proxy_new_internal (const gchar *path, @@ -719,6 +729,12 @@ bus_engine_proxy_new_internal (const gchar *path,
"g-default-timeout", g_gdbus_timeout, "g-default-timeout", g_gdbus_timeout,
"g-flags", flags, "g-flags", flags,
NULL); NULL);
@ -195,15 +195,15 @@ index fd1f34fb..57c061ba 100644
const gchar *layout = ibus_engine_desc_get_layout (desc); const gchar *layout = ibus_engine_desc_get_layout (desc);
if (layout != NULL && layout[0] != '\0') { if (layout != NULL && layout[0] != '\0') {
engine->keymap = ibus_keymap_get (layout); engine->keymap = ibus_keymap_get (layout);
@@ -736,6 +752,7 @@ bus_engine_proxy_new_internal (const gchar *path, @@ -756,6 +772,7 @@ bus_engine_proxy_new_internal (const gchar *path,
}
return engine; return engine;
} }
+#pragma GCC reset_options +#pragma GCC reset_options
typedef struct { typedef struct {
GTask *task; GTask *task;
@@ -798,23 +815,30 @@ create_engine_ready_cb (BusFactoryProxy *factory, @@ -818,23 +835,30 @@ create_engine_ready_cb (BusFactoryProxy *factory,
GAsyncResult *res, GAsyncResult *res,
EngineProxyNewData *data) EngineProxyNewData *data)
{ {

1231
ibus-HEAD.patch
View File

File diff suppressed because it is too large Load Diff

6
ibus.spec
View File

@ -50,7 +50,7 @@
Name: ibus Name: ibus
Version: 1.5.27 Version: 1.5.27
Release: 13%{?dist} Release: 14%{?dist}
Summary: Intelligent Input Bus for Linux OS Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.0-or-later License: LGPL-2.0-or-later
URL: https://github.com/ibus/%name/wiki URL: https://github.com/ibus/%name/wiki
@ -558,6 +558,10 @@ dconf update || :
%{_datadir}/installed-tests/ibus %{_datadir}/installed-tests/ibus
%changelog %changelog
* Wed Jan 25 2023 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.27-14
- Add active-surrounding-text property to IBusEngine
- Refactor surrounding text warning & free focus-id tables
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.27-13 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.27-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild