commit: 77873a347a4f9d40c94d7eb66d12709f92c33ba3 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Mar 21 18:13:20 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Mar 21 18:13:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77873a34
app-accessibility/at-spi2-core: Fix build with USE=-X Closes: https://bugs.gentoo.org/835701 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../at-spi2-core/at-spi2-core-2.44.0.ebuild | 1 + .../files/2.44.0-Fix-build-with-X11-disabled.patch | 38 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild index 6d1568dc223b..ec6aee601bdb 100644 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild @@ -38,6 +38,7 @@ BDEPEND=" PATCHES=( # disable teamspaces test since that requires Novell.ICEDesktop.Daemon "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch" + "${FILESDIR}/${PV}-Fix-build-with-X11-disabled.patch" ) multilib_src_configure() { diff --git a/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch b/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch new file mode 100644 index 000000000000..bd6dfaaec885 --- /dev/null +++ b/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch @@ -0,0 +1,38 @@ +From 08036a4c4491eea57d7b713bb4440f541584204b Mon Sep 17 00:00:00 2001 +From: Mike Gorse <[email protected]> +Date: Mon, 21 Mar 2022 10:19:03 -0500 +Subject: [PATCH] Fix build with X11 disabled + +Closes #51 +--- + 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; + } +-- +2.34.1 +
