diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-05 07:04:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:37 +0100 |
commit | 78aad10cb60f1d2e342e69e529170aad08788d8c (patch) | |
tree | 9d13e004a4fbd1f61e8b3e9be315fc021b764036 /meta/recipes-support/atk | |
parent | 583afe5618c8ae696bae4293867df2c34e663d39 (diff) | |
download | poky-78aad10cb60f1d2e342e69e529170aad08788d8c.tar.gz |
at-spi2-core: upgrade 2.44.0 -> 2.44.1
(From OE-Core rev: fd8ece395f17686032218fcc5833a1df93aaf7bf)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/atk')
-rw-r--r-- | meta/recipes-support/atk/at-spi2-core_2.44.1.bb (renamed from meta/recipes-support/atk/at-spi2-core_2.44.0.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch | 40 |
2 files changed, 2 insertions, 44 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core_2.44.0.bb b/meta/recipes-support/atk/at-spi2-core_2.44.1.bb index e276eb7b8e..95a6c619f0 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.44.0.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.44.1.bb | |||
@@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
9 | 9 | ||
10 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 10 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
11 | 11 | ||
12 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | 12 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" |
13 | file://08036a4c4491eea57d7b713bb4440f541584204b.patch \ | ||
14 | " | ||
15 | 13 | ||
16 | SRC_URI[sha256sum] = "7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353" | 14 | SRC_URI[sha256sum] = "4beb23270ba6cf7caf20b597354d75194d89afb69d2efcf15f4271688ba6f746" |
17 | 15 | ||
18 | X11DEPENDS = "virtual/libx11 libxi libxtst" | 16 | X11DEPENDS = "virtual/libx11 libxi libxtst" |
19 | 17 | ||
diff --git a/meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch b/meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch deleted file mode 100644 index 0f002256c9..0000000000 --- a/meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 08036a4c4491eea57d7b713bb4440f541584204b Mon Sep 17 00:00:00 2001 | ||
2 | From: Mike Gorse <mgorse@suse.com> | ||
3 | Date: Mon, 21 Mar 2022 10:19:03 -0500 | ||
4 | Subject: [PATCH] Fix build with X11 disabled | ||
5 | |||
6 | Closes #51 | ||
7 | Upstream-Status: Backport | ||
8 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
9 | --- | ||
10 | registryd/deviceeventcontroller.c | 8 ++++---- | ||
11 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c | ||
14 | index 8a321adc..3068ec4b 100644 | ||
15 | --- a/registryd/deviceeventcontroller.c | ||
16 | +++ b/registryd/deviceeventcontroller.c | ||
17 | @@ -1720,16 +1720,16 @@ spi_dec_synth_keysym (SpiDEController *controller, long keysym) | ||
18 | if (synth_mods != modifiers) { | ||
19 | lock_mods = synth_mods & ~modifiers; | ||
20 | spi_dec_plat_lock_modifiers (controller, lock_mods); | ||
21 | - if (modifiers & LockMask) | ||
22 | - spi_dec_plat_unlock_modifiers (controller, LockMask); | ||
23 | + if (modifiers & SPI_KEYMASK_SHIFTLOCK) | ||
24 | + spi_dec_plat_unlock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK); | ||
25 | } | ||
26 | spi_dec_plat_synth_keycode_press (controller, key_synth_code); | ||
27 | spi_dec_plat_synth_keycode_release (controller, key_synth_code); | ||
28 | |||
29 | if (synth_mods != modifiers) { | ||
30 | spi_dec_plat_unlock_modifiers (controller, lock_mods); | ||
31 | - if (modifiers & LockMask) | ||
32 | - spi_dec_plat_lock_modifiers (controller, LockMask); | ||
33 | + if (modifiers & SPI_KEYMASK_SHIFTLOCK) | ||
34 | + spi_dec_plat_lock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK); | ||
35 | } | ||
36 | return TRUE; | ||
37 | } | ||
38 | -- | ||
39 | GitLab | ||
40 | |||