at-spi2-core: update to 2.56.2

This commit is contained in:
chrysos349 2025-05-30 14:32:45 +03:00 committed by Duncan Overbruck
parent 93b4961963
commit 3a1255a796
3 changed files with 5 additions and 74 deletions

View file

@ -1,43 +0,0 @@
From cd6a4902b321eb7c8ab340adbebc14bd8f1e07d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tyrychtr?= <ltyrycht@redhat.com>
Date: Thu, 27 Mar 2025 14:48:30 +0100
Subject: [PATCH] device-a11y-manager: Check properly for the DBus backend
presence
The DBusProxy creation succeds even if the object does not exist.
So, check for the unique name of the object, this will be set only if the
a11y manager actually exists.
---
atspi/atspi-device-a11y-manager.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/atspi/atspi-device-a11y-manager.c b/atspi/atspi-device-a11y-manager.c
index 1939b3bf..8ecd791c 100644
--- a/atspi/atspi-device-a11y-manager.c
+++ b/atspi/atspi-device-a11y-manager.c
@@ -528,6 +528,7 @@ AtspiDeviceA11yManager *
atspi_device_a11y_manager_try_new_full (const gchar *app_id)
{
GError *error = NULL;
+ g_autofree gchar *owner = NULL;
GDBusConnection *session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
GDBusProxy *keyboard_monitor = g_dbus_proxy_new_sync (session_bus,
G_DBUS_PROXY_FLAGS_NONE,
@@ -545,6 +546,14 @@ atspi_device_a11y_manager_try_new_full (const gchar *app_id)
return NULL;
}
+ owner = g_dbus_proxy_get_name_owner (keyboard_monitor);
+ if (!owner)
+ {
+ g_clear_object (&session_bus);
+ g_clear_object (&keyboard_monitor);
+ return NULL;
+ }
+
AtspiDeviceA11yManager *device = g_object_new (ATSPI_TYPE_DEVICE_A11Y_MANAGER,
"session-bus", session_bus,
"keyboard-monitor", keyboard_monitor,
--
GitLab

View file

@ -1,27 +0,0 @@
From 74e0f5863f187fa61587f9dcecb9a9adab56add9 Mon Sep 17 00:00:00 2001
From: Alessandro Astone <alessandro.astone@canonical.com>
Date: Wed, 26 Mar 2025 17:50:08 +0100
Subject: [PATCH] atspi-device-a11y-manager: Fix crash on dispose
grabbed_modifiers is a simple list of integers, we cannot call g_free on the
list items. Fixes SIGSEGV on disposal, as seen in Orca and Mutter 48.0
---
atspi/atspi-device-a11y-manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/atspi/atspi-device-a11y-manager.c b/atspi/atspi-device-a11y-manager.c
index 92365d35..1939b3bf 100644
--- a/atspi/atspi-device-a11y-manager.c
+++ b/atspi/atspi-device-a11y-manager.c
@@ -386,7 +386,7 @@ atspi_device_a11y_manager_dispose (GObject *object)
{
AtspiDeviceA11yManager *device = ATSPI_DEVICE_A11Y_MANAGER (object);
- g_slist_free_full (device->grabbed_modifiers, g_free);
+ g_slist_free (device->grabbed_modifiers);
g_slist_free_full (device->grabbed_keys, g_free);
g_slist_free_full (device->virtual_modifiers, g_free);
if (device->refresh_timeout_id)
--
GitLab

View file

@ -1,13 +1,14 @@
# Template file for 'at-spi2-core' # Template file for 'at-spi2-core'
pkgname=at-spi2-core pkgname=at-spi2-core
version=2.56.0 version=2.56.2
revision=3 revision=1
build_style=meson build_style=meson
build_helper="gir" build_helper="gir"
configure_args="$(vopt_feature gir introspection)" configure_args="$(vopt_feature gir introspection)"
hostmakedepends="pkg-config dbus glib-devel gettext" hostmakedepends="pkg-config dbus glib-devel gettext"
makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel dbus-devel makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel dbus-devel
libxml2-devel" libxml2-devel"
checkdepends="${pkgname} dbus gsettings-desktop-schemas"
short_desc="Assistive Technology Service Provider Interface" short_desc="Assistive Technology Service Provider Interface"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
@ -15,8 +16,8 @@ homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
changelog="https://gitlab.gnome.org/GNOME/at-spi2-core/-/raw/gnome-48/NEWS" changelog="https://gitlab.gnome.org/GNOME/at-spi2-core/-/raw/gnome-48/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/at-spi2-core/-/raw/main/NEWS" #changelog="https://gitlab.gnome.org/GNOME/at-spi2-core/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/at-spi2-core/${version%.*}/at-spi2-core-${version}.tar.xz" distfiles="${GNOME_SITE}/at-spi2-core/${version%.*}/at-spi2-core-${version}.tar.xz"
checksum=80d7e8ea0be924e045525367f909d6668dfdd3e87cd40792c6cfd08e6b58e95c checksum=e1b1c9836a8947852f7440c32e23179234c76bd98cd9cc4001f376405f8b783b
make_check=no # non-trivial dbus setup make_check_pre="dbus-run-session"
# Package build options # Package build options
build_options="gir" build_options="gir"