Module Name: src
Committed By: martin
Date: Sat Sep 19 12:23:34 UTC 2020
Modified Files:
src/external/mit/xorg/lib/libX11 [netbsd-9]: Makefile.libx11
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.2.1 \
src/external/mit/xorg/lib/libX11/Makefile.libx11
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.19 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.19.2.1
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.19 Mon Jul 8 23:06:15 2019
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Sat Sep 19 12:23:34 2020
@@ -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