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

Disable ibus-panel in ibus-desktop-testing-runner

Browse Source 
- Fix annocheck in engine_proxy_new_internal()
This commit is contained in:
Takao Fujiwara 2024-05-16 14:54:31 +09:00
parent 16f99b25f8
commit d959686827
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,11 +159,10 @@ diff --git a/bus/engineproxy.c b/bus/engineproxy.c
index b3e16066..ba479b59 100644 index b3e16066..ba479b59 100644
--- a/bus/engineproxy.c --- a/bus/engineproxy.c
+++ b/bus/engineproxy.c +++ b/bus/engineproxy.c
@@ -693,10 +693,12 @@ bus_engine_proxy_g_signal (GDBusProxy *proxy, @@ -693,10 +693,11 @@ bus_engine_proxy_g_signal (GDBusProxy *proxy,
g_return_if_reached (); g_return_if_reached ();
} }
+#pragma GCC optimize ("O0")
static BusEngineProxy * static BusEngineProxy *
bus_engine_proxy_new_internal (const gchar *path, bus_engine_proxy_new_internal (const gchar *path,
IBusEngineDesc *desc, IBusEngineDesc *desc,
@ -173,7 +172,7 @@ index b3e16066..ba479b59 100644
{ {
GDBusProxyFlags flags; GDBusProxyFlags flags;
BusEngineProxy *engine; BusEngineProxy *engine;
@@ -706,12 +708,20 @@ bus_engine_proxy_new_internal (const gchar *path, @@ -706,12 +707,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));
@ -195,7 +194,7 @@ index b3e16066..ba479b59 100644
"desc", desc, "desc", desc,
"g-connection", connection, "g-connection", connection,
"g-interface-name", IBUS_INTERFACE_ENGINE, "g-interface-name", IBUS_INTERFACE_ENGINE,
@@ -719,6 +729,12 @@ bus_engine_proxy_new_internal (const gchar *path, @@ -719,6 +728,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);
@ -208,15 +207,14 @@ index b3e16066..ba479b59 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);
@@ -756,6 +772,7 @@ bus_engine_proxy_new_internal (const gchar *path, @@ -756,6 +771,6 @@ bus_engine_proxy_new_internal (const gchar *path,
return engine; return engine;
} }
+#pragma GCC reset_options
typedef struct { typedef struct {
GTask *task; GTask *task;
@@ -818,23 +835,30 @@ create_engine_ready_cb (BusFactoryProxy *factory, @@ -818,23 +833,30 @@ create_engine_ready_cb (BusFactoryProxy *factory,
GAsyncResult *res, GAsyncResult *res,
EngineProxyNewData *data) EngineProxyNewData *data)
{ {

6
ibus.spec
View File

@ -61,7 +61,7 @@
Name: ibus Name: ibus
Version: 1.5.30 Version: 1.5.30
# https://github.com/fedora-infra/rpmautospec/issues/101 # https://github.com/fedora-infra/rpmautospec/issues/101
Release: 4%{?dist} Release: 5%{?dist}
Summary: Intelligent Input Bus for Linux OS Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
URL: https://github.com/ibus/%name/wiki URL: https://github.com/ibus/%name/wiki
@ -626,6 +626,10 @@ dconf update || :
%{_datadir}/installed-tests/ibus %{_datadir}/installed-tests/ibus
%changelog %changelog
* Thu May 16 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.30-5
- Disable ibus-panel in ibus-desktop-testing-runner
- Fix annocheck in engine_proxy_new_internal()
* Tue May 14 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.30-4 * Tue May 14 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.30-4
- Disable ibus-xinit dependency of ibus-panel - Disable ibus-xinit dependency of ibus-panel