mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 12:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

at-spi2-core: update 2.42.0 -> 2.44.0

Browse Source 
(From OE-Core rev: 008aa19a26a20d46c373f9aa302a4240a9c150c0)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-04-07 19:00:22 +02:00
committed by Richard Purdie
parent 2921dfb021
commit 313bdc0846
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch
View File

@@ -1,33 +0,0 @@
From 9e726133319298a835f724904c80e5adf78f475f Mon Sep 17 00:00:00 2001
From: Tim Orling <timothy.t.orling@intel.com>
Date: Fri, 15 Oct 2021 18:00:04 +0000
Subject: [PATCH] Ensure x11_dep is defined
bus/meson.build checks if x11_dep.found(), but this fails when
-Dx11=no
Upstream-Status: Submitted
[https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/60]
References:
https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/42
https://mesonbuild.com/howtox.html#get-a-default-notfound-dependency
Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
---
meson.build | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meson.build b/meson.build
index b5104c8..85d7a0e 100644
--- a/meson.build
+++ b/meson.build
@@ -62,6 +62,8 @@ endif
x11_deps = []
x11_option = get_option('x11')
+# ensure x11_dep is defined for use in bus/meson.build
+x11_dep = dependency('', required: false)
if x11_option != 'no'
x11_dep = dependency('x11', required: false)

6
meta/recipes-support/atk/at-spi2-core_2.42.0.bb → meta/recipes-support/atk/at-spi2-core_2.44.0.bb
View File

@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://0001-Ensure-x11_dep-is-defined.patch \
"
file://08036a4c4491eea57d7b713bb4440f541584204b.patch \
"
SRC_URI[sha256sum] = "4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386"
SRC_URI[sha256sum] = "7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353"
X11DEPENDS = "virtual/libx11 libxi libxtst"

40
meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch Normal file
View File

@@ -0,0 +1,40 @@
From 08036a4c4491eea57d7b713bb4440f541584204b Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
Date: Mon, 21 Mar 2022 10:19:03 -0500
Subject: [PATCH] Fix build with X11 disabled
Closes #51
Upstream-Status: Backport
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
registryd/deviceeventcontroller.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 8a321adc..3068ec4b 100644
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -1720,16 +1720,16 @@ spi_dec_synth_keysym (SpiDEController *controller, long keysym)
if (synth_mods != modifiers) {
lock_mods = synth_mods & ~modifiers;
spi_dec_plat_lock_modifiers (controller, lock_mods);
- if (modifiers & LockMask)
- spi_dec_plat_unlock_modifiers (controller, LockMask);
+ if (modifiers & SPI_KEYMASK_SHIFTLOCK)
+ spi_dec_plat_unlock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK);
}
spi_dec_plat_synth_keycode_press (controller, key_synth_code);
spi_dec_plat_synth_keycode_release (controller, key_synth_code);
if (synth_mods != modifiers) {
spi_dec_plat_unlock_modifiers (controller, lock_mods);
- if (modifiers & LockMask)
- spi_dec_plat_lock_modifiers (controller, LockMask);
+ if (modifiers & SPI_KEYMASK_SHIFTLOCK)
+ spi_dec_plat_lock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK);
}
return TRUE;
}
--
GitLab