From 6fcf52007b351224dbc21770f562adce6e338c74b04ec699bacb10608f39a019 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Apr 2020 22:38:40 +0000 Subject: [PATCH] Accepting request 795002 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/795002 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=192 --- at-spi2-core-2.34.0.tar.xz | 3 - at-spi2-core-2.36.0.tar.xz | 3 + at-spi2-core-async-session-register.patch | 141 ---------------------- at-spi2-core.changes | 22 ++++ at-spi2-core.spec | 9 +- 5 files changed, 28 insertions(+), 150 deletions(-) delete mode 100644 at-spi2-core-2.34.0.tar.xz create mode 100644 at-spi2-core-2.36.0.tar.xz delete mode 100644 at-spi2-core-async-session-register.patch diff --git a/at-spi2-core-2.34.0.tar.xz b/at-spi2-core-2.34.0.tar.xz deleted file mode 100644 index 10e3e99..0000000 --- a/at-spi2-core-2.34.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6 -size 186736 diff --git a/at-spi2-core-2.36.0.tar.xz b/at-spi2-core-2.36.0.tar.xz new file mode 100644 index 0000000..2267daf --- /dev/null +++ b/at-spi2-core-2.36.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a +size 186824 diff --git a/at-spi2-core-async-session-register.patch b/at-spi2-core-async-session-register.patch deleted file mode 100644 index e435de6..0000000 --- a/at-spi2-core-async-session-register.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 47496e0ff2571636db8f3ca8807ce11b50866130 Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Thu, 27 Feb 2020 08:43:16 -0600 -Subject: [PATCH] bus-launcher: Use async callback for RegisterClient - -This should make the process more robust, in combination with setting the -timeout to G_MAXINT, rather than -1, which effectively defaults to 25 -seconds. Otherwise, it is possible for the session manager to be -unresponsive, perhaps waiting for a synchronous call of its own to time out, -and then the session manager will eventually process the RegisterClient, but -at-spi-bus-launcher will have timed out, meaning that we successfully register -with the session manager but don't ever set up our signal handler, meaning -that, later, the session manager sends a QueryEndSession to us, but we don't -see it. - -https://bugzilla.opensuse.org/show_bug.cgi?id=1154582 ---- - bus/at-spi-bus-launcher.c | 78 +++++++++++++++++++++++---------------- - 1 file changed, 46 insertions(+), 32 deletions(-) - -diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c -index b4f49b8..362fd05 100644 ---- a/bus/at-spi-bus-launcher.c -+++ b/bus/at-spi-bus-launcher.c -@@ -69,6 +69,7 @@ typedef struct { - int pipefd[2]; - int listenfd; - char *a11y_launch_error_message; -+ GDBusProxy *sm_proxy; - } A11yBusLauncher; - - static A11yBusLauncher *_global_app = NULL; -@@ -139,28 +140,61 @@ client_proxy_ready_cb (GObject *source_object, - G_CALLBACK (g_signal_cb), app); - } - -+static void -+client_registered (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ A11yBusLauncher *app = user_data; -+ GError *error = NULL; -+ GVariant *variant; -+ gchar *object_path; -+ GDBusProxyFlags flags; -+ -+ variant = g_dbus_proxy_call_finish (app->sm_proxy, result, &error); -+ if (!variant) -+ { -+ if (error != NULL) -+ { -+ g_warning ("Failed to register client: %s", error->message); -+ g_error_free (error); -+ } -+ } -+ else -+ { -+ g_variant_get (variant, "(o)", &object_path); -+ g_variant_unref (variant); -+ -+ flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES; -+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, flags, NULL, -+ "org.gnome.SessionManager", object_path, -+ "org.gnome.SessionManager.ClientPrivate", -+ NULL, client_proxy_ready_cb, app); -+ -+ g_free (object_path); -+ } -+ g_clear_object (&app->sm_proxy); -+} -+ - static void - register_client (A11yBusLauncher *app) - { - GDBusProxyFlags flags; -- GDBusProxy *sm_proxy; - GError *error; - const gchar *app_id; - const gchar *autostart_id; - gchar *client_startup_id; - GVariant *parameters; -- GVariant *variant; -- gchar *object_path; - - flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | - G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS; - - error = NULL; -- sm_proxy = g_dbus_proxy_new_sync (app->session_bus, flags, NULL, -- "org.gnome.SessionManager", -- "/org/gnome/SessionManager", -- "org.gnome.SessionManager", -- NULL, &error); -+ app->sm_proxy = g_dbus_proxy_new_sync (app->session_bus, flags, NULL, -+ "org.gnome.SessionManager", -+ "/org/gnome/SessionManager", -+ "org.gnome.SessionManager", -+ NULL, &error); - - if (error != NULL) - { -@@ -187,31 +221,11 @@ register_client (A11yBusLauncher *app) - g_free (client_startup_id); - - error = NULL; -- variant = g_dbus_proxy_call_sync (sm_proxy, -- "RegisterClient", parameters, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, &error); -- -- g_object_unref (sm_proxy); -- -- if (error != NULL) -- { -- g_warning ("Failed to register client: %s", error->message); -- g_error_free (error); -- -- return; -- } -- -- g_variant_get (variant, "(o)", &object_path); -- g_variant_unref (variant); -- -- flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES; -- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, flags, NULL, -- "org.gnome.SessionManager", object_path, -- "org.gnome.SessionManager.ClientPrivate", -- NULL, client_proxy_ready_cb, app); -+ g_dbus_proxy_call (app->sm_proxy, -+ "RegisterClient", parameters, -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, NULL, client_registered, app); - -- g_free (object_path); - } - - static void --- -2.24.1 - diff --git a/at-spi2-core.changes b/at-spi2-core.changes index 133729e..bb6ead9 100644 --- a/at-spi2-core.changes +++ b/at-spi2-core.changes @@ -1,9 +1,31 @@ +------------------------------------------------------------------- +Sun Mar 8 23:30:35 UTC 2020 - Bjørn Lie + +- Update to version 2.36.0: + + No changes, stable version update only. + +------------------------------------------------------------------- +Sat Feb 29 23:49:00 UTC 2020 - mgorse@suse.com + +- Update to version 2.35.92: + + bus-launcher: make session management more robust + (boo#1154582). +- Drop at-spi2-core-async-session-register.patch: Fixed upstream. + ------------------------------------------------------------------- Thu Feb 27 15:04:35 UTC 2020 - Michael Gorse - Ad at-spi2-core-async-session-register.patch: make bus-launcher session registration more robust (boo#1154582). +------------------------------------------------------------------- +Wed Feb 12 21:09:48 CET 2020 - dimstar@opensuse.org + +- Update to version 2.35.1: + + Fix source reproducibility. + + Avoid depending on Meson 0.50. + + Add ATSPI_ROLE_MARK and ATSPI_ROLE_SUGGESTION. + ------------------------------------------------------------------- Mon Sep 9 15:08:37 CDT 2019 - mgorse@suse.com diff --git a/at-spi2-core.spec b/at-spi2-core.spec index 67830a7..8cf1df5 100644 --- a/at-spi2-core.spec +++ b/at-spi2-core.spec @@ -17,20 +17,17 @@ Name: at-spi2-core -Version: 2.34.0 +Version: 2.36.0 Release: 0 Summary: Assistive Technology Service Provider Interface - D-Bus based implementation License: LGPL-2.1-or-later Group: System/GUI/GNOME URL: https://www.gnome.org/ -Source0: https://download.gnome.org/sources/at-spi2-core/2.34/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/at-spi2-core/2.36/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM at-spi2-core-async-session-register.patch boo#1154582 mgorse@suse.com -- make bus-launcher session registration more robust. -Patch0: at-spi2-core-async-session-register.patch - BuildRequires: gtk-doc -BuildRequires: meson >= 0.50.0 +BuildRequires: meson >= 0.40.1 BuildRequires: pkgconfig BuildRequires: pkgconfig(dbus-1) >= 1.0 BuildRequires: pkgconfig(gio-2.0) >= 2.28