millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-08 00:05:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

x11-misc/xdotool: restore libXi for now

Browse Source 
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@gentoo.org>
This commit is contained in:
Ionen Wolkens 2025-05-12 12:39:09 -04:00
parent fc463301ed
commit 18ffd01752
No known key found for this signature in database
GPG Key ID: B24406B0B0AC4334
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
View File

@ -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)

6
x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild
View File

@ -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