commit:     4de47de2cf0b57f01df6d3bc2af091fa9b715826
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 13:04:12 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 13:09:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de47de2

x11-misc/xdotool: allow using 3.20210804.2 with XWayland

This will likely no longer be needed come next release - with users
generally reporting having been able to use xdotool on XWayland,
upstream has decided to change the behaviour of the newly added check
to "warn but allow". See
https://github.com/jordansissel/xdotool/issues/346
for details.

Suggested-by: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/807989
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../files/xdotool-3.20210804.2-allow_xwayland.patch        | 14 ++++++++++++++
 x11-misc/xdotool/xdotool-3.20210804.2.ebuild               |  1 +
 2 files changed, 15 insertions(+)

diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-allow_xwayland.patch 
b/x11-misc/xdotool/files/xdotool-3.20210804.2-allow_xwayland.patch
new file mode 100644
index 00000000000..efb1ccf1341
--- /dev/null
+++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-allow_xwayland.patch
@@ -0,0 +1,14 @@
+See
+https://github.com/jordansissel/xdotool/issues/346
+for details.
+
+--- a/xdo.c
++++ b/xdo.c
+@@ -121,7 +121,6 @@
+   // Try to detect XWayland and warn the user about problems.
+   if (appears_to_be_wayland(xdpy)) {
+     fprintf(stderr, "The X server at %s appears to be XWayland. 
Unfortunately, XWayland does not correctly support the features used by libxdo 
and xdotool.\n", display);
+-    return NULL;
+   }
+ 
+ 

diff --git a/x11-misc/xdotool/xdotool-3.20210804.2.ebuild 
b/x11-misc/xdotool/xdotool-3.20210804.2.ebuild
index 63cc8018aa4..eb3af11dd2b 100644
--- a/x11-misc/xdotool/xdotool-3.20210804.2.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20210804.2.ebuild
@@ -31,6 +31,7 @@ BDEPEND="virtual/pkgconfig
        x11-base/xorg-proto"
 
 PATCHES=(
+       "${FILESDIR}"/${PN}-3.20210804.2-allow_xwayland.patch
        "${FILESDIR}"/${PN}-3.20210804.2-no_hardcoded_pkg-config.patch
        "${FILESDIR}"/${PN}-3.20210804.2-no_ldconfig.patch
 )

Reply via email to