summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-09-19 12:23:34 +0000
committermartin <martin@NetBSD.org>2020-09-19 12:23:34 +0000
commit5ec8fbe75bcac36715fb70499c53d3cfea4d86a9 (patch)
treedb10c13235bc7ac9cfffae287df08d92736d9550 /external
parent3f10992a452b4160070b64e6af0055e44aae1c8a (diff)
Pull up following revision(s) (requested by nia in ticket #1087):
external/mit/xorg/lib/libX11/Makefile.libx11: revision 1.20 external/mit/xorg/lib/libX11/Makefile.libx11: revision 1.21 libx11: Dynamically load unversioned libxcursor shared object the version number is wrong for NetBSD, should be libXcursor.so.2 someone pointed out it makes sense to load the exact libXcursor version
Diffstat (limited to 'external')
-rw-r--r--external/mit/xorg/lib/libX11/Makefile.libx114
1 files changed, 2 insertions, 2 deletions
diff --git a/external/mit/xorg/lib/libX11/Makefile.libx11 b/external/mit/xorg/lib/libX11/Makefile.libx11
index ae89d46c6b5..55a3f8c18e1 100644
--- a/external/mit/xorg/lib/libX11/Makefile.libx11
+++ b/external/mit/xorg/lib/libX11/Makefile.libx11
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.19 2019/07/08 23:06:15 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.19.2.1 2020/09/19 12:23:34 martin Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -423,7 +423,7 @@ SETID_DEFINES= -DHASSETUGID
SHM_DEFINES= -DHAS_SHM
SOCK_DEFINES= -DBSD44SOCKETS
TRANS_INCLUDES= -I${X11SRCDIR.xtrans}
-XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.1\"
+XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.2\"
XDMAUTHDEFS= -DHASXDMAUTH
XF86BIGFONT_DEFINES= -DXF86BIGFONT
XKB_DEFINES= -DXKB