From fd8ece395f17686032218fcc5833a1df93aaf7bf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 May 2022 07:04:56 +0200 Subject: [PATCH] at-spi2-core: upgrade 2.44.0 -> 2.44.1 Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- ...-core_2.44.0.bb => at-spi2-core_2.44.1.bb} | 6 +-- ...6a4c4491eea57d7b713bb4440f541584204b.patch | 40 ------------------- 2 files changed, 2 insertions(+), 44 deletions(-) rename meta/recipes-support/atk/{at-spi2-core_2.44.0.bb => at-spi2-core_2.44.1.bb} (89%) delete mode 100644 meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch 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 similarity index 89% rename from meta/recipes-support/atk/at-spi2-core_2.44.0.bb rename to meta/recipes-support/atk/at-spi2-core_2.44.1.bb index e276eb7b8e4..95a6c619f0e 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" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ - file://08036a4c4491eea57d7b713bb4440f541584204b.patch \ - " +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353" +SRC_URI[sha256sum] = "4beb23270ba6cf7caf20b597354d75194d89afb69d2efcf15f4271688ba6f746" X11DEPENDS = "virtual/libx11 libxi libxtst" diff --git a/meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch b/meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch deleted file mode 100644 index 0f002256c94..00000000000 --- a/meta/recipes-support/atk/files/08036a4c4491eea57d7b713bb4440f541584204b.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 08036a4c4491eea57d7b713bb4440f541584204b Mon Sep 17 00:00:00 2001 -From: Mike Gorse -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 ---- - 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 - -- 2.47.2