CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Mon Jun 19 04:46:12 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist: ChangeLog README.md aclocal.m4 configure configure.ac xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre Log Message: merge libX11 1.8.6. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/ChangeLog \ xsrc/external/mit/libX11/dist/aclocal.m4 \ xsrc/external/mit/libX11/dist/configure \ xsrc/external/mit/libX11/dist/configure.ac cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/README.md cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.11 -r1.12 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Mon Jun 19 04:46:12 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist: ChangeLog README.md aclocal.m4 configure configure.ac xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre Log Message: merge libX11 1.8.6. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/ChangeLog \ xsrc/external/mit/libX11/dist/aclocal.m4 \ xsrc/external/mit/libX11/dist/configure \ xsrc/external/mit/libX11/dist/configure.ac cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/README.md cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.11 -r1.12 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 23:26:20 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist/src: locking.h Log Message: avoid redefining xmalloc and xfree. this file defines them with a parameter, but Xthreads.h (which comes from xorgproto) only defines them as names, causing conflicting definitions. fixes build with libX11 1.8.4. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/locking.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 23:26:20 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist/src: locking.h Log Message: avoid redefining xmalloc and xfree. this file defines them with a parameter, but Xthreads.h (which comes from xorgproto) only defines them as names, causing conflicting definitions. fixes build with libX11 1.8.4. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/locking.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/src/locking.h diff -u xsrc/external/mit/libX11/dist/src/locking.h:1.1.1.5 xsrc/external/mit/libX11/dist/src/locking.h:1.2 --- xsrc/external/mit/libX11/dist/src/locking.h:1.1.1.5 Tue Apr 27 06:10:57 2021 +++ xsrc/external/mit/libX11/dist/src/locking.h Sun Feb 5 23:26:20 2023 @@ -34,8 +34,12 @@ in this Software without prior written a #ifndef _X_locking_H_ #define _X_locking_H_ +#ifndef xmalloc #define xmalloc(s) Xmalloc(s) +#endif +#ifndef xfree #define xfree(s) Xfree(s) +#endif #include #include #include
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 22:58:21 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist: ChangeLog aclocal.m4 configure configure.ac xsrc/external/mit/libX11/dist/include/X11: Xlibint.h xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src: ChkIfEv.c IfEvent.c PeekIfEv.c PutBEvent.c locking.c Log Message: merge libX11 1.8.4. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/ChangeLog \ xsrc/external/mit/libX11/dist/aclocal.m4 \ xsrc/external/mit/libX11/dist/configure \ xsrc/external/mit/libX11/dist/configure.ac cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/include/X11/Xlibint.h cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.10 -r1.11 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/ChkIfEv.c \ xsrc/external/mit/libX11/dist/src/IfEvent.c \ xsrc/external/mit/libX11/dist/src/PeekIfEv.c \ xsrc/external/mit/libX11/dist/src/PutBEvent.c \ xsrc/external/mit/libX11/dist/src/locking.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Feb 5 22:58:21 UTC 2023 Modified Files: xsrc/external/mit/libX11/dist: ChangeLog aclocal.m4 configure configure.ac xsrc/external/mit/libX11/dist/include/X11: Xlibint.h xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src: ChkIfEv.c IfEvent.c PeekIfEv.c PutBEvent.c locking.c Log Message: merge libX11 1.8.4. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/ChangeLog \ xsrc/external/mit/libX11/dist/aclocal.m4 \ xsrc/external/mit/libX11/dist/configure \ xsrc/external/mit/libX11/dist/configure.ac cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/include/X11/Xlibint.h cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.10 -r1.11 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/ChkIfEv.c \ xsrc/external/mit/libX11/dist/src/IfEvent.c \ xsrc/external/mit/libX11/dist/src/PeekIfEv.c \ xsrc/external/mit/libX11/dist/src/PutBEvent.c \ xsrc/external/mit/libX11/dist/src/locking.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: martin
Date: Mon Dec 19 14:15:10 UTC 2022
Modified Files:
xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c
xsrc/external/mit/libX11/dist/src: CrGlCur.c
Log Message:
Fix broken revert commit part #2
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/CrGlCur.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c
diff -u xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.4 xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.5
--- xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.4 Mon Dec 19 13:20:17 2022
+++ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c Mon Dec 19 14:15:09 2022
@@ -219,9 +219,9 @@ _XimLocalUtf8LookupString(XIC xic, XKeyE
if(status) *status = XBufferOverflow;
return (ret);
}
- buffer[0] = 0xe0 | ((BRL_UC_ROW >> 12) & 0x0f);
- buffer[1] = 0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6);
- buffer[2] = 0x80 | (pattern & 0x3f);
+ buffer[0] = (char)(0xe0 | ((BRL_UC_ROW >> 12) & 0x0f));
+ buffer[1] = (char)(0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6));
+ buffer[2] = (char)(0x80 | (pattern & 0x3f));
if(keysym) {
*keysym = XK_braille_blank | pattern;
if(status) *status = XLookupBoth;
Index: xsrc/external/mit/libX11/dist/src/CrGlCur.c
diff -u xsrc/external/mit/libX11/dist/src/CrGlCur.c:1.3 xsrc/external/mit/libX11/dist/src/CrGlCur.c:1.4
--- xsrc/external/mit/libX11/dist/src/CrGlCur.c:1.3 Mon Dec 19 13:20:17 2022
+++ xsrc/external/mit/libX11/dist/src/CrGlCur.c Mon Dec 19 14:15:10 2022
@@ -55,7 +55,7 @@ typedef void *XModuleType;
#endif
#ifndef LIBXCURSOR
-#define LIBXCURSOR "libXcursor.so.1"
+#define LIBXCURSOR "libXcursor.so"
#endif
static char libraryName[] = LIBXCURSOR;
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: martin Date: Mon Dec 19 14:15:10 UTC 2022 Modified Files: xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c xsrc/external/mit/libX11/dist/src: CrGlCur.c Log Message: Fix broken revert commit part #2 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/CrGlCur.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: martin
Date: Mon Dec 19 13:20:17 UTC 2022
Modified Files:
xsrc/external/mit/libX11/dist: ChangeLog README.md aclocal.m4 configure
configure.ac
xsrc/external/mit/libX11/dist/include/X11: Xlib.h Xlibint.h
xsrc/external/mit/libX11/dist/man: XInitThreads.man
xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c imLcPrs.c
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: XLC_LOCALE.pre
xsrc/external/mit/libX11/dist/src: ChkIfEv.c CrGlCur.c IfEvent.c
OpenDis.c PeekIfEv.c PutBEvent.c globals.c locking.c
xsrc/external/mit/libX11/dist/src/xkb: XKBBind.c
Log Message:
Argh, undo "revert" commit to wrong branch
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/README.md \
xsrc/external/mit/libX11/dist/aclocal.m4 \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/include/X11/Xlib.h \
xsrc/external/mit/libX11/dist/include/X11/Xlibint.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/man/XInitThreads.man
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XLC_LOCALE.pre
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/ChkIfEv.c \
xsrc/external/mit/libX11/dist/src/CrGlCur.c \
xsrc/external/mit/libX11/dist/src/IfEvent.c \
xsrc/external/mit/libX11/dist/src/OpenDis.c \
xsrc/external/mit/libX11/dist/src/PeekIfEv.c \
xsrc/external/mit/libX11/dist/src/PutBEvent.c \
xsrc/external/mit/libX11/dist/src/globals.c \
xsrc/external/mit/libX11/dist/src/locking.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/xkb/XKBBind.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/ChangeLog
diff -u xsrc/external/mit/libX11/dist/ChangeLog:1.2 xsrc/external/mit/libX11/dist/ChangeLog:1.3
--- xsrc/external/mit/libX11/dist/ChangeLog:1.2 Mon Dec 19 13:19:00 2022
+++ xsrc/external/mit/libX11/dist/ChangeLog Mon Dec 19 13:20:16 2022
@@ -1,3 +1,125 @@
+commit 48487c4b9028e9eec5371742f51e1d64c2e17296
+Author: Alan Coopersmith
+Date: Thu Dec 15 14:52:20 2022 -0800
+
+libX11 1.8.3
+
+Signed-off-by: Alan Coopersmith
+
+commit d6d6cba90215d323567fef13d6565756c9956f60
+Author: Keith Packard
+Date: Sun Dec 11 10:32:26 2022 -0800
+
+Update XPutBackEvent() to support clients that put back unpadded events
+
+It seems to be common practice of some X11 clients to pass specific event
+types into APIs that take XEvent*. For example, freeglut does:
+
+ XConfigureEvent fakeEvent = {0};
+ ...
+ XPutBackEvent(fgDisplay.Display, (XEvent*));
+
+This can result in reads overflowing the input event when libX11 does:
+
+ XEvent store = *event;
+
+=
+==75304==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x00016ee4a8e8 at pc 0x000101c54d14 bp 0x00016ee4a0d0 sp 0x00016ee49888
+READ of size 192 at 0x00016ee4a8e8 thread T0
+#0 0x101c54d10 in __asan_memcpy+0x1a4 (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3cd10)
+#1 0x102848a18 in _XPutBackEvent PutBEvent.c:41
+#2 0x1028490a4 in XPutBackEvent PutBEvent.c:84
+#3 0x1013295c8 in fgOpenWindow freeglut_window.c:1178
+#4 0x101321984 in fgCreateWindow freeglut_structure.c:108
+#5 0x10132b138 in glutCreateWindow freeglut_window.c:1551
+#6 0x100fb7d94 in main+0x78 (checkeredTriangles:arm64+0x13d94)
+#7 0x197de3e4c ()
+
+Address 0x00016ee4a8e8 is located in stack of thread T0 at offset 840 in frame
+#0 0x1013282f8 in fgOpenWindow freeglut_window.c:1063
+
+ This frame has 8 object(s):
+[32, 40) 'title.addr'
+[64, 176) 'winAttr' (line 1066)
+[208, 240) 'textProperty' (line 1067)
+[272, 352) 'sizeHints' (line 1068)
+[384, 440) 'wmHints' (line 1069)
+[480, 672) 'eventReturnBuffer' (line 1070)
+[736, 740) 'num_FBConfigs' (line 1072)
+[752, 840) 'fakeEvent' (line 1074) <== Memory access at offset 840 overflows this variable
+
+This change allows XPutBackEvent() to support such clients without
+risk of memory read overflow.
+
+Reviewed-by: Jeremy Huddleston Sequoia
+Tested-by: Jeremy Huddleston Sequoia
+
+commit 496d9bfeedda89a2211ec665f9214c2693c022f4
+Author: Jeremy Huddleston Sequoia
+Date: Sat Dec 3 16:26:47 2022 -0800
+
+ximcp: Address warning found by UBSan when growing an empty tree
+
+
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: martin Date: Mon Dec 19 13:20:17 UTC 2022 Modified Files: xsrc/external/mit/libX11/dist: ChangeLog README.md aclocal.m4 configure configure.ac xsrc/external/mit/libX11/dist/include/X11: Xlib.h Xlibint.h xsrc/external/mit/libX11/dist/man: XInitThreads.man xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c imLcPrs.c xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: XLC_LOCALE.pre xsrc/external/mit/libX11/dist/src: ChkIfEv.c CrGlCur.c IfEvent.c OpenDis.c PeekIfEv.c PutBEvent.c globals.c locking.c xsrc/external/mit/libX11/dist/src/xkb: XKBBind.c Log Message: Argh, undo "revert" commit to wrong branch To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/ChangeLog \ xsrc/external/mit/libX11/dist/README.md \ xsrc/external/mit/libX11/dist/aclocal.m4 \ xsrc/external/mit/libX11/dist/configure \ xsrc/external/mit/libX11/dist/configure.ac cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/include/X11/Xlib.h \ xsrc/external/mit/libX11/dist/include/X11/Xlibint.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/man/XInitThreads.man cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XLC_LOCALE.pre cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/ChkIfEv.c \ xsrc/external/mit/libX11/dist/src/CrGlCur.c \ xsrc/external/mit/libX11/dist/src/IfEvent.c \ xsrc/external/mit/libX11/dist/src/OpenDis.c \ xsrc/external/mit/libX11/dist/src/PeekIfEv.c \ xsrc/external/mit/libX11/dist/src/PutBEvent.c \ xsrc/external/mit/libX11/dist/src/globals.c \ xsrc/external/mit/libX11/dist/src/locking.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/xkb/XKBBind.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: martin Date: Mon Dec 19 13:19:01 UTC 2022 Modified Files: xsrc/external/mit/libX11/dist: ChangeLog README.md aclocal.m4 configure configure.ac xsrc/external/mit/libX11/dist/include/X11: Xlib.h Xlibint.h xsrc/external/mit/libX11/dist/man: XInitThreads.man xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcPrs.c xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: XLC_LOCALE.pre xsrc/external/mit/libX11/dist/src: ChkIfEv.c IfEvent.c OpenDis.c PeekIfEv.c PutBEvent.c globals.c locking.c xsrc/external/mit/libX11/dist/src/xkb: XKBBind.c Log Message: Try to revert partial previous commit (ssh connection dropped) To generate a diff of this commit: cvs rdiff -u -r1.1.1.28 -r1.2 xsrc/external/mit/libX11/dist/ChangeLog \ xsrc/external/mit/libX11/dist/configure \ xsrc/external/mit/libX11/dist/configure.ac cvs rdiff -u -r1.1.1.8 -r1.2 xsrc/external/mit/libX11/dist/README.md cvs rdiff -u -r1.1.1.24 -r1.2 xsrc/external/mit/libX11/dist/aclocal.m4 cvs rdiff -u -r1.1.1.13 -r1.2 \ xsrc/external/mit/libX11/dist/include/X11/Xlib.h cvs rdiff -u -r1.1.1.16 -r1.2 \ xsrc/external/mit/libX11/dist/include/X11/Xlibint.h cvs rdiff -u -r1.1.1.5 -r1.2 \ xsrc/external/mit/libX11/dist/man/XInitThreads.man cvs rdiff -u -r1.1.1.11 -r1.2 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c cvs rdiff -u -r1.1.1.5 -r1.2 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XLC_LOCALE.pre cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/libX11/dist/src/ChkIfEv.c \ xsrc/external/mit/libX11/dist/src/IfEvent.c cvs rdiff -u -r1.1.1.15 -r1.2 xsrc/external/mit/libX11/dist/src/OpenDis.c cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/PeekIfEv.c cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/external/mit/libX11/dist/src/PutBEvent.c cvs rdiff -u -r1.1.1.10 -r1.2 xsrc/external/mit/libX11/dist/src/globals.c \ xsrc/external/mit/libX11/dist/src/locking.c cvs rdiff -u -r1.1.1.12 -r1.2 xsrc/external/mit/libX11/dist/src/xkb/XKBBind.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: martin
Date: Mon Dec 19 13:19:01 UTC 2022
Modified Files:
xsrc/external/mit/libX11/dist: ChangeLog README.md aclocal.m4 configure
configure.ac
xsrc/external/mit/libX11/dist/include/X11: Xlib.h Xlibint.h
xsrc/external/mit/libX11/dist/man: XInitThreads.man
xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcPrs.c
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: XLC_LOCALE.pre
xsrc/external/mit/libX11/dist/src: ChkIfEv.c IfEvent.c OpenDis.c
PeekIfEv.c PutBEvent.c globals.c locking.c
xsrc/external/mit/libX11/dist/src/xkb: XKBBind.c
Log Message:
Try to revert partial previous commit (ssh connection dropped)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.28 -r1.2 xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.1.1.8 -r1.2 xsrc/external/mit/libX11/dist/README.md
cvs rdiff -u -r1.1.1.24 -r1.2 xsrc/external/mit/libX11/dist/aclocal.m4
cvs rdiff -u -r1.1.1.13 -r1.2 \
xsrc/external/mit/libX11/dist/include/X11/Xlib.h
cvs rdiff -u -r1.1.1.16 -r1.2 \
xsrc/external/mit/libX11/dist/include/X11/Xlibint.h
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/libX11/dist/man/XInitThreads.man
cvs rdiff -u -r1.1.1.11 -r1.2 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XLC_LOCALE.pre
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/libX11/dist/src/ChkIfEv.c \
xsrc/external/mit/libX11/dist/src/IfEvent.c
cvs rdiff -u -r1.1.1.15 -r1.2 xsrc/external/mit/libX11/dist/src/OpenDis.c
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/PeekIfEv.c
cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/external/mit/libX11/dist/src/PutBEvent.c
cvs rdiff -u -r1.1.1.10 -r1.2 xsrc/external/mit/libX11/dist/src/globals.c \
xsrc/external/mit/libX11/dist/src/locking.c
cvs rdiff -u -r1.1.1.12 -r1.2 xsrc/external/mit/libX11/dist/src/xkb/XKBBind.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/ChangeLog
diff -u xsrc/external/mit/libX11/dist/ChangeLog:1.1.1.28 xsrc/external/mit/libX11/dist/ChangeLog:1.2
--- xsrc/external/mit/libX11/dist/ChangeLog:1.1.1.28 Mon Dec 19 00:57:16 2022
+++ xsrc/external/mit/libX11/dist/ChangeLog Mon Dec 19 13:19:00 2022
@@ -1,125 +1,3 @@
-commit 48487c4b9028e9eec5371742f51e1d64c2e17296
-Author: Alan Coopersmith
-Date: Thu Dec 15 14:52:20 2022 -0800
-
-libX11 1.8.3
-
-Signed-off-by: Alan Coopersmith
-
-commit d6d6cba90215d323567fef13d6565756c9956f60
-Author: Keith Packard
-Date: Sun Dec 11 10:32:26 2022 -0800
-
-Update XPutBackEvent() to support clients that put back unpadded events
-
-It seems to be common practice of some X11 clients to pass specific event
-types into APIs that take XEvent*. For example, freeglut does:
-
- XConfigureEvent fakeEvent = {0};
- ...
- XPutBackEvent(fgDisplay.Display, (XEvent*));
-
-This can result in reads overflowing the input event when libX11 does:
-
- XEvent store = *event;
-
-=
-==75304==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x00016ee4a8e8 at pc 0x000101c54d14 bp 0x00016ee4a0d0 sp 0x00016ee49888
-READ of size 192 at 0x00016ee4a8e8 thread T0
-#0 0x101c54d10 in __asan_memcpy+0x1a4 (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3cd10)
-#1 0x102848a18 in _XPutBackEvent PutBEvent.c:41
-#2 0x1028490a4 in XPutBackEvent PutBEvent.c:84
-#3 0x1013295c8 in fgOpenWindow freeglut_window.c:1178
-#4 0x101321984 in fgCreateWindow freeglut_structure.c:108
-#5 0x10132b138 in glutCreateWindow freeglut_window.c:1551
-#6 0x100fb7d94 in main+0x78 (checkeredTriangles:arm64+0x13d94)
-#7 0x197de3e4c ()
-
-Address 0x00016ee4a8e8 is located in stack of thread T0 at offset 840 in frame
-#0 0x1013282f8 in fgOpenWindow freeglut_window.c:1063
-
- This frame has 8 object(s):
-[32, 40) 'title.addr'
-[64, 176) 'winAttr' (line 1066)
-[208, 240) 'textProperty' (line 1067)
-[272, 352) 'sizeHints' (line 1068)
-[384, 440) 'wmHints' (line 1069)
-[480, 672) 'eventReturnBuffer' (line 1070)
-[736, 740) 'num_FBConfigs' (line 1072)
-[752, 840) 'fakeEvent' (line 1074) <== Memory access at offset 840 overflows this variable
-
-This change allows XPutBackEvent() to support such clients without
-risk of memory read overflow.
-
-Reviewed-by: Jeremy Huddleston Sequoia
-Tested-by: Jeremy Huddleston Sequoia
-
-commit 496d9bfeedda89a2211ec665f9214c2693c022f4
-Author: Jeremy Huddleston Sequoia
-Date: Sat Dec 3 16:26:47 2022 -0800
-
-
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Fri Nov 11 04:45:23 UTC 2022 Modified Files: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c Removed Files: xsrc/external/mit/libX11/dist: NEWS xsrc/external/mit/libX11/dist/src: UIThrStubs.c Log Message: merge libX11 1.8.2. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/NEWS cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libX11/dist/src/UIThrStubs.c cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Fri Nov 11 04:45:23 UTC 2022
Modified Files:
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Removed Files:
xsrc/external/mit/libX11/dist: NEWS
xsrc/external/mit/libX11/dist/src: UIThrStubs.c
Log Message:
merge libX11 1.8.2.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/NEWS
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libX11/dist/src/UIThrStubs.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.9 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.10
--- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.9 Wed Jul 13 19:57:48 2022
+++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Fri Nov 11 04:45:23 2022
@@ -14,6 +14,8 @@ XCOMM Spacing versions of accents (mostl
: "`" grave # GRAVE ACCENT
: "^" asciicircum # CIRCUMFLEX ACCENT
: "^" asciicircum # CIRCUMFLEX ACCENT
+ : "^" asciicircum # CIRCUMFLEX ACCENT
+ : "^" asciicircum # CIRCUMFLEX ACCENT
: "°" degree # DEGREE SIGN
: "°" degree # DEGREE SIGN
: "°" degree # DEGREE SIGN
@@ -22,13 +24,14 @@ XCOMM Spacing versions of accents (mostl
: "¯" macron # MACRON
: "¯" macron # MACRON
: "¯" macron # MACRON
- : "¯" macron # MACRON
+ : "¯" macron # MACRON
+ : "¯" macron # MACRON
: "¯" macron # MACRON
: "¯" macron # MACRON
: "˘" breve # BREVE
: "˘" breve # BREVE
- : "˘" breve # BREVE
: "˘" breve # BREVE
+ : "˘" breve # BREVE
: "˙" abovedot # DOT ABOVE
: "˙" abovedot # DOT ABOVE
: "˙" abovedot # DOT ABOVE
@@ -40,8 +43,8 @@ XCOMM Spacing versions of accents (mostl
: "˝" U2dd # DOUBLE ACUTE ACCENT
: "ˇ" caron # CARON
: "ˇ" caron # CARON
- : "ˇ" caron # CARON
: "ˇ" caron # CARON
+ : "ˇ" caron # CARON
: "¸" cedilla # CEDILLA
: "¸" cedilla # CEDILLA
: "¸" cedilla # CEDILLA
@@ -56,17 +59,18 @@ XCOMM Spacing versions of accents (mostl
XCOMM ASCII characters that may be difficult to access on some keyboards.
: "#" numbersign # NUMBER SIGN
: "@" at # COMMERCIAL AT
+
: "[" bracketleft # LEFT SQUARE BRACKET
+ : "]" bracketright # RIGHT SQUARE BRACKET
+
: "\\" backslash # REVERSE SOLIDUS
: "\\" backslash # REVERSE SOLIDUS
: "\\" backslash # REVERSE SOLIDUS
- : "]" bracketright # RIGHT SQUARE BRACKET
-
- : "^" asciicircum # CIRCUMFLEX ACCENT
- : "^" asciicircum # CIRCUMFLEX ACCENT
: "{" braceleft # LEFT CURLY BRACKET
: "{" braceleft # LEFT CURLY BRACKET
+ : "}" braceright # RIGHT CURLY BRACKET
+ : "}" braceright # RIGHT CURLY BRACKET
: "|" bar # VERTICAL LINE
: "|" bar # VERTICAL LINE
@@ -75,9 +79,6 @@ XCOMM ASCII characters that may be diffi
: "|" bar # VERTICAL LINE
: "|" bar # VERTICAL LINE
- : "}" braceright # RIGHT CURLY BRACKET
- : "}" braceright # RIGHT CURLY BRACKET
-
: "<" less # LESS-THAN
: "<" less # LESS-THAN
: ">" greater # GREATER-THAN
@@ -294,6 +295,11 @@ XCOMM Latin-1 Supplement
: "ª" ordfeminine # FEMININE ORDINAL INDICATOR
: "º" masculine # MASCULINE ORDINAL INDICATOR
: "º" masculine # MASCULINE ORDINAL INDICATOR
+ <1> : "¹" onesuperior # SUPERSCRIPT ONE
+ <1> : "¹" onesuperior # SUPERSCRIPT ONE
+ <1> : "¹" onesuperior # SUPERSCRIPT ONE
+ : "¹" onesuperior # SUPERSCRIPT ONE
+ : "¹" onesuperior # SUPERSCRIPT ONE
<2> : "²" twosuperior # SUPERSCRIPT TWO
<2> : "²" twosuperior # SUPERSCRIPT TWO
<2> : "²" twosuperior # SUPERSCRIPT TWO
@@ -307,11 +313,6 @@ XCOMM Latin-1 Supplement
: "µ" mu # MICRO SIGN
: "µ" mu # MICRO SIGN
: "µ" mu # MICRO SIGN
- <1> : "¹" onesuperior # SUPERSCRIPT ONE
- <1> : "¹" onesuperior # SUPERSCRIPT ONE
- <1> : "¹" onesuperior # SUPERSCRIPT ONE
- : "¹" onesuperior # SUPERSCRIPT ONE
- : "¹" onesuperior # SUPERSCRIPT ONE
<1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER
<1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF
<3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS
@@ -706,20 +707,18 @@ XCOMM Latin Extended-A
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
- : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
- : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 13 19:57:49 UTC 2022 Modified Files: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src/xkb: XKBMAlloc.c Added Files: xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 Log Message: merge libX11 1.8.1. To generate a diff of this commit: cvs rdiff -u -r0 -r1.12 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r0 -r1.6 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 13 19:57:49 UTC 2022 Modified Files: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src/xkb: XKBMAlloc.c Added Files: xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 Log Message: merge libX11 1.8.1. To generate a diff of this commit: cvs rdiff -u -r0 -r1.12 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r0 -r1.6 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Wed May 19 08:28:16 UTC 2021 Modified Files: xsrc/external/mit/libX11/dist/src: SetFPath.c Log Message: include always, not if HAVE_CONFIG_H is set. To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/libX11/dist/src/SetFPath.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/src/SetFPath.c diff -u xsrc/external/mit/libX11/dist/src/SetFPath.c:1.1.1.6 xsrc/external/mit/libX11/dist/src/SetFPath.c:1.2 --- xsrc/external/mit/libX11/dist/src/SetFPath.c:1.1.1.6 Wed May 19 08:19:12 2021 +++ xsrc/external/mit/libX11/dist/src/SetFPath.c Wed May 19 08:28:15 2021 @@ -26,8 +26,8 @@ in this Software without prior written a #ifdef HAVE_CONFIG_H #include -#include #endif +#include #include "Xlibint.h" #define safestrlen(s) ((s) ? strlen(s) : 0)
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Wed May 19 08:28:16 UTC 2021 Modified Files: xsrc/external/mit/libX11/dist/src: SetFPath.c Log Message: include always, not if HAVE_CONFIG_H is set. To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/libX11/dist/src/SetFPath.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Wed May 19 08:20:08 UTC 2021
Modified Files:
xsrc/external/mit/libX11/dist/man: XCreateGC.man
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c
Log Message:
merge libX11 1.7.1.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/man/XCreateGC.man
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/src/Font.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/FontNames.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/man/XCreateGC.man
diff -u xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.6 xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.7
--- xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.6 Sun Aug 30 04:53:28 2020
+++ xsrc/external/mit/libX11/dist/man/XCreateGC.man Wed May 19 08:20:08 2021
@@ -160,7 +160,7 @@ The
.B XGetGCValues
function returns the components specified by valuemask for the specified GC.
If the valuemask contains a valid set of GC mask bits
-.Pn ( GCFunction ,
+.RB ( GCFunction ,
.BR GCPlaneMask ,
.BR GCForeground ,
.BR GCBackground ,
@@ -332,7 +332,6 @@ T} T{
(1L<<22)
T}
.TE
-.IN "XGCValues" "" "@DEF@"
.LP
.EX
/\&* Values */
@@ -373,7 +372,7 @@ is typically the most useful because it
but special applications may use other functions,
particularly in concert with particular planes of a color display.
The 16 GC functions, defined in
-.hN X11/X.h ,
+.BR X11/X.h ,
are:
.\" are listed in Table 5-1 along with the
.\"the associated hexadecimal code
@@ -506,10 +505,8 @@ _
.TE
.LP
Many graphics operations depend on either pixel values or planes in a GC.
-.IN "Pixel value"
The planes attribute is of type long, and it specifies which planes of the
destination are to be modified, one bit per plane.
-.IN "Plane" "mask"
A monochrome display has only one plane and
will be the least significant bit of the word.
As planes are added to the display hardware, they will occupy more
@@ -623,7 +620,6 @@ T}
.TE
.LP
The cap-style defines how the endpoints of a path are drawn:
-.IN "Graphics context" "path"
.TS
lw(1.0i) lw(4.5i).
T{
Index: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.7 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.8
--- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.7 Tue Apr 27 06:14:35 2021
+++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Wed May 19 08:20:08 2021
@@ -924,9 +924,11 @@ XCOMM Part 3
: "ē" U0113 # LATIN SMALL LETTER E WITH MACRON
: "Ĕ" U0114 # LATIN CAPITAL LETTER E WITH BREVE
: "Ĕ" U0114 # LATIN CAPITAL LETTER E WITH BREVE
+ : "Ĕ" U0114 # LATIN CAPITAL LETTER E WITH BREVE
: "Ĕ" U0114 # LATIN CAPITAL LETTER E WITH BREVE
: "ĕ" U0115 # LATIN SMALL LETTER E WITH BREVE
: "ĕ" U0115 # LATIN SMALL LETTER E WITH BREVE
+ : "ĕ" U0115 # LATIN SMALL LETTER E WITH BREVE
: "ĕ" U0115 # LATIN SMALL LETTER E WITH BREVE
: "Ė" U0116 # LATIN CAPITAL LETTER E WITH DOT ABOVE
: "Ė" U0116 # LATIN CAPITAL LETTER E WITH DOT ABOVE
@@ -960,14 +962,18 @@ XCOMM Part 3
: "ĝ" U011D # LATIN SMALL LETTER G WITH CIRCUMFLEX
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
+ : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
+ : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE
: "ğ" U011F # LATIN SMALL LETTER G WITH BREVE
: "ğ" U011F # LATIN SMALL LETTER G WITH BREVE
+ : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE
: "ğ" U011F # LATIN SMALL LETTER G WITH BREVE
+ : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE
: "ğ" U011F # LATIN SMALL LETTER G WITH BREVE
: "ğ" U011F # LATIN SMALL LETTER G WITH BREVE
: "ğ" U011F # LATIN SMALL LETTER G WITH BREVE
@@ -1016,9 +1022,11 @@ XCOMM Part 3
: "ī" U012B # LATIN SMALL LETTER I WITH MACRON
: "Ĭ" U012C # LATIN CAPITAL LETTER I WITH BREVE
: "Ĭ" U012C # LATIN CAPITAL LETTER I WITH BREVE
+ : "Ĭ" U012C # LATIN CAPITAL LETTER I WITH BREVE
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Wed May 19 08:20:08 UTC 2021 Modified Files: xsrc/external/mit/libX11/dist/man: XCreateGC.man xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src: Font.c FontNames.c Log Message: merge libX11 1.7.1. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/man/XCreateGC.man cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/src/Font.c cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/FontNames.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Tue Apr 27 06:14:35 UTC 2021
Modified Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: XlibInt.c
Removed Files:
xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8: Compose.pre XI18N_OBJS
XLC_LOCALE.pre
Log Message:
merge libX11 1.7.0.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/m4/libtool.m4
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/Compose.pre
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/XI18N_OBJS \
xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/XLC_LOCALE.pre
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libX11/dist/src/XlibInt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/m4/libtool.m4
diff -u xsrc/external/mit/libX11/dist/m4/libtool.m4:1.9 xsrc/external/mit/libX11/dist/m4/libtool.m4:1.10
--- xsrc/external/mit/libX11/dist/m4/libtool.m4:1.9 Fri Jul 31 19:29:52 2020
+++ xsrc/external/mit/libX11/dist/m4/libtool.m4 Tue Apr 27 06:14:35 2021
@@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;}
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>_MESSAGE_LOG_FD
+ echo "$AR cr libconftest.a conftest.o" >_MESSAGE_LOG_FD
+ $AR cr libconftest.a conftest.o 2>_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
@@ -1492,7 +1492,7 @@ need_locks=$enable_libtool_lock
m4_defun([_LT_PROG_AR],
[AC_CHECK_TOOLS(AR, [ar], false)
: ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
_LT_DECL([], [AR], [1], [The archiver])
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
@@ -4063,7 +4063,8 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
-if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >_MESSAGE_LOG_FD
+if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>_MESSAGE_LOG_FD && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -4703,6 +4704,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
+ # flang / f18. f95 an alias for gfortran or flang on Debian
+ flang* | f18* | f95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
@@ -6438,7 +6445,7 @@ if test yes != "$_lt_caught_CXX_error";
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
GXX=no
@@ -6813,7 +6820,7 @@ if test yes != "$_lt_caught_CXX_error";
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
-output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test yes = "$GXX"; then
@@ -6878,7 +6885,7 @@ if test yes != "$_lt_caught_CXX_error";
# explicitly linking system object files so we need to strip them
# from
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Tue Apr 27 06:14:35 UTC 2021 Modified Files: xsrc/external/mit/libX11/dist/m4: libtool.m4 xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src: XlibInt.c Removed Files: xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8: Compose.pre XI18N_OBJS XLC_LOCALE.pre Log Message: merge libX11 1.7.0. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/Compose.pre cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/XI18N_OBJS \ xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/XLC_LOCALE.pre cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libX11/dist/src/XlibInt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: nia Date: Tue Sep 15 14:29:04 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist/src: CrGlCur.c Log Message: Dynamically load an unversioned libXcursor. The version number is wrong for NetBSD (we have libXcursor.so.2 instead of libXcursor.so.1) and this makes things fail. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/libX11/dist/src/CrGlCur.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/src/CrGlCur.c diff -u xsrc/external/mit/libX11/dist/src/CrGlCur.c:1.1.1.4 xsrc/external/mit/libX11/dist/src/CrGlCur.c:1.2 --- xsrc/external/mit/libX11/dist/src/CrGlCur.c:1.1.1.4 Sat May 22 01:22:13 2010 +++ xsrc/external/mit/libX11/dist/src/CrGlCur.c Tue Sep 15 14:29:04 2020 @@ -55,7 +55,7 @@ typedef void *XModuleType; #endif #ifndef LIBXCURSOR -#define LIBXCURSOR "libXcursor.so.1" +#define LIBXCURSOR "libXcursor.so" #endif static char libraryName[] = LIBXCURSOR;
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: nia Date: Tue Sep 15 14:29:04 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist/src: CrGlCur.c Log Message: Dynamically load an unversioned libXcursor. The version number is wrong for NetBSD (we have libXcursor.so.2 instead of libXcursor.so.1) and this makes things fail. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/libX11/dist/src/CrGlCur.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Aug 30 04:53:28 UTC 2020
Modified Files:
xsrc/external/mit/libX11/dist/man: XCreateGC.man
xsrc/external/mit/libX11/dist/modules/im/ximcp: imRmAttr.c
Log Message:
merge libX11 1.6.12.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/man/XCreateGC.man
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/man/XCreateGC.man
diff -u xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.5 xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.6
--- xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.5 Sun Feb 23 09:05:17 2020
+++ xsrc/external/mit/libX11/dist/man/XCreateGC.man Sun Aug 30 04:53:28 2020
@@ -178,7 +178,7 @@ If the valuemask contains a valid set of
.BR GCSubwindowMode ,
.BR GCGraphicsExposures ,
.BR GCClipXOrigin ,
-.BR GCCLipYOrigin ,
+.BR GCClipYOrigin ,
.BR GCDashOffset ,
or
.BR GCArcMode )
Index: xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c
diff -u xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.2 xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.3
--- xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.2 Tue Aug 4 15:47:27 2020
+++ xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Sun Aug 30 04:53:28 2020
@@ -1407,7 +1407,7 @@ _XimCountNumberOfAttr(
*names_len = 0;
while (total > min_len) {
len = attr[2];
- if (len >= (total - min_len)) {
+ if (len > (total - min_len)) {
return 0;
}
*names_len += (len + 1);
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Aug 30 04:53:28 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist/man: XCreateGC.man xsrc/external/mit/libX11/dist/modules/im/ximcp: imRmAttr.c Log Message: merge libX11 1.6.12. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/man/XCreateGC.man cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/modules/im/ximcp
Module Name:xsrc Committed By: maya Date: Tue Aug 4 15:47:28 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist/modules/im/ximcp: imRmAttr.c Log Message: >From 93fce3f4e79cbc737d6468a4f68ba3de1b83953b Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sun, 2 Aug 2020 13:43:58 -0400 Subject: [PATCH] Fix size calculation in `_XimAttributeToValue`. The check here guards the read below. For `XimType_XIMStyles`, these are `num` of `CARD32` and for `XimType_XIMHotKeyTriggers` these are `num` of `XIMTRIGGERKEY` ref[1] which is defined as 3 x `CARD32`. (There are data after the `XIMTRIGGERKEY` according to the spec but they are not read by this function and doesn't need to be checked.) The old code here used the native datatype size instead of the wire protocol size causing the check to always fail. Also fix the size calculation for the header (size). It is 2 x CARD16 for both types despite the unused `CARD16` for `XimType_XIMStyles`. [1] https://www.x.org/releases/X11R7.6/doc/libX11/specs/XIM/xim.html#Input_Method_Styles This fixes a regression caused by 388b303c62aa35a245f1704211a023440ad2c488 in 1.6.10. To generate a diff of this commit: cvs rdiff -u -r1.1.1.9 -r1.2 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/modules/im/ximcp
Module Name:xsrc Committed By: maya Date: Tue Aug 4 15:47:28 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist/modules/im/ximcp: imRmAttr.c Log Message: >From 93fce3f4e79cbc737d6468a4f68ba3de1b83953b Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sun, 2 Aug 2020 13:43:58 -0400 Subject: [PATCH] Fix size calculation in `_XimAttributeToValue`. The check here guards the read below. For `XimType_XIMStyles`, these are `num` of `CARD32` and for `XimType_XIMHotKeyTriggers` these are `num` of `XIMTRIGGERKEY` ref[1] which is defined as 3 x `CARD32`. (There are data after the `XIMTRIGGERKEY` according to the spec but they are not read by this function and doesn't need to be checked.) The old code here used the native datatype size instead of the wire protocol size causing the check to always fail. Also fix the size calculation for the header (size). It is 2 x CARD16 for both types despite the unused `CARD16` for `XimType_XIMStyles`. [1] https://www.x.org/releases/X11R7.6/doc/libX11/specs/XIM/xim.html#Input_Method_Styles This fixes a regression caused by 388b303c62aa35a245f1704211a023440ad2c488 in 1.6.10. To generate a diff of this commit: cvs rdiff -u -r1.1.1.9 -r1.2 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c diff -u xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.1.1.9 xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.2 --- xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.1.1.9 Fri Jul 31 19:19:40 2020 +++ xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Tue Aug 4 15:47:27 2020 @@ -265,7 +265,7 @@ _XimAttributeToValue( if (num > (USHRT_MAX / sizeof(XIMStyle))) return False; - if ((sizeof(num) + (num * sizeof(XIMStyle))) > data_len) + if ((2 * sizeof(CARD16) + (num * sizeof(CARD32))) > data_len) return False; alloc_len = sizeof(XIMStyles) + sizeof(XIMStyle) * num; if (alloc_len < sizeof(XIMStyles)) @@ -379,7 +379,7 @@ _XimAttributeToValue( if (num > (UINT_MAX / sizeof(XIMHotKeyTrigger))) return False; - if ((sizeof(num) + (num * sizeof(XIMHotKeyTrigger))) > data_len) + if ((2 * sizeof(CARD16) + (num * 3 * sizeof(CARD32))) > data_len) return False; alloc_len = sizeof(XIMHotKeyTriggers) + sizeof(XIMHotKeyTrigger) * num;
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: maya Date: Fri Jul 31 19:29:52 UTC 2020 Modified Files: xsrc/external/mit/libX11/dist/m4: libtool.m4 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src: Font.c FontNames.c XlibInt.c Log Message: Merge libX11 1.6.10 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/Font.c cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/src/FontNames.c cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libX11/dist/src/XlibInt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: maya
Date: Fri Jul 31 19:29:52 UTC 2020
Modified Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c XlibInt.c
Log Message:
Merge libX11 1.6.10
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/m4/libtool.m4
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/Font.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/src/FontNames.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libX11/dist/src/XlibInt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/m4/libtool.m4
diff -u xsrc/external/mit/libX11/dist/m4/libtool.m4:1.8 xsrc/external/mit/libX11/dist/m4/libtool.m4:1.9
--- xsrc/external/mit/libX11/dist/m4/libtool.m4:1.8 Sun Feb 23 09:05:16 2020
+++ xsrc/external/mit/libX11/dist/m4/libtool.m4 Fri Jul 31 19:29:52 2020
@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -2867,9 +2866,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -2878,7 +2874,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
# appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2890,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3549,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4427,7 +4435,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4939,6 +4947,9 @@ m4_if([$1], [CXX], [
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+_LT_TAGVAR(link_all_deplibs, $1)=no
+;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5001,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for
openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+_LT_TAGVAR(link_all_deplibs, $1)=no
+;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5255,7 +5269,7 @@ _LT_EOF
fi
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5776,6 +5790,7 @@ _LT_EOF
if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
CVS commit: xsrc/external/mit/libX11/dist/m4
Module Name:xsrc
Committed By: maya
Date: Tue Aug 6 11:57:13 UTC 2019
Modified Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4
Log Message:
Undo local diff in file we don't use.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/m4/libtool.m4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/m4/libtool.m4
diff -u xsrc/external/mit/libX11/dist/m4/libtool.m4:1.6 xsrc/external/mit/libX11/dist/m4/libtool.m4:1.7
--- xsrc/external/mit/libX11/dist/m4/libtool.m4:1.6 Sun Dec 30 05:45:22 2018
+++ xsrc/external/mit/libX11/dist/m4/libtool.m4 Tue Aug 6 11:57:13 2019
@@ -2666,7 +2666,14 @@ freebsd* | dragonfly*)
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+gentoo)
+ version_type=linux ;;
+*)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
@@ -2678,6 +2685,12 @@ freebsd* | dragonfly*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
+linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -2887,18 +2900,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3558,7 +3559,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4436,7 +4437,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4948,9 +4949,6 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
-_LT_TAGVAR(link_all_deplibs, $1)=no
-;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5013,9 +5011,6 @@ dnl Note also adjust exclude_expsyms for
openbsd* | bitrig*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
-_LT_TAGVAR(link_all_deplibs, $1)=no
-;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5270,7 +5265,7 @@ _LT_EOF
fi
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5791,7 +5786,6 @@ _LT_EOF
if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -5813,7 +5807,7 @@ _LT_EOF
esac
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
CVS commit: xsrc/external/mit/libX11/dist/m4
Module Name:xsrc Committed By: maya Date: Tue Aug 6 11:57:13 UTC 2019 Modified Files: xsrc/external/mit/libX11/dist/m4: libtool.m4 Log Message: Undo local diff in file we don't use. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/m4/libtool.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/m4
Module Name:xsrc
Committed By: mrg
Date: Sun Dec 30 05:45:22 UTC 2018
Modified Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4
Log Message:
merge libX11 1.6.7.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/m4/libtool.m4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/m4/libtool.m4
diff -u xsrc/external/mit/libX11/dist/m4/libtool.m4:1.5 xsrc/external/mit/libX11/dist/m4/libtool.m4:1.6
--- xsrc/external/mit/libX11/dist/m4/libtool.m4:1.5 Tue Aug 28 05:52:12 2018
+++ xsrc/external/mit/libX11/dist/m4/libtool.m4 Sun Dec 30 05:45:22 2018
@@ -1417,10 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*linux*)
+ powerpcle-*linux*|powerpc64le-*linux*)
LD="${LD-ld} -m elf64lppc"
;;
- powerpc-*linux*)
+ powerpc-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
CVS commit: xsrc/external/mit/libX11/dist/m4
Module Name:xsrc Committed By: mrg Date: Sun Dec 30 05:45:22 UTC 2018 Modified Files: xsrc/external/mit/libX11/dist/m4: libtool.m4 Log Message: merge libX11 1.6.7. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/m4/libtool.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Tue Aug 28 05:52:12 UTC 2018 Modified Files: xsrc/external/mit/libX11/dist/m4: libtool.m4 xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c xsrc/external/mit/libX11/dist/src: FontNames.c GetFPath.c ListExt.c ModMap.c XlibInt.c Log Message: merge libX11 1.6.6. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/m4/libtool.m4 cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/FontNames.c \ xsrc/external/mit/libX11/dist/src/ModMap.c cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/GetFPath.c \ xsrc/external/mit/libX11/dist/src/ListExt.c cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/XlibInt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Tue Aug 28 05:52:12 UTC 2018
Modified Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4
xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c
xsrc/external/mit/libX11/dist/src: FontNames.c GetFPath.c ListExt.c
ModMap.c XlibInt.c
Log Message:
merge libX11 1.6.6.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/m4/libtool.m4
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/ModMap.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/GetFPath.c \
xsrc/external/mit/libX11/dist/src/ListExt.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/XlibInt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/m4/libtool.m4
diff -u xsrc/external/mit/libX11/dist/m4/libtool.m4:1.4 xsrc/external/mit/libX11/dist/m4/libtool.m4:1.5
--- xsrc/external/mit/libX11/dist/m4/libtool.m4:1.4 Sat Mar 4 22:00:21 2017
+++ xsrc/external/mit/libX11/dist/m4/libtool.m4 Tue Aug 28 05:52:12 2018
@@ -2666,14 +2666,7 @@ freebsd* | dragonfly*)
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
-gentoo)
- version_type=linux ;;
-*)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
@@ -2685,12 +2678,6 @@ freebsd* | dragonfly*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
-linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -2900,6 +2887,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3559,7 +3558,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4437,7 +4436,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4949,6 +4948,9 @@ m4_if([$1], [CXX], [
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+_LT_TAGVAR(link_all_deplibs, $1)=no
+;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5011,6 +5013,9 @@ dnl Note also adjust exclude_expsyms for
openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+_LT_TAGVAR(link_all_deplibs, $1)=no
+;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5265,7 +5270,7 @@ _LT_EOF
fi
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5786,6 +5791,7 @@ _LT_EOF
if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"`
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 22:00:21 UTC 2017 Modified Files: xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 xsrc/external/mit/libX11/dist/src: FontNames.c Log Message: merge libX11 1.6.5. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/m4/libtool.m4 \ xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/FontNames.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/modules/im/ximcp
Module Name:xsrc
Committed By: joerg
Date: Thu Oct 13 23:38:48 UTC 2016
Modified Files:
xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c
Log Message:
Add explicit char cast to deal with constants being implicitly changed
on signed char platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c
diff -u xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.1.1.5 xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.2
--- xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c:1.1.1.5 Thu May 30 23:04:43 2013
+++ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c Thu Oct 13 23:38:47 2016
@@ -219,9 +219,9 @@ _XimLocalUtf8LookupString(XIC xic, XKeyE
if(status) *status = XBufferOverflow;
return (ret);
}
- buffer[0] = 0xe0 | ((BRL_UC_ROW >> 12) & 0x0f);
- buffer[1] = 0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6);
- buffer[2] = 0x80 | (pattern & 0x3f);
+ buffer[0] = (char)(0xe0 | ((BRL_UC_ROW >> 12) & 0x0f));
+ buffer[1] = (char)(0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6));
+ buffer[2] = (char)(0x80 | (pattern & 0x3f));
if(keysym) {
*keysym = XK_braille_blank | pattern;
if(status) *status = XLookupBoth;
CVS commit: xsrc/external/mit/libX11/dist/modules/im/ximcp
Module Name:xsrc Committed By: joerg Date: Thu Oct 13 23:38:48 UTC 2016 Modified Files: xsrc/external/mit/libX11/dist/modules/im/ximcp: imLcLkup.c Log Message: Add explicit char cast to deal with constants being implicitly changed on signed char platforms. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcLkup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Tue Oct 4 22:04:39 UTC 2016 Modified Files: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src: Font.c FontNames.c GetFPath.c ListExt.c ModMap.c XlibInt.c xsrc/external/mit/libX11/dist/src/xcms: cmsTrig.c xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c Added Files: xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 Log Message: merge libX11 1.6.4. To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libX11/dist/m4/libtool.m4 \ xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \ xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \ xsrc/external/mit/libX11/dist/m4/ltversion.m4 \ xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4 cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/Font.c \ xsrc/external/mit/libX11/dist/src/FontNames.c \ xsrc/external/mit/libX11/dist/src/GetFPath.c \ xsrc/external/mit/libX11/dist/src/ListExt.c cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/ModMap.c cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/src/XlibInt.c cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 19 08:13:11 UTC 2015
Modified Files:
xsrc/external/mit/libX11/dist/man: XCreateGC.man
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c GetFPath.c
ListExt.c ModMap.c XlibInt.c
xsrc/external/mit/libX11/dist/src/xkb: XKBMAlloc.c
Removed Files:
xsrc/external/mit/libX11/dist/modules/lc/xlocale: Makefile.am
Makefile.in lcEuc.c lcJis.c lcSjis.c
Log Message:
merge libX11 1.6.3.
this properly fixes src/xkb/XKBMAlloc.c rev 1.2 as well (this probably
should be looked at for pull up as patch.)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/man/XCreateGC.man
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/Makefile.am \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/lcEuc.c \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/lcSjis.c
cvs rdiff -u -r1.1.1.12 -r0 \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/Makefile.in
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/lcJis.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/Font.c \
xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/GetFPath.c \
xsrc/external/mit/libX11/dist/src/ListExt.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/ModMap.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/src/XlibInt.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/man/XCreateGC.man
diff -u xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.3 xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.4
--- xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.3 Thu May 30 23:09:16 2013
+++ xsrc/external/mit/libX11/dist/man/XCreateGC.man Sun Jul 19 08:13:11 2015
@@ -247,173 +247,127 @@ The
.ZN XGCValues
structure contains:
.LP
-.LP
/\* GC attribute value mask bits */
.TS
lw(.5i) lw(2.5i) lw(.75i).
-T{
-\#define
-T} T{
+\#define T{
.ZN GCFunction
T} T{
(1L0)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCPlaneMask
T} T{
(1L1)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCForeground
T} T{
(1L2)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCBackground
T} T{
(1L3)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCLineWidth
T} T{
(1L4)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCLineStyle
T} T{
(1L5)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCCapStyle
T} T{
(1L6)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCJoinStyle
T} T{
(1L7)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCFillStyle
T} T{
(1L8)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCFillRule
T} T{
(1L9)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCTile
T} T{
(1L10)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCStipple
T} T{
(1L11)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCTileStipXOrigin
T} T{
(1L12)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCTileStipYOrigin
T} T{
(1L13)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCFont
T} T{
(1L14)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCSubwindowMode
T} T{
(1L15)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCGraphicsExposures
T} T{
(1L16)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCClipXOrigin
T} T{
(1L17)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCClipYOrigin
T} T{
(1L18)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCClipMask
T} T{
(1L19)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCDashOffset
T} T{
(1L20)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCDashList
T} T{
(1L21)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCArcMode
T} T{
(1L22)
T}
.TE
.IN XGCValues @DEF@
+.LP
.Ds 0
/\* Values */
Index: xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
diff -u xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.6 xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.7
--- xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.6 Sun Mar 16 22:48:34 2014
+++ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Sun Jul 19 08:13:11 2015
@@ -753,7 +753,7 @@ mbstowcs_org(
CodeSet codeset = NULL;
-const char *inbufptr = *from;
+const char *inbufptr;
wchar_t *outbufptr = (wchar_t *) *to;
int from_size = *from_left;
@@ -764,6 +764,8 @@ mbstowcs_org(
return( 0 );
}
+inbufptr = *from;
+
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -1223,8 +1225,7 @@ stdc_wcstocts(
goto ret;
ret:
-if (buf)
- Xfree(buf);
+Xfree(buf);
return
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 08:13:11 UTC 2015 Modified Files: xsrc/external/mit/libX11/dist/man: XCreateGC.man xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre xsrc/external/mit/libX11/dist/src: Font.c FontNames.c GetFPath.c ListExt.c ModMap.c XlibInt.c xsrc/external/mit/libX11/dist/src/xkb: XKBMAlloc.c Removed Files: xsrc/external/mit/libX11/dist/modules/lc/xlocale: Makefile.am Makefile.in lcEuc.c lcJis.c lcSjis.c Log Message: merge libX11 1.6.3. this properly fixes src/xkb/XKBMAlloc.c rev 1.2 as well (this probably should be looked at for pull up as patch.) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/man/XCreateGC.man cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c cvs rdiff -u -r1.1.1.4 -r0 \ xsrc/external/mit/libX11/dist/modules/lc/xlocale/Makefile.am \ xsrc/external/mit/libX11/dist/modules/lc/xlocale/lcEuc.c \ xsrc/external/mit/libX11/dist/modules/lc/xlocale/lcSjis.c cvs rdiff -u -r1.1.1.12 -r0 \ xsrc/external/mit/libX11/dist/modules/lc/xlocale/Makefile.in cvs rdiff -u -r1.1.1.6 -r0 \ xsrc/external/mit/libX11/dist/modules/lc/xlocale/lcJis.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/Font.c \ xsrc/external/mit/libX11/dist/src/FontNames.c \ xsrc/external/mit/libX11/dist/src/GetFPath.c \ xsrc/external/mit/libX11/dist/src/ListExt.c cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/ModMap.c cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/src/XlibInt.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: christos Date: Mon Aug 25 11:48:49 UTC 2014 Modified Files: xsrc/external/mit/libX11/dist/src: XlibInt.c Log Message: don't return after exit. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/XlibInt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/src/XlibInt.c diff -u xsrc/external/mit/libX11/dist/src/XlibInt.c:1.6 xsrc/external/mit/libX11/dist/src/XlibInt.c:1.7 --- xsrc/external/mit/libX11/dist/src/XlibInt.c:1.6 Sun Mar 16 18:48:34 2014 +++ xsrc/external/mit/libX11/dist/src/XlibInt.c Mon Aug 25 07:48:49 2014 @@ -1499,7 +1499,9 @@ _XIOError ( else _XDefaultIOError(dpy); exit (1); +#ifndef __NetBSD__ return 0; +#endif }
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: christos Date: Mon Aug 25 11:48:49 UTC 2014 Modified Files: xsrc/external/mit/libX11/dist/src: XlibInt.c Log Message: don't return after exit. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/XlibInt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src/xkb
Module Name:xsrc
Committed By: joerg
Date: Sun Jul 13 16:37:45 UTC 2014
Modified Files:
xsrc/external/mit/libX11/dist/src/xkb: XKBMAlloc.c
Log Message:
Fix compare to actually do the right thing.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c
diff -u xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.1.1.6 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2
--- xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.1.1.6 Sun Mar 16 22:43:47 2014
+++ xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c Sun Jul 13 16:37:45 2014
@@ -302,7 +302,7 @@ XkbAddKeyType(XkbDescPtr xkb,
}
}
}
-if ((!map) || (!map-types) || (!map-num_types XkbNumRequiredTypes)) {
+if ((!map) || (!map-types) || !(map-num_types XkbNumRequiredTypes)) {
tmp = XkbNumRequiredTypes + 1;
if (XkbAllocClientMap(xkb, XkbKeyTypesMask, tmp) != Success)
return NULL;
CVS commit: xsrc/external/mit/libX11/dist/src/xkb
Module Name:xsrc Committed By: joerg Date: Sun Jul 13 16:37:45 UTC 2014 Modified Files: xsrc/external/mit/libX11/dist/src/xkb: XKBMAlloc.c Log Message: Fix compare to actually do the right thing. To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.2 \ xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8
Module Name:xsrc Committed By: wiz Date: Wed Apr 30 12:35:55 UTC 2014 Modified Files: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre Log Message: Bugfix from upstream: commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Author: James Cloos cl...@jhcloos.com Date: Tue Sep 17 12:50:42 2013 -0400 nls/en_US.UTF-8/Compose.pre: Fix typo. Fix typo added in 215ce6a67863, s/actute/acute/. Fixes bug #69476. Reported by Jean Krohn. Signed-off-by: James Cloos cl...@jhcloos.com To generate a diff of this commit: cvs rdiff -u -r1.1.1.9 -r1.2 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.1.1.9 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.2 --- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.1.1.9 Sun Mar 16 22:43:46 2014 +++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Wed Apr 30 12:35:55 2014 @@ -743,7 +743,7 @@ XCOMM Part 3 Multi_key i quotedbl : ï idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS Multi_key diaeresis i : ï idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS Multi_key i diaeresis : ï idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS -dead_actute j : j́# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 +dead_acute j : j́# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 Multi_key apostrophe j : j́# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 Multi_key j apostrophe : j́# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 Multi_key acute j : j́# LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
CVS commit: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8
Module Name:xsrc Committed By: wiz Date: Wed Apr 30 12:35:55 UTC 2014 Modified Files: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre Log Message: Bugfix from upstream: commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Author: James Cloos cl...@jhcloos.com Date: Tue Sep 17 12:50:42 2013 -0400 nls/en_US.UTF-8/Compose.pre: Fix typo. Fix typo added in 215ce6a67863, s/actute/acute/. Fixes bug #69476. Reported by Jean Krohn. Signed-off-by: James Cloos cl...@jhcloos.com To generate a diff of this commit: cvs rdiff -u -r1.1.1.9 -r1.2 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: wiz Date: Sun Mar 30 16:39:42 UTC 2014 Modified Files: xsrc/external/mit/libX11/dist/src: ModMap.c Log Message: Add cast to fix -Wpointer-sign warning with clang. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/ModMap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/src/ModMap.c diff -u xsrc/external/mit/libX11/dist/src/ModMap.c:1.3 xsrc/external/mit/libX11/dist/src/ModMap.c:1.4 --- xsrc/external/mit/libX11/dist/src/ModMap.c:1.3 Sun Mar 16 22:48:34 2014 +++ xsrc/external/mit/libX11/dist/src/ModMap.c Sun Mar 30 16:39:42 2014 @@ -83,7 +83,7 @@ XSetModifierMapping( req-length += mapSize 2; req-numKeyPerModifier = modifier_map-max_keypermod; -Data(dpy, modifier_map-modifiermap, mapSize); +Data(dpy, (char *)modifier_map-modifiermap, mapSize); (void) _XReply(dpy, (xReply *) rep, (SIZEOF(xSetModifierMappingReply) - SIZEOF(xReply)) 2, xTrue);
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: wiz Date: Sun Mar 30 16:39:42 UTC 2014 Modified Files: xsrc/external/mit/libX11/dist/src: ModMap.c Log Message: Add cast to fix -Wpointer-sign warning with clang. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/ModMap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 16 22:48:35 UTC 2014
Modified Files:
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c GetFPath.c
ListExt.c ModMap.c XlibInt.c
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Removed Files:
xsrc/external/mit/libX11/dist/src: udcInf.c
Log Message:
merge libX11 1.6.2.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/Font.c \
xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/GetFPath.c \
xsrc/external/mit/libX11/dist/src/ListExt.c \
xsrc/external/mit/libX11/dist/src/ModMap.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/XlibInt.c
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libX11/dist/src/udcInf.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
diff -u xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.5 xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.6
--- xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.5 Thu May 30 23:09:16 2013
+++ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Sun Mar 16 22:48:34 2014
@@ -342,7 +342,7 @@ byteM_parse_codeset(
continue;
for (j = 0; j codeset-length; j++) {
- ch = *((unsigned char *)(inbufptr + j));
+ ch = *((const unsigned char *)(inbufptr + j));
byteM_rec = byteM[j];
byteinfo = byteM_rec.byteinfo;
@@ -764,11 +764,6 @@ mbstowcs_org(
return( 0 );
}
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -923,11 +918,6 @@ wcstombs_org(
int defstr_len = strlen(default_string);
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
wc = *inbufptr++;
@@ -1084,11 +1074,6 @@ wcstocts(
int from_size = *from_left;
char *ext_seg_len = NULL;
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
wc = *inbufptr++;
@@ -1239,7 +1224,7 @@ stdc_wcstocts(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -1278,11 +1263,6 @@ ctstowcs(
return( 0 );
}
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -1564,7 +1544,7 @@ stdc_ctstowcs(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -1600,7 +1580,7 @@ stdc_cstowcs(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -1636,7 +1616,7 @@ mbstocts(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -1674,11 +1654,6 @@ mbstostr(
return( 0 );
}
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -1966,12 +1941,6 @@ wcstostr(
const char *default_string = XLC_PUBLIC(lcd, default_string);
int defstr_len = strlen(default_string);
-
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
wc = *inbufptr++;
@@ -2094,7 +2063,7 @@ stdc_wcstostr(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -2126,11 +2095,6 @@ wctocs(
char *outbufptr = *to;
int from_size = *from_left;
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
if (*from_left *to_left) {
wc = *inbufptr++;
@@ -2374,7 +2338,7 @@ ctstombs(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -2410,7 +2374,7 @@ cstombs(
ret:
if (buf)
- Xfree((char *)buf);
+ Xfree(buf);
return (unconv_num1 + unconv_num2);
}
@@ -2441,11 +2405,6 @@ strtombs(
char *outbufptr = *to;
int from_size = *from_left;
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -2553,11 +2512,6 @@ strtowcs(
wchar_t *outbufptr = (wchar_t *)*to;
int from_size = *from_left;
-#ifdef notdef
-if (*from_left *to_left)
-*from_left = *to_left;
-#endif
-
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -2629,7 +2583,7 @@
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 16 22:48:35 UTC 2014 Modified Files: xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c xsrc/external/mit/libX11/dist/src: Font.c FontNames.c GetFPath.c ListExt.c ModMap.c XlibInt.c xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c Removed Files: xsrc/external/mit/libX11/dist/src: udcInf.c Log Message: merge libX11 1.6.2. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/Font.c \ xsrc/external/mit/libX11/dist/src/FontNames.c \ xsrc/external/mit/libX11/dist/src/GetFPath.c \ xsrc/external/mit/libX11/dist/src/ListExt.c \ xsrc/external/mit/libX11/dist/src/ModMap.c cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/XlibInt.c cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libX11/dist/src/udcInf.c cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc
Committed By: wiz
Date: Tue Jun 25 16:15:16 UTC 2013
Modified Files:
xsrc/external/mit/libX11/dist/src: Font.c
Log Message:
Fix out-of-range comparison.
clang complained:
warning: comparison of constant 768614336404564650 with expression
of type 'CARD32' (aka 'unsigned int') is always true
[-Wtautological-constant-out-of-range-compare]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/libX11/dist/src/Font.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/src/Font.c
diff -u xsrc/external/mit/libX11/dist/src/Font.c:1.1.1.6 xsrc/external/mit/libX11/dist/src/Font.c:1.2
--- xsrc/external/mit/libX11/dist/src/Font.c:1.1.1.6 Thu May 30 23:04:40 2013
+++ xsrc/external/mit/libX11/dist/src/Font.c Tue Jun 25 16:15:16 2013
@@ -588,7 +588,7 @@ _XF86BigfontQueryFont (
if (!(extcodes-serverCapabilities CAP_VerifiedLocal)) {
struct shmid_ds buf;
if (!(shmctl(reply.shmid, IPC_STAT, buf) = 0
- reply.nCharInfos (LONG_MAX / sizeof(XCharStruct))
+ reply.nCharInfos (INT_MAX / sizeof(XCharStruct))
buf.shm_segsz = reply.shmsegoffset + reply.nCharInfos * sizeof(XCharStruct) + sizeof(CARD32)
*(CARD32 *)(addr + reply.shmsegoffset + reply.nCharInfos * sizeof(XCharStruct)) == extcodes-serverSignature)) {
shmdt(addr);
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc
Committed By: wiz
Date: Tue Jun 25 20:34:20 UTC 2013
Modified Files:
xsrc/external/mit/libX11/dist/src: FontNames.c GetFPath.c ListExt.c
ModMap.c
Log Message:
Decrease comparison range to avoid tautologies.
(int32 is always smaller than int64_max, even if the latter is shifted 2 bits)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/ModMap.c
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/libX11/dist/src/GetFPath.c \
xsrc/external/mit/libX11/dist/src/ListExt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/src/FontNames.c
diff -u xsrc/external/mit/libX11/dist/src/FontNames.c:1.1.1.5 xsrc/external/mit/libX11/dist/src/FontNames.c:1.2
--- xsrc/external/mit/libX11/dist/src/FontNames.c:1.1.1.5 Thu May 30 23:04:40 2013
+++ xsrc/external/mit/libX11/dist/src/FontNames.c Tue Jun 25 20:34:20 2013
@@ -66,7 +66,7 @@ int *actualCount) /* RETURN */
if (rep.nFonts) {
flist = Xmalloc (rep.nFonts * sizeof(char *));
- if (rep.length (LONG_MAX 2)) {
+ if (rep.length (INT_MAX 2)) {
rlen = rep.length 2;
ch = Xmalloc(rlen + 1);
/* +1 to leave room for last null-terminator */
Index: xsrc/external/mit/libX11/dist/src/ModMap.c
diff -u xsrc/external/mit/libX11/dist/src/ModMap.c:1.1.1.5 xsrc/external/mit/libX11/dist/src/ModMap.c:1.2
--- xsrc/external/mit/libX11/dist/src/ModMap.c:1.1.1.5 Thu May 30 23:04:40 2013
+++ xsrc/external/mit/libX11/dist/src/ModMap.c Tue Jun 25 20:34:20 2013
@@ -42,7 +42,7 @@ XGetModifierMapping(register Display *dp
GetEmptyReq(GetModifierMapping, req);
(void) _XReply (dpy, (xReply *)rep, 0, xFalse);
-if (rep.length (LONG_MAX 2)) {
+if (rep.length (INT_MAX 2)) {
nbytes = (unsigned long)rep.length 2;
res = Xmalloc(sizeof (XModifierKeymap));
if (res)
Index: xsrc/external/mit/libX11/dist/src/GetFPath.c
diff -u xsrc/external/mit/libX11/dist/src/GetFPath.c:1.1.1.4 xsrc/external/mit/libX11/dist/src/GetFPath.c:1.2
--- xsrc/external/mit/libX11/dist/src/GetFPath.c:1.1.1.4 Thu May 30 23:04:40 2013
+++ xsrc/external/mit/libX11/dist/src/GetFPath.c Tue Jun 25 20:34:20 2013
@@ -50,7 +50,7 @@ char **XGetFontPath(
if (rep.nPaths) {
flist = Xmalloc(rep.nPaths * sizeof (char *));
- if (rep.length (LONG_MAX 2)) {
+ if (rep.length (INT_MAX 2)) {
nbytes = (unsigned long) rep.length 2;
ch = Xmalloc (nbytes + 1);
/* +1 to leave room for last null-terminator */
Index: xsrc/external/mit/libX11/dist/src/ListExt.c
diff -u xsrc/external/mit/libX11/dist/src/ListExt.c:1.1.1.4 xsrc/external/mit/libX11/dist/src/ListExt.c:1.2
--- xsrc/external/mit/libX11/dist/src/ListExt.c:1.1.1.4 Thu May 30 23:04:40 2013
+++ xsrc/external/mit/libX11/dist/src/ListExt.c Tue Jun 25 20:34:20 2013
@@ -55,7 +55,7 @@ char **XListExtensions(
if (rep.nExtensions) {
list = Xmalloc (rep.nExtensions * sizeof (char *));
- if (rep.length (LONG_MAX 2)) {
+ if (rep.length (INT_MAX 2)) {
rlen = rep.length 2;
ch = Xmalloc (rlen + 1);
/* +1 to leave room for last null-terminator */
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: wiz Date: Tue Jun 25 16:15:16 UTC 2013 Modified Files: xsrc/external/mit/libX11/dist/src: Font.c Log Message: Fix out-of-range comparison. clang complained: warning: comparison of constant 768614336404564650 with expression of type 'CARD32' (aka 'unsigned int') is always true [-Wtautological-constant-out-of-range-compare] To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/libX11/dist/src/Font.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: wiz Date: Tue Jun 25 20:34:20 UTC 2013 Modified Files: xsrc/external/mit/libX11/dist/src: FontNames.c GetFPath.c ListExt.c ModMap.c Log Message: Decrease comparison range to avoid tautologies. (int32 is always smaller than int64_max, even if the latter is shifted 2 bits) To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/FontNames.c \ xsrc/external/mit/libX11/dist/src/ModMap.c cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/libX11/dist/src/GetFPath.c \ xsrc/external/mit/libX11/dist/src/ListExt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Thu May 30 23:09:16 UTC 2013
Modified Files:
xsrc/external/mit/libX11/dist/man: XCreateGC.man
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/src: XlibInt.c
xsrc/external/mit/libX11/dist/src/xcms: cmsTrig.c
Removed Files:
xsrc/external/mit/libX11/dist/nls: compose-chart.pl xmlrules.in
xsrc/external/mit/libX11/dist/nls/ja.S90: Compose.pre XI18N_OBJS
XLC_LOCALE.pre
xsrc/external/mit/libX11/dist/nls/ja.U90: Compose.pre XI18N_OBJS
XLC_LOCALE.pre
Log Message:
merge libX11 1.5.99.902.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/man/XCreateGC.man
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libX11/dist/nls/compose-chart.pl
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/nls/xmlrules.in
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libX11/dist/nls/ja.S90/Compose.pre \
xsrc/external/mit/libX11/dist/nls/ja.S90/XI18N_OBJS
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libX11/dist/nls/ja.S90/XLC_LOCALE.pre
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libX11/dist/nls/ja.U90/Compose.pre \
xsrc/external/mit/libX11/dist/nls/ja.U90/XI18N_OBJS
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libX11/dist/nls/ja.U90/XLC_LOCALE.pre
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/XlibInt.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/man/XCreateGC.man
diff -u xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.2 xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.3
--- xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.2 Wed Jun 2 20:38:54 2010
+++ xsrc/external/mit/libX11/dist/man/XCreateGC.man Thu May 30 23:09:16 2013
@@ -50,7 +50,7 @@
.de Ds
.nf
.\\$1D \\$2 \\$1
-.ft 1
+.ft CW
.\.ps \\n(PS
.\.if \\n(VS=40 .vs \\n(VSu
.\.if \\n(VS=39 .vs \\n(VSp
@@ -64,43 +64,8 @@
.sp \\n(DDu
.fi
..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
.de IN \ send an index entry to the stderr
..
-.de C{
-.KS
-.nf
-.D
-.\
-.\ choose appropriate monospace font
-.\ the imagen conditional, 480,
-.\ may be changed to L if LB is too
-.\ heavy for your eyes...
-.\
-.ie \\*(.T480 .ft L
-.el .ie \\*(.T300 .ft L
-.el .ie \\*(.T202 .ft PO
-.el .ie \\*(.Taps .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
.de Pn
.ie t \\$1\fB\^\\$2\^\fR\\$3
.el \\$1\fI\^\\$2\^\fP\\$3
@@ -113,32 +78,6 @@
.ie t \fB\\$1\fR\\$2
.el \fI\\$1\fP\\$2
..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-. \ Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
.ny0
'\ t
.TH XCreateGC __libmansuffix__ __xorgversion__ XLIB FUNCTIONS
@@ -476,34 +415,32 @@ T}
.TE
.IN XGCValues @DEF@
.Ds 0
-.TA .5i 3i
-.ta .5i 3i
/\* Values */
typedef struct {
- int function; /\* logical operation */
- unsigned long plane_mask; /\* plane mask */
- unsigned long foreground; /\* foreground pixel */
- unsigned long background; /\* background pixel */
- int line_width; /\* line width (in pixels) */
- int line_style; /\* LineSolid, LineOnOffDash, LineDoubleDash */
- int cap_style; /\* CapNotLast, CapButt, CapRound, CapProjecting */
- int join_style; /\* JoinMiter, JoinRound, JoinBevel */
- int fill_style; /\* FillSolid, FillTiled, FillStippled FillOpaqueStippled*/
- int fill_rule; /\* EvenOddRule, WindingRule */
- int arc_mode; /\* ArcChord, ArcPieSlice */
- Pixmap tile; /\* tile pixmap for tiling operations */
- Pixmap stipple; /\* stipple 1 plane pixmap for stippling */
- int ts_x_origin; /\* offset for tile or stipple operations */
- int ts_y_origin;
- Font font; /\* default text font for text operations */
- int subwindow_mode; /\* ClipByChildren, IncludeInferiors */
- Bool graphics_exposures; /\* boolean, should exposures be generated */
- int clip_x_origin; /\* origin for clipping */
- int clip_y_origin;
- Pixmap clip_mask; /\* bitmap clipping; other calls for rects */
- int dash_offset; /\* patterned/dashed line information */
- char dashes;
+int function; /\* logical operation */
+unsigned long plane_mask; /\* plane mask */
+unsigned long foreground; /\* foreground pixel */
+unsigned long background; /\* background pixel */
+int line_width; /\* line width (in pixels) */
+int line_style; /\* LineSolid, LineOnOffDash, LineDoubleDash */
+int cap_style; /\*
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Thu May 30 23:09:16 UTC 2013 Modified Files: xsrc/external/mit/libX11/dist/man: XCreateGC.man xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c xsrc/external/mit/libX11/dist/src: XlibInt.c xsrc/external/mit/libX11/dist/src/xcms: cmsTrig.c Removed Files: xsrc/external/mit/libX11/dist/nls: compose-chart.pl xmlrules.in xsrc/external/mit/libX11/dist/nls/ja.S90: Compose.pre XI18N_OBJS XLC_LOCALE.pre xsrc/external/mit/libX11/dist/nls/ja.U90: Compose.pre XI18N_OBJS XLC_LOCALE.pre Log Message: merge libX11 1.5.99.902. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/man/XCreateGC.man cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libX11/dist/nls/compose-chart.pl cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/nls/xmlrules.in cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libX11/dist/nls/ja.S90/Compose.pre \ xsrc/external/mit/libX11/dist/nls/ja.S90/XI18N_OBJS cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/libX11/dist/nls/ja.S90/XLC_LOCALE.pre cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libX11/dist/nls/ja.U90/Compose.pre \ xsrc/external/mit/libX11/dist/nls/ja.U90/XI18N_OBJS cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/libX11/dist/nls/ja.U90/XLC_LOCALE.pre cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/XlibInt.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/nls
Module Name:xsrc Committed By: wiz Date: Sun May 13 12:10:48 UTC 2012 Modified Files: xsrc/external/mit/libX11/dist/nls/C: XI18N_OBJS xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: XI18N_OBJS xsrc/external/mit/libX11/dist/nls/iso8859-1: XI18N_OBJS Log Message: Let libX11 load and make available the newer (X11R6) callback-based API for XIM (expected by emacs). Patch from Ian D. Leroux idler...@fastmail.fm on pkgsrc-users following a hint by Nhat Minh Lê nhat.minh...@gmail.com. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/libX11/dist/nls/C/XI18N_OBJS cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/libX11/dist/nls/iso8859-1/XI18N_OBJS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/nls/C/XI18N_OBJS diff -u xsrc/external/mit/libX11/dist/nls/C/XI18N_OBJS:1.1.1.1 xsrc/external/mit/libX11/dist/nls/C/XI18N_OBJS:1.2 --- xsrc/external/mit/libX11/dist/nls/C/XI18N_OBJS:1.1.1.1 Wed Jul 30 02:43:00 2008 +++ xsrc/external/mit/libX11/dist/nls/C/XI18N_OBJS Sun May 13 12:10:48 2012 @@ -3,6 +3,6 @@ # XI18N objects table for euro locales # XLC common/xlibi18n _XlcGenericLoader # XLC_open -XIM common/ximcp _XimOpenIM # XIM_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister XOM common/xomGeneric _XomGenericOpenOM # XOM_open Index: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS:1.2 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS:1.3 --- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS:1.2 Thu Aug 27 04:42:36 2009 +++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS Sun May 13 12:10:48 2012 @@ -4,4 +4,4 @@ # XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open XOM common/xomGeneric _XomGenericOpenOM # XOM_open -XIM common/ximcp _XimOpenIM # XIM_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister Index: xsrc/external/mit/libX11/dist/nls/iso8859-1/XI18N_OBJS diff -u xsrc/external/mit/libX11/dist/nls/iso8859-1/XI18N_OBJS:1.1.1.1 xsrc/external/mit/libX11/dist/nls/iso8859-1/XI18N_OBJS:1.2 --- xsrc/external/mit/libX11/dist/nls/iso8859-1/XI18N_OBJS:1.1.1.1 Wed Jul 30 02:43:04 2008 +++ xsrc/external/mit/libX11/dist/nls/iso8859-1/XI18N_OBJS Sun May 13 12:10:48 2012 @@ -3,6 +3,6 @@ # XI18N objects table for euro locales # XLC common/xlibi18n _XlcGenericLoader # XLC_open -XIM common/ximcp _XimOpenIM # XIM_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister XOM common/xomGeneric _XomGenericOpenOM # XOM_open
CVS commit: xsrc/external/mit/libX11/dist/nls
Module Name:xsrc Committed By: wiz Date: Sun May 13 12:10:48 UTC 2012 Modified Files: xsrc/external/mit/libX11/dist/nls/C: XI18N_OBJS xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: XI18N_OBJS xsrc/external/mit/libX11/dist/nls/iso8859-1: XI18N_OBJS Log Message: Let libX11 load and make available the newer (X11R6) callback-based API for XIM (expected by emacs). Patch from Ian D. Leroux idler...@fastmail.fm on pkgsrc-users following a hint by Nhat Minh Lê nhat.minh...@gmail.com. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/libX11/dist/nls/C/XI18N_OBJS cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/libX11/dist/nls/iso8859-1/XI18N_OBJS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Wed Aug 3 03:06:00 UTC 2011
Modified Files:
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Removed Files:
xsrc/external/mit/libX11/dist/man: XFreeModifierMap.man
xsrc/external/mit/libX11/dist/specs: xmlrules.in
Log Message:
merge libX11 1.4.4
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libX11/dist/man/XFreeModifierMap.man
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/specs/xmlrules.in
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
diff -u xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.3 xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.4
--- xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.3 Sat Jul 23 11:11:58 2011
+++ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Wed Aug 3 03:06:00 2011
@@ -2680,10 +2680,9 @@
*conv-methods = *methods;
conv-methods-reset = init_state;
-conv-state = (XPointer) Xmalloc(sizeof(StateRec));
+conv-state = Xcalloc(1, sizeof(StateRec));
if (conv-state == NULL)
goto err;
-bzero((char *) conv-state, sizeof(StateRec));
state = (State) conv-state;
state-lcd = lcd;
Index: xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
diff -u xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.5 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.6
--- xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.5 Wed Feb 23 08:04:05 2011
+++ xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c Wed Aug 3 03:06:00 2011
@@ -86,16 +86,6 @@
#include XlcPublic.h
#include XlcPubI.h
-#if !defined(__NetBSD__) defined(_LP64) defined(__sparcv9)
-# define _MACH64_NAME sparcv9
-#else
-# undef _MACH64_NAME
-#endif /* defined(_LP64) defined(__sparcv9) */
-
-#ifdef _MACH64_NAME
-# define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
-#endif
-
#define XI18N_DLREL 2
#define iscomment(ch) ((ch) == '\0' || (ch) == '#')
@@ -269,35 +259,6 @@
if (strstr (dl_name, ../))
return NULL;
-#if defined (_LP64) defined (_MACH64_NAME)
-len = (lc_dir ? strlen(lc_dir) : 0 ) +
- (dl_name ? strlen(dl_name) : 0) + _MACH64_NAME_LEN + 10;
-path = Xmalloc(len + 1);
-
-if (strchr(dl_name, '/') != NULL) {
- char *tmp = strdup(dl_name);
- char *dl_dir, *dl_file;
- char *slash_p;
- slash_p = strchr(tmp, '/');
- *slash_p = '\0';
- dl_dir = tmp;
- dl_file = ++slash_p;
-
- slash_p = strrchr(lc_dir, '/');
- *slash_p = '\0';
- strcpy(path, lc_dir); strcat(path, /);
- strcat(path, dl_dir); strcat(path, /);
- strcat(path, _MACH64_NAME); strcat(path, /);
- strcat(path, dl_file); strcat(path, .so.2);
-
- *slash_p = '/';
- Xfree(tmp);
-} else {
- strcpy(path, lc_dir); strcat(path, /);
- strcat(path, _MACH64_NAME); strcat(path, /);
- strcat(path, dl_name); strcat(path, .so.2);
-}
-#else
len = (lc_dir ? strlen(lc_dir) : 0 ) +
(dl_name ? strlen(dl_name) : 0) + 10;
#if defined POSTLOCALELIBDIR
@@ -322,7 +283,6 @@
#endif
strcat(path, dl_name); strcat(path, .so.2);
}
-#endif
return path;
}
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Wed Aug 3 03:06:00 UTC 2011 Modified Files: xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c Removed Files: xsrc/external/mit/libX11/dist/man: XFreeModifierMap.man xsrc/external/mit/libX11/dist/specs: xmlrules.in Log Message: merge libX11 1.4.4 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libX11/dist/man/XFreeModifierMap.man cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/specs/xmlrules.in cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Sat Jul 23 11:11:58 UTC 2011
Modified Files:
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/src: XlibInt.c
Removed Files:
xsrc/external/mit/libX11/dist/src: XrmI.h
Log Message:
merge libX11 1.4.3.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/XlibInt.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libX11/dist/src/XrmI.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
diff -u xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.2 xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.3
--- xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.2 Sun Oct 3 22:10:48 2010
+++ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Sat Jul 23 11:11:58 2011
@@ -2670,7 +2670,7 @@
XlcConv conv;
State state;
-conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
+conv = (XlcConv) Xcalloc(1, sizeof(XlcConvRec));
if (conv == NULL)
return (XlcConv) NULL;
Index: xsrc/external/mit/libX11/dist/src/XlibInt.c
diff -u xsrc/external/mit/libX11/dist/src/XlibInt.c:1.3 xsrc/external/mit/libX11/dist/src/XlibInt.c:1.4
--- xsrc/external/mit/libX11/dist/src/XlibInt.c:1.3 Wed Feb 23 08:04:04 2011
+++ xsrc/external/mit/libX11/dist/src/XlibInt.c Sat Jul 23 11:11:58 2011
@@ -662,6 +662,7 @@
UnlockDisplay(dpy);
return 0;
}
+ info_list-watch_data = wd_array;
wd_array[dpy-watcher_count] = NULL; /* for cleanliness */
}
@@ -777,10 +778,10 @@
head = (struct stored_event**)dpy-cookiejar;
DL_FOREACH_SAFE(*head, e, tmp) {
-XFree(e-ev.data);
-XFree(e);
if (dpy-cookiejar == e)
dpy-cookiejar = NULL;
+XFree(e-ev.data);
+XFree(e);
}
}
@@ -1438,9 +1439,10 @@
ext (ext-codes.major_opcode != event-request_code);
ext = ext-next)
;
- if (ext)
- strcpy(buffer, ext-name);
- else
+ if (ext) {
+ strncpy(buffer, ext-name, BUFSIZ);
+ buffer[BUFSIZ - 1] = '\0';
+} else
buffer[0] = '\0';
}
(void) fprintf(fp, (%s)\n, buffer);
@@ -1572,7 +1574,19 @@
!(*dpy-error_vec[rep-errorCode])(dpy, event.xerror, rep))
return 0;
if (_XErrorFunction != NULL) {
- return (*_XErrorFunction)(dpy, (XErrorEvent *)event); /* upcall */
+ int rtn_val;
+#ifdef XTHREADS
+ if (dpy-lock)
+ (*dpy-lock-user_lock_display)(dpy);
+ UnlockDisplay(dpy);
+#endif
+ rtn_val = (*_XErrorFunction)(dpy, (XErrorEvent *)event); /* upcall */
+#ifdef XTHREADS
+ LockDisplay(dpy);
+ if (dpy-lock)
+ (*dpy-lock-user_unlock_display)(dpy);
+#endif
+ return rtn_val;
} else {
return _XDefaultError(dpy, (XErrorEvent *)event);
}
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Nov 28 07:34:34 UTC 2010 Added Files: xsrc/external/mit/libX11/dist/src: XKeysymDB Log Message: and as was foretold in the book of why X sucks, the phoenix has arisen! To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libX11/dist/src/XKeysymDB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/libX11/dist/src/XKeysymDB diff -u /dev/null xsrc/external/mit/libX11/dist/src/XKeysymDB:1.3 --- /dev/null Sun Nov 28 07:34:34 2010 +++ xsrc/external/mit/libX11/dist/src/XKeysymDB Sun Nov 28 07:34:33 2010 @@ -0,0 +1,380 @@ +! Copyright 1993 Massachusetts Institute of Technology +! +! Permission to use, copy, modify, distribute, and sell this software and +! its documentation for any purpose is hereby granted without fee, provided +! that the above copyright notice appear in all copies and that both that +! copyright notice and this permission notice appear in supporting +! documentation, and that the name of M.I.T. not be used in advertising or +! publicity pertaining to distribution of the software without specific, +! written prior permission. M.I.T. makes no representations about the +! suitability of this software for any purpose. It is provided as is +! without express or implied warranty. +! + +hpmute_acute :10A8 +hpmute_grave :10A9 +hpmute_asciicircum :10AA +hpmute_diaeresis :10AB +hpmute_asciitilde :10AC +hplira :10AF +hpguilder :10BE +hpYdiaeresis :10EE +hpIO :10EE +hplongminus :10F6 +hpblock :10FC +apLineDel :1000FF00 +apCharDel :1000FF01 +apCopy :1000FF02 +apCut :1000FF03 +apPaste :1000FF04 +apMove :1000FF05 +apGrow :1000FF06 +apCmd :1000FF07 +apShell :1000FF08 +apLeftBar :1000FF09 +apRightBar :1000FF0A +apLeftBox :1000FF0B +apRightBox :1000FF0C +apUpBox :1000FF0D +apDownBox :1000FF0E +apPop :1000FF0F +apRead :1000FF10 +apEdit :1000FF11 +apSave :1000FF12 +apExit :1000FF13 +apRepeat :1000FF14 +hpModelock1 :1000FF48 +hpModelock2 :1000FF49 +hpReset :1000FF6C +hpSystem :1000FF6D +hpUser :1000FF6E +hpClearLine :1000FF6F +hpInsertLine :1000FF70 +hpDeleteLine :1000FF71 +hpInsertChar :1000FF72 +hpDeleteChar :1000FF73 +hpBackTab :1000FF74 +hpKP_BackTab :1000FF75 +apKP_parenleft :1000FFA8 +apKP_parenright :1000FFA9 + +I2ND_FUNC_L :10004001 +I2ND_FUNC_R :10004002 +IREMOVE :10004003 +IREPEAT :10004004 +IA1 :10004101 +IA2 :10004102 +IA3 :10004103 +IA4 :10004104 +IA5 :10004105 +IA6 :10004106 +IA7 :10004107 +IA8 :10004108 +IA9 :10004109 +IA10 :1000410A +IA11 :1000410B +IA12 :1000410C +IA13 :1000410D +IA14 :1000410E +IA15 :1000410F +IB1 :10004201 +IB2 :10004202 +IB3 :10004203 +IB4 :10004204 +IB5 :10004205 +IB6 :10004206 +IB7 :10004207 +IB8 :10004208 +IB9 :10004209 +IB10 :1000420A +IB11 :1000420B +IB12 :1000420C +IB13 :1000420D +IB14 :1000420E +IB15 :1000420F +IB16 :10004210 + +DRemove :1000FF00 +Dring_accent :1000FEB0 +Dcircumflex_accent :1000FE5E +Dcedilla_accent :1000FE2C +Dacute_accent :1000FE27 +Dgrave_accent :1000FE60 +Dtilde :1000FE7E +Ddiaeresis :1000FE22 + +osfCopy :1004FF02 +osfCut :1004FF03 +osfPaste :1004FF04 +osfBackTab :1004FF07 +osfBackSpace :1004FF08 +osfClear :1004FF0B +osfEscape :1004FF1B +osfAddMode :1004FF31 +osfPrimaryPaste :1004FF32 +osfQuickPaste :1004FF33 +osfPageLeft :1004FF40 +osfPageUp :1004FF41 +osfPageDown :1004FF42 +osfPageRight :1004FF43 +osfActivate :1004FF44 +osfMenuBar :1004FF45 +osfLeft :1004FF51 +osfUp :1004FF52 +osfRight :1004FF53 +osfDown :1004FF54 +osfPrior :1004FF55 +osfNext :1004FF56 +osfEndLine :1004FF57 +osfBeginLine :1004FF58 +osfEndData :1004FF59 +osfBeginData :1004FF5A +osfPrevMenu :1004FF5B +osfNextMenu :1004FF5C +osfPrevField :1004FF5D +osfNextField :1004FF5E +osfSelect :1004FF60 +osfInsert :1004FF63 +osfUndo :1004FF65 +osfMenu :1004FF67 +osfCancel :1004FF69 +osfHelp :1004FF6A +osfSelectAll :1004FF71 +osfDeselectAll :1004FF72 +osfReselect :1004FF73 +osfExtend :1004FF74 +osfRestore :1004FF78 +osfSwitchDirection :1004FF7E +osfPriorMinor :1004FFF5 +osfNextMinor :1004FFF6 +osfRightLine :1004FFF7 +osfLeftLine :1004FFF8 +osfDelete :1004 + +SunFA_Grave :1005FF00 +SunFA_Circum :1005FF01 +SunFA_Tilde :1005FF02 +SunFA_Acute :1005FF03 +SunFA_Diaeresis :1005FF04 +SunFA_Cedilla :1005FF05 +SunF36 :1005FF10 +SunF37 :1005FF11 +SunSys_Req :1005FF60 +SunProps :1005FF70 +SunFront :1005FF71 +SunCopy :1005FF72 +SunOpen :1005FF73 +SunPaste :1005FF74 +SunCut :1005FF75 +SunPowerSwitch :1005FF76 +SunAudioLowerVolume :1005FF77 +SunAudioMute :1005FF78 +SunAudioRaiseVolume :1005FF79 +SunVideoDegauss :1005FF7A +SunVideoLowerBrightness :1005FF7B +SunVideoRaiseBrightness :1005FF7C +SunPowerSwitchShift :1005FF7D + +SunCompose :FF20 +SunPageUp :FF55
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Nov 28 07:34:34 UTC 2010 Added Files: xsrc/external/mit/libX11/dist/src: XKeysymDB Log Message: and as was foretold in the book of why X sucks, the phoenix has arisen! To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libX11/dist/src/XKeysymDB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Mon Nov 22 00:10:49 UTC 2010 Removed Files: xsrc/external/mit/libX11/dist/src: XKeysymDB Log Message: merge libX11 1.3.6 To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libX11/dist/src/XKeysymDB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: xsrc/external/mit/libX11/dist/modules/lc/gen
Module Name: xsrc Committed By: christos Date: Sun Oct 3 22:10:48 UTC 2010 Modified Files: xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c Log Message: ifdef out code that truncates the source length to the destination length if it is larger. Seems useless to do that since the code tests for both source length and destination to be non-zero. This fixes cut-n-paste problem in xterm where the paste length was limited to 1024 (BUFSIZ) in button.c thank you! this one works for me, now. i'll see about what netbsd-5 needs. .mrg.
CVS commit: xsrc/external/mit/libX11/dist/modules/lc/gen
Module Name:xsrc
Committed By: christos
Date: Sun Oct 3 22:10:48 UTC 2010
Modified Files:
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
Log Message:
ifdef out code that truncates the source length to the destination length
if it is larger. Seems useless to do that since the code tests for both
source length and destination to be non-zero. This fixes cut-n-paste problem
in xterm where the paste length was limited to 1024 (BUFSIZ) in button.c
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
diff -u xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.1.1.4 xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.2
--- xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.1.1.4 Fri May 21 21:22:19 2010
+++ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Sun Oct 3 18:10:48 2010
@@ -764,8 +764,10 @@
return( 0 );
}
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
while (*from_left *to_left) {
@@ -921,8 +923,10 @@
int defstr_len = strlen(default_string);
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
while (*from_left *to_left) {
@@ -1080,8 +1084,10 @@
int from_size = *from_left;
char *ext_seg_len = NULL;
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
while (*from_left *to_left) {
@@ -1272,8 +1278,10 @@
return( 0 );
}
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
while (*from_left *to_left) {
@@ -1666,8 +1674,10 @@
return( 0 );
}
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
while (*from_left *to_left) {
@@ -1784,8 +1794,10 @@
return( 0 );
}
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
while (*from_left *to_left) {
@@ -1960,8 +1972,10 @@
int defstr_len = strlen(default_string);
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
while (*from_left *to_left) {
@@ -2117,8 +2131,10 @@
char *outbufptr = *to;
int from_size = *from_left;
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
if (*from_left *to_left) {
@@ -2430,8 +2446,10 @@
char *outbufptr = *to;
int from_size = *from_left;
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
while (*from_left *to_left) {
@@ -2540,8 +2558,10 @@
wchar_t *outbufptr = (wchar_t *)*to;
int from_size = *from_left;
+#ifdef notdef
if (*from_left *to_left)
*from_left = *to_left;
+#endif
while (*from_left *to_left) {
CVS commit: xsrc/external/mit/libX11/dist/modules/lc/gen
Module Name:xsrc Committed By: christos Date: Sun Oct 3 22:10:48 UTC 2010 Modified Files: xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c Log Message: ifdef out code that truncates the source length to the destination length if it is larger. Seems useless to do that since the code tests for both source length and destination to be non-zero. This fixes cut-n-paste problem in xterm where the paste length was limited to 1024 (BUFSIZ) in button.c To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 16 03:11:40 UTC 2010 Removed Files: xsrc/external/mit/libX11/dist: acinclude.m4 xsrc/external/mit/libX11/dist/man/xkb: XkbGetDetectableAutorepeat.man XkbSetDetectableAutorepeat.man Log Message: merge libX11 1.3.4 To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libX11/dist/acinclude.m4 cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/libX11/dist/man/xkb/XkbGetDetectableAutorepeat.man \ xsrc/external/mit/libX11/dist/man/xkb/XkbSetDetectableAutorepeat.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Wed Jun 16 05:26:43 UTC 2010 Modified Files: xsrc/external/mit/libX11/dist/src: XlibInt.c Log Message: avoid a compile error in libX11 1.3.4. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/libX11/dist/src/XlibInt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
RE: CVS commit: xsrc/external/mit/libX11/dist/man
Module Name:xsrc Committed By: joerg Date: Wed Jun 2 20:38:54 UTC 2010 Modified Files: xsrc/external/mit/libX11/dist/man: XCreateGC.man Log Message: Avoid .TS H and .TH for now as it doesn't alter the output in this case and conflicts with the header check from mandoc. Having somewhat working HTML output is more useful. Unfortyunately this is still not quite working correctly. With this update I still get #format libX11/XCreateGC.html3 /build/netbsd-local/tools/x86_64/amd64/bin/nbmandoc -Thtml -Oman=../html%S/%N.html -Ostyle=../style.css XCreateGC.3 XCreateGC.html3.tmp mv XCreateGC.html3.tmp XCreateGC.html3 XCreateGC.3:144:2: argument count wrong, violates syntax: line arguments = 5 (have 6) *** [XCreateGC.html3] Error code 1 - | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com| | Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net | | Kernel Developer | | pgoyette at netbsd.org | -
CVS commit: xsrc/external/mit/libX11/dist/src
Module Name:xsrc Committed By: mrg Date: Sat May 22 01:24:21 UTC 2010 Modified Files: xsrc/external/mit/libX11/dist/src/xcms: cmsMath.c xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c Log Message: merge libX11 1.3.3 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/xcms/cmsMath.c cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8
Module Name:xsrc Committed By: mrg Date: Thu Aug 27 04:42:36 UTC 2009 Modified Files: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: XI18N_OBJS Log Message: fix a couple of defaults that make emacs and a few other things work. as reported on tech-x11. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS:1.1.1.1 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS:1.2 --- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS:1.1.1.1 Wed Jul 30 02:43:01 2008 +++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS Thu Aug 27 04:42:36 2009 @@ -3,6 +3,5 @@ # XI18N objects table for euro locales # XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open -XOM common/xomLTRTTB _XomGenericOpenOM # XOM_open -XIM common/xiiimp _SwitchOpenIM # XIM_open -XIM common/xiiimp _XimpLocalOpenIM # XIM_open +XOM common/xomGeneric _XomGenericOpenOM # XOM_open +XIM common/ximcp _XimOpenIM # XIM_open
