commit: 9d520de306930c415150ff00441ec3614119e268 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed Jun 1 06:54:09 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Jun 1 13:56:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d520de3
app-accessibility/at-spi2-core: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/25717 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../files/2.44.0-Fix-build-with-X11-disabled.patch | 38 ---------------------- .../at-spi2-core-2.42.0-fix-disabling-x11.patch | 36 -------------------- 2 files changed, 74 deletions(-) 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 deleted file mode 100644 index bd6dfaaec885..000000000000 --- a/app-accessibility/at-spi2-core/files/2.44.0-Fix-build-with-X11-disabled.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch deleted file mode 100644 index 3bf32724e691..000000000000 --- a/app-accessibility/at-spi2-core/files/at-spi2-core-2.42.0-fix-disabling-x11.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/829591 -https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/2175d89198440d948075f3268aec5f45430afb3d - -From 2175d89198440d948075f3268aec5f45430afb3d Mon Sep 17 00:00:00 2001 -From: Tim Orling <[email protected]> -Date: Fri, 15 Oct 2021 12:44:39 -0700 -Subject: [PATCH] Ensure x11_dep is defined - -bus/meson.build checks if x11_dep.found(), but this fails when --Dx11=no - -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 <[email protected]> ---- - meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/meson.build b/meson.build -index b5104c8c..cfd2e091 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 elsewhere, such as bus/meson.build -+x11_dep = dependency('', required: false) - if x11_option != 'no' - x11_dep = dependency('x11', required: false) - --- -GitLab -
