[rpms/ibus] autotool: Add GitHub action patches

[rpms/ibus] autotool: Add GitHub action patches

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : e01f12626aa2d11f160da49d4a3fb855760b42d7
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2022-12-02T15:30:11+09:00
Stats  : +155/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/e01f12626aa2d11f160da49d4a3fb855760b42d7?branch=autotool

Log:
Add GitHub action patches

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index c95240e..e68a241 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -750,3 +750,154 @@ index a8eee319..ba2a0010 100644
 -- 
 2.37.3
 
+From 2719e936cc1f1f26f414b339a7f4f0e48331732f Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Tue, 22 Nov 2022 21:47:01 +0900
+Subject: [PATCH] src/tests: Fallback gtk-query-immodules-3.0 for Ubuntu
+ 22.04
+
+---
+ src/tests/runtest | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/tests/runtest b/src/tests/runtest
+index a229140a..036dc771 100755
+--- a/src/tests/runtest
++++ b/src/tests/runtest
+@@ -44,6 +44,10 @@ MACHINE=`uname -m`
+ if test x"$MACHINE" = xx86_64 ; then
+     GTK_QUERY_MODULE=gtk-query-immodules-3.0-64
+ fi
++which $GTK_QUERY_MODULE
++if [ $? -ne 0 ] ; then
++    GTK_QUERY_MODULE=gtk-query-immodules-3.0
++fi
+ 
+ retval=0
+ 
+-- 
+2.37.3
+
+From 2555fa9781ccb40445d8a344ec180ff654e0c5f1 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 2 Dec 2022 13:41:39 +0900
+Subject: [PATCH] src/tests: Fix Connection refused in ibus-bus
+
+ibus-bus is failed in Ubuntu 22.04 under GitHub action + Docer
+with the warning of:
+"Unable to connect to ibus: Could not connect: Connection refused"
+during ibus_bus_new_async()'s callback if IBus socket file is
+deleted after ibus_bus_exit_async()'s callback is called.
+---
+ src/tests/ibus-bus.c | 70 +++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 66 insertions(+), 4 deletions(-)
+
+diff --git a/src/tests/ibus-bus.c b/src/tests/ibus-bus.c
+index a2af0bb2..d6b105cf 100644
+--- a/src/tests/ibus-bus.c
++++ b/src/tests/ibus-bus.c
+@@ -802,6 +802,33 @@ start_set_preload_engines_async (void)
+             NULL); /* user_data */
+ }
+ 
++static void
++_socket_changed_cb (GFileMonitor       *monitor,
++                    GFile              *file,
++                    GFile              *other_file,
++                    GFileMonitorEvent   event_type,
++                    IBusBus            *bus)
++{
++    switch (event_type) {
++    case G_FILE_MONITOR_EVENT_CHANGED:
++        g_debug ("IBus socket file is changed");
++        call_next_async_function ();
++        g_signal_handlers_disconnect_by_func (monitor,
++                                              G_CALLBACK (_socket_changed_cb),
++                                              NULL);
++        g_object_unref (monitor);
++        break;
++    case G_FILE_MONITOR_EVENT_CREATED:
++        g_debug ("IBus socket file is created");
++        break;
++    case G_FILE_MONITOR_EVENT_DELETED:
++        g_debug ("IBus socket file is deleted");
++        break;
++    default:
++        g_debug ("IBus socket file's status is %d\n", event_type);
++    }
++}
++
+ static void
+ finish_exit_async (GObject *source_object,
+                    GAsyncResult *res,
+@@ -811,15 +838,25 @@ finish_exit_async (GObject *source_object,
+     gboolean result = ibus_bus_exit_async_finish (bus,
+                                                   res,
+                                                   &error);
++    gboolean has_socket_path = GPOINTER_TO_INT (user_data);
++    if (error) {
++        g_warning ("Failed to ibus_bus_exit(): %s", error->message);
++        g_error_free (error);
++    }
+     g_assert (result);
+-    g_debug ("ibus_bus_exit_finish: OK");
+-    g_usleep (G_USEC_PER_SEC);
+-    call_next_async_function ();
++    if (has_socket_path == FALSE) {
++        g_debug ("ibus_bus_exit_finish: OK socket file: none");
++        g_usleep (G_USEC_PER_SEC);
++        call_next_async_function ();
++    } else {
++        g_debug ("ibus_bus_exit_finish: OK socket file: monitored");
++    }
+ }
+ 
+ static void
+ start_exit_async (void)
+ {
++    gboolean has_socket_path = FALSE;
+     /* When `./runtest ibus-bus` runs, ibus-daemon sometimes failed to
+      * restart because closing a file descriptor was failed in
+      * bus/server.c:_restart_server() with a following error:
+@@ -828,12 +865,37 @@ start_exit_async (void)
+      * fail to restart ibus-daemon.
+      */
+     g_usleep (G_USEC_PER_SEC);
++    /* IBus socket file can be deleted after finish_exit_async() is called
++     * so the next ibus_bus_new_async() in test_bus_new_async() could be failed
++     * if the socket file is deleted after ibus_bus_new_async() is called
++     * in case that the socket file is not monitored.
++     */
++    if (!g_getenv ("IBUS_ADDRESS")) {
++        const gchar *address_path = ibus_get_socket_path ();
++        GFile *file;
++        GError *error = NULL;
++        GFileMonitor *monitor;
++
++        g_assert (address_path);
++        file = g_file_new_for_path (address_path);
++        g_assert (file);
++        has_socket_path = TRUE;
++        monitor = g_file_monitor (file, G_FILE_MONITOR_NONE, NULL, &error);
++        if (error) {
++            g_warning ("Failed to monitor socket file: %s", error->message);
++            g_error_free (error);
++        }
++        g_assert (monitor);
++        g_signal_connect (monitor, "changed",
++                          G_CALLBACK (_socket_changed_cb), NULL);
++        g_object_unref (file);
++    }
+     ibus_bus_exit_async (bus,
+                          TRUE, /* restart */
+                          -1, /* timeout */
+                          NULL, /* cancellable */
+                          finish_exit_async,
+-                         NULL); /* user_data */
++                         GINT_TO_POINTER (has_socket_path)); /* user_data */
+ }
+ 
+ static gboolean
+-- 
+2.37.3
+

diff --git a/ibus.spec b/ibus.spec
index 92dbc75..98d38c4 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -39,7 +39,7 @@
 
 Name:           ibus
 Version:        1.5.27
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.0-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -523,6 +523,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Fri Dec 02 2022 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.27-7
+-  Add GitHub action patches
+
 * Thu Nov 24 2022 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.27-6
 -  Implement new process_key_event for ibus-x11