commit: 18ffd017528b13abd4ae2c76413096539ee1de33 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon May 12 16:39:09 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon May 12 16:40:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ffd017
x11-misc/xdotool: restore libXi for now No need for a revbump given library will either be unused or it will have failed to build (with -O0).. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch | 4 ++-- x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch index 561132ec1d1a..aa4defd48052 100644 --- a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch +++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch @@ -7,8 +7,8 @@ -XDOTOOL_LIBS=$(shell pkg-config --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)") $(shell sh platform.sh extralibs) -LIBXDO_LIBS=$(shell pkg-config --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)") -INC=$(shell pkg-config --cflags xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)") -+XDOTOOL_LIBS=$(shell $(PKG_CONFIG) --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)") $(shell sh platform.sh extralibs) -+LIBXDO_LIBS=$(shell $(PKG_CONFIG) --libs x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)") ++XDOTOOL_LIBS=$(shell $(PKG_CONFIG) --libs xi x11 2> /dev/null || echo "$(DEFAULT_LIBS)") $(shell sh platform.sh extralibs) ++LIBXDO_LIBS=$(shell $(PKG_CONFIG) --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)") +INC=$(shell $(PKG_CONFIG) --cflags x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)") CFLAGS+=-std=c99 $(INC) diff --git a/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild index dfa6b299086f..f9edc0d6cd83 100644 --- a/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild +++ b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild @@ -18,8 +18,14 @@ IUSE="examples" # tests have various troublesome requirements RESTRICT="test" +# libXi is "unused" but it still uses headers from it and relies on the +# compiler optimizing out a function to be dropped by as-needed, so keep +# until next release (not important to patch given libXtst pulls libXi +# anyway, so the dependency is not really avoidable either way) +# https://github.com/jordansissel/xdotool/pull/446 RDEPEND=" x11-libs/libX11 + x11-libs/libXi x11-libs/libXinerama x11-libs/libXtst x11-libs/libxkbcommon
