diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-04-07 19:00:22 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-19 14:14:10 +0100 |
commit | 313bdc0846a17ea5ca359ada12d6886b4d88ac52 (patch) | |
tree | 556280c9987aa55020f9b6aabee3e362faf152da /meta/recipes-support | |
parent | 2921dfb021d98d37f8172fcec3a92255bc00452d (diff) | |
download | poky-313bdc0846a17ea5ca359ada12d6886b4d88ac52.tar.gz |
at-spi2-core: update 2.42.0 -> 2.44.0
(From OE-Core rev: 008aa19a26a20d46c373f9aa302a4240a9c150c0)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch | 33 | ||||
-rw-r--r-- | meta/recipes-support/atk/at-spi2-core_2.44.0.bb (renamed from meta/recipes-support/atk/at-spi2-core_2.42.0.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch | 40 |
3 files changed, 43 insertions, 36 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch b/meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch deleted file mode 100644 index 4a9bbbcbb1..0000000000 --- a/meta/recipes-support/atk/at-spi2-core/0001-Ensure-x11_dep-is-defined.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 9e726133319298a835f724904c80e5adf78f475f Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Orling <timothy.t.orling@intel.com> | ||
3 | Date: Fri, 15 Oct 2021 18:00:04 +0000 | ||
4 | Subject: [PATCH] Ensure x11_dep is defined | ||
5 | |||
6 | bus/meson.build checks if x11_dep.found(), but this fails when | ||
7 | -Dx11=no | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | [https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/60] | ||
11 | |||
12 | References: | ||
13 | https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/42 | ||
14 | https://mesonbuild.com/howtox.html#get-a-default-notfound-dependency | ||
15 | |||
16 | Signed-off-by: Tim Orling <timothy.t.orling@intel.com> | ||
17 | --- | ||
18 | meson.build | 2 ++ | ||
19 | 1 file changed, 2 insertions(+) | ||
20 | |||
21 | diff --git a/meson.build b/meson.build | ||
22 | index b5104c8..85d7a0e 100644 | ||
23 | --- a/meson.build | ||
24 | +++ b/meson.build | ||
25 | @@ -62,6 +62,8 @@ endif | ||
26 | |||
27 | x11_deps = [] | ||
28 | x11_option = get_option('x11') | ||
29 | +# ensure x11_dep is defined for use in bus/meson.build | ||
30 | +x11_dep = dependency('', required: false) | ||
31 | if x11_option != 'no' | ||
32 | x11_dep = dependency('x11', required: false) | ||
33 | |||
diff --git a/meta/recipes-support/atk/at-spi2-core_2.42.0.bb b/meta/recipes-support/atk/at-spi2-core_2.44.0.bb index 9ca969cbb8..e276eb7b8e 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.42.0.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.44.0.bb | |||
@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
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://0001-Ensure-x11_dep-is-defined.patch \ | 13 | file://08036a4c4491eea57d7b713bb4440f541584204b.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386" | 16 | SRC_URI[sha256sum] = "7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353" |
17 | 17 | ||
18 | X11DEPENDS = "virtual/libx11 libxi libxtst" | 18 | X11DEPENDS = "virtual/libx11 libxi libxtst" |
19 | 19 | ||
diff --git a/meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch b/meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch new file mode 100644 index 0000000000..0f002256c9 --- /dev/null +++ b/meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch | |||
@@ -0,0 +1,40 @@ | |||
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 | |||