diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
commit | d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch) | |
tree | 24cd2cf57f3932a24b96e4a0f6666489447e43ba /x11-misc/xdotool/files | |
parent | 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff) |
gentoo resync : 07.08.2021
Diffstat (limited to 'x11-misc/xdotool/files')
-rw-r--r-- | x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch | 16 | ||||
-rw-r--r-- | x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch | 12 |
2 files changed, 28 insertions, 0 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 new file mode 100644 index 000000000000..d43784deaa3d --- /dev/null +++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch @@ -0,0 +1,16 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 2021-08-04 17:14:19.000000000 +0100 ++++ b/Makefile 2021-08-05 22:13:20.509655072 +0100 +@@ -35,9 +35,9 @@ + DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lxkbcommon + DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include + +-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 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)") + 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 new file mode 100644 index 000000000000..42051da88a38 --- /dev/null +++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch @@ -0,0 +1,12 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 2021-08-04 17:14:19.000000000 +0100 ++++ b/Makefile 2021-08-05 22:10:47.713611624 +0100 +@@ -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: |