[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdotool/files/, x11-misc/xdotool/

[Ionen Wolkens]

commit:     6668398293d9c2592ddc6add98bac00c89096c22
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu May  1 10:13:32 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu May  1 10:20:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66683982

x11-misc/xdotool: remove ldconfig patch, skip unused libXi entirely

Xi is being dropped by --as-needed and I didn't see it in DEFAULT_LIBS,
but I missed that it was being added by pkg-config too.

For ldconfig, can use LDCONFIG=: instead.

Also considered using DESTDIR given it exists, but still need to
define lib/man dir and it just becomes longer with ${EPREFIX}.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch  |  4 ++--
 x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch | 11 -----------
 x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild               |  3 +--
 3 files changed, 3 insertions(+), 15 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 c27e66692f69..561132ec1d1a 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
@@ -8,8 +8,8 @@
 -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 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)")
++LIBXDO_LIBS=$(shell $(PKG_CONFIG) --libs 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)
  
  CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_relative.o cmd_mousedown.o 
\

diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch 
b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch
deleted file mode 100644
index 45c81a7bdc2e..000000000000
--- a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -71,7 +71,7 @@
-       $(CC) -o xdotool.static xdotool.o xdo.o xdo_search.o $(CMDOBJS) 
$(LDFLAGS)  -lm $(XDOTOOL_LIBS) $(LIBXDO_LIBS)
- 
- .PHONY: install
--install: pre-install installlib installprog installman installheader 
installpc post-install
-+install: pre-install installlib installprog installman installheader installpc
- 
- .PHONY: pre-install
- pre-install:

diff --git a/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild 
b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild
index f7df10713539..dfa6b299086f 100644
--- a/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20211022.1-r1.ebuild
@@ -34,7 +34,6 @@ BDEPEND="
 
 PATCHES=(
        "${FILESDIR}"/${PN}-3.20210804.2-no_hardcoded_pkg-config.patch
-       "${FILESDIR}"/${PN}-3.20210804.2-no_ldconfig.patch
 )
 
 src_compile() {
@@ -46,7 +45,7 @@ src_compile() {
 
 src_install() {
        emake PREFIX="${ED}"/usr INSTALLMAN="${ED}"/usr/share/man \
-               INSTALLLIB="${ED}"/usr/$(get_libdir) install
+               INSTALLLIB="${ED}"/usr/$(get_libdir) LDCONFIG=: install
 
        dodoc -r CHANGELIST $(usev examples)
        einstalldocs