CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: nia
Date: Wed Sep 16 10:02:22 UTC 2020
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11
Log Message:
someone pointed out it makes sense to load the exact libXcursor version
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.21
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.20 Tue Sep 15 23:34:16 2020
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Wed Sep 16 10:02:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.20 2020/09/15 23:34:16 nia Exp $
+# $NetBSD: Makefile.libx11,v 1.21 2020/09/16 10:02:22 nia 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\"
+XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.2\"
XDMAUTHDEFS= -DHASXDMAUTH
XF86BIGFONT_DEFINES= -DXF86BIGFONT
XKB_DEFINES= -DXKB
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: nia
Date: Tue Sep 15 23:34:16 UTC 2020
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11
Log Message:
libx11: Dynamically load unversioned libxcursor shared object
the version number is wrong for NetBSD, should be libXcursor.so.2
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 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.20
--- 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 Tue Sep 15 23:34:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.19 2019/07/08 23:06:15 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.20 2020/09/15 23:34:16 nia 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\"
XDMAUTHDEFS= -DHASXDMAUTH
XF86BIGFONT_DEFINES= -DXF86BIGFONT
XKB_DEFINES= -DXKB
CVS commit: src/external/mit/xorg/lib/libX11/extensions
Module Name:src
Committed By: mrg
Date: Sun Feb 23 09:14:05 UTC 2020
Modified Files:
src/external/mit/xorg/lib/libX11/extensions: Makefile
Log Message:
find the moved header.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/extensions/Makefile
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/extensions/Makefile
diff -u src/external/mit/xorg/lib/libX11/extensions/Makefile:1.1 src/external/mit/xorg/lib/libX11/extensions/Makefile:1.2
--- src/external/mit/xorg/lib/libX11/extensions/Makefile:1.1 Sun Feb 23 09:10:50 2020
+++ src/external/mit/xorg/lib/libX11/extensions/Makefile Sun Feb 23 09:14:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/02/23 09:10:50 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2020/02/23 09:14:05 mrg Exp $
NOPROG= yes
@@ -6,4 +6,7 @@ INCS= XKBgeom.h
INCSDIR=${X11INCDIR}/X11/extensions
.include
+
+.PATH: ${X11SRCDIR.X11}/include/X11/extensions
+
.include
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: mrg
Date: Thu Jun 2 22:41:27 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.ximcp Makefile.xlcDef
Makefile.xlcUTF8Load Makefile.xlibi18n Makefile.xomGeneric
src/external/mit/xorg/lib/libX11/static: Makefile
src/external/mit/xorg/lib/libX11/ximcp: Makefile
src/external/mit/xorg/lib/libX11/xlcDef: Makefile
src/external/mit/xorg/lib/libX11/xlcUTF8Load: Makefile
src/external/mit/xorg/lib/libX11/xlibi18n: Makefile
src/external/mit/xorg/lib/libX11/xomGeneric: Makefile
Log Message:
fix PR 48928: build the static libX11 properly. pull in the
ximcp, xlcDef, xlcUTF8Load, xlibi18n, and xomGeneric modules
directly.
also, don't include bsd.lib.mk in the fragment parts for these
modules, but in the module build itself. otherwise, bsd.lib.mk
is included before SRCS is complete and the build strangely
seems to miss parts listed.
tested using the example in the PR.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libX11/Makefile.ximcp
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/Makefile.xlcDef \
src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load \
src/external/mit/xorg/lib/libX11/Makefile.xlibi18n \
src/external/mit/xorg/lib/libX11/Makefile.xomGeneric
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libX11/static/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libX11/ximcp/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xlcDef/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xlibi18n/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xomGeneric/Makefile
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.ximcp
diff -u src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.2 src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.3
--- src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.2 Mon Oct 6 16:24:33 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.ximcp Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.2 2008/10/06 16:24:33 tron Exp $
+# $NetBSD: Makefile.ximcp,v 1.3 2016/06/02 22:41:26 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
@@ -43,5 +43,3 @@ CPPFLAGS.imDefLkup.c= -Wno-error
CPPFLAGS.imRm.c= -Wno-error
CPPFLAGS.imTrans.c= -Wno-error
CPPFLAGS.imLcLkup.c= -Wno-stack-protector
-
-.include
Index: src/external/mit/xorg/lib/libX11/Makefile.xlcDef
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlcDef Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcDef,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcDef,v 1.2 2016/06/02 22:41:26 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/def
SRCS.xlcDef= lcDefConv.c
@@ -9,5 +9,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
-DHASXDMAUTH
-
-.include
Index: src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcUTF8Load,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcUTF8Load,v 1.2 2016/06/02 22:41:26 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/Utf8
@@ -11,5 +11,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
-DHASXDMAUTH
-
-.include
Index: src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlibi18n Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.2 2016/06/02 22:41:26 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/gen
SRCS.xlibi18n= lcGenConv.c
@@ -10,5 +10,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
${XLOCALE.DEFINES} \
-DHASXDMAUTH
-
-.include
Index: src/external/mit/xorg/lib/libX11/Makefile.xomGeneric
diff -u src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.1 src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xomGeneric Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xomGeneric,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD:
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: tsutsui
Date: Sat Nov 21 11:15:31 UTC 2015
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11
Log Message:
Disable UIThrStubs.c, which is unnecessary on NetBSD.
This fixes xterm startup failure on NetBSD/m68k 7.0.
See PR/50386 for details.
Should be pulled up to netbsd-7 and netbsd-7-0.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 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.16 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.17
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.16 Tue Nov 3 10:26:06 2015
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Sat Nov 21 11:15:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.16 2015/11/03 10:26:06 szptvlfn Exp $
+# $NetBSD: Makefile.libx11,v 1.17 2015/11/21 11:15:31 tsutsui Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -265,8 +265,9 @@ SRCS= \
XlibInt.c \
Xrm.c
-SRCS+= \
- UIThrStubs.c
+# We have own pthread stubs in src/lib/libc/thread-stub. See PR/50386.
+#SRCS+= \
+# UIThrStubs.c
SRCS+= \
AddDIC.c \
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: christos
Date: Mon Aug 25 11:48:01 UTC 2014
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11
Log Message:
change to no-deprecated-declarations
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.14
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.13 Sat Jun 14 16:49:37 2014
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Mon Aug 25 07:48:01 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.13 2014/06/14 20:49:37 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.14 2014/08/25 11:48:01 christos Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -461,7 +461,7 @@ COPTS.lcUTF8.c+= -Wno-error
COPTS.Font.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h
-COPTS.XKBBind.c+= -Wno-error # uses XKeycodeToKeysym
+COPTS.XKBBind.c+= -Wno-deprecated-declarations # uses XKeycodeToKeysym
CWARNFLAGS.clang+= -Wno-string-plus-int
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: christos
Date: Mon Jun 3 23:01:13 UTC 2013
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11
Log Message:
hack for old gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.11
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.10 Thu May 30 19:42:19 2013
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Mon Jun 3 19:01:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.10 2013/05/30 23:42:19 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.11 2013/06/03 23:01:12 christos Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -462,6 +462,10 @@ COPTS.Font.c+= -Wno-error # XXX xf86big
COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h
COPTS.XKBBind.c+= -Wno-error # uses XKeycodeToKeysym
+.if ${HAVE_GCC} 45
+COPTS.LiHosts.c+= -Wno-error # XXX: old gcc figures out that const
+ # cond because nHosts max_hosts
+.endif
CWARNFLAGS.clang+= -Wno-string-plus-int
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: mrg
Date: Tue Jun 1 05:26:51 UTC 2010
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile
Log Message:
USETBL=yes. several of these manuals need it. from PR#36600.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libX11/Makefile
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
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.7 src/external/mit/xorg/lib/libX11/Makefile:1.8
--- src/external/mit/xorg/lib/libX11/Makefile:1.7 Sat May 22 05:45:01 2010
+++ src/external/mit/xorg/lib/libX11/Makefile Tue Jun 1 05:26:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/05/22 05:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/01 05:26:51 mrg Exp $
.include bsd.own.mk
@@ -81,6 +81,8 @@
XrmPutResource.3 XrmUniqueQuark.3
# XGetEventData.man
+USETBL= yes
+
FILES= XErrorDB XKeysymDB Xcms.txt
FILESDIR= ${X11LIBDIR}
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: mrg
Date: Sat May 22 02:41:13 UTC 2010
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11
Log Message:
add new sources and -Wno-error's for libX11 1.3.3.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.7
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.6 Tue Mar 10 16:36:07 2009
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Sat May 22 02:41:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.6 2009/03/10 16:36:07 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.7 2010/05/22 02:41:13 mrg Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -87,6 +87,7 @@
FreeCols.c \
FreeCurs.c \
FreeEData.c \
+ FreeEventData.c \
FreeGC.c \
FreePix.c \
FSSaver.c \
@@ -96,6 +97,7 @@
GetAtomNm.c \
GetColor.c \
GetDflt.c \
+ GetEventData.c \
GetFPath.c \
GetFProp.c \
GetGCVals.c \
@@ -446,5 +448,8 @@
COPTS.StBytes.c+= -Wno-error
COPTS.lcUTF8.c+= -Wno-error
+COPTS.Font.c+= -Wno-error # XXX xf86bigfstr.h
+COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h
+COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h
.include ${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys
