Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src updates for libX11 1.5.99.902:
details: https://anonhg.NetBSD.org/src/rev/8728bd1a1666
branches: trunk
changeset: 787040:8728bd1a1666
user: mrg <mrg%NetBSD.org@localhost>
date: Thu May 30 23:42:19 2013 +0000
description:
updates for libX11 1.5.99.902:
- remove ja.S90 and ja.U90 locales
- use -Wno-error for files that use (now deprecated) XKeycodeToKeysym()
- add -I${X11SRCDIR.X11}/src for xicmp
- add stub for _XGetRequest()
diffstat:
distrib/sets/lists/xbase/mi | 18 +++++++++---------
external/mit/xorg/bin/xmodmap/Makefile | 5 ++++-
external/mit/xorg/bin/xprop/Makefile | 4 +++-
external/mit/xorg/bin/xterm/Makefile | 4 +++-
external/mit/xorg/lib/libX11/Makefile.libx11 | 3 ++-
external/mit/xorg/lib/libX11/ximcp/Makefile | 3 ++-
external/mit/xorg/share/nls/Makefile | 6 +++---
external/mit/xorg/share/nls/ja.S90/Makefile | 5 -----
external/mit/xorg/share/nls/ja.U90/Makefile | 5 -----
external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c | 8 +++++++-
10 files changed, 33 insertions(+), 28 deletions(-)
diffs (189 lines):
diff -r 3f4dcc34d24d -r 8728bd1a1666 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Thu May 30 20:10:14 2013 +0000
+++ b/distrib/sets/lists/xbase/mi Thu May 30 23:42:19 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.114 2012/06/13 18:51:36 martin Exp $
+# $NetBSD: mi,v 1.115 2013/05/30 23:42:19 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1694,18 +1694,18 @@
./usr/X11R7/lib/X11/locale/ja.JIS/Compose -unknown- xorg
./usr/X11R7/lib/X11/locale/ja.JIS/XI18N_OBJS -unknown- xorg
./usr/X11R7/lib/X11/locale/ja.JIS/XLC_LOCALE -unknown- xorg
-./usr/X11R7/lib/X11/locale/ja.S90 base-x11-root xorg
-./usr/X11R7/lib/X11/locale/ja.S90/Compose -unknown- xorg
-./usr/X11R7/lib/X11/locale/ja.S90/XI18N_OBJS -unknown- xorg
-./usr/X11R7/lib/X11/locale/ja.S90/XLC_LOCALE -unknown- xorg
+./usr/X11R7/lib/X11/locale/ja.S90 base-x11-obsolete obsolete
+./usr/X11R7/lib/X11/locale/ja.S90/Compose -unknown- obsolete
+./usr/X11R7/lib/X11/locale/ja.S90/XI18N_OBJS -unknown- obsolete
+./usr/X11R7/lib/X11/locale/ja.S90/XLC_LOCALE -unknown- obsolete
./usr/X11R7/lib/X11/locale/ja.SJIS base-x11-root xorg
./usr/X11R7/lib/X11/locale/ja.SJIS/Compose -unknown- xorg
./usr/X11R7/lib/X11/locale/ja.SJIS/XI18N_OBJS -unknown- xorg
./usr/X11R7/lib/X11/locale/ja.SJIS/XLC_LOCALE -unknown- xorg
-./usr/X11R7/lib/X11/locale/ja.U90 base-x11-root xorg
-./usr/X11R7/lib/X11/locale/ja.U90/Compose -unknown- xorg
-./usr/X11R7/lib/X11/locale/ja.U90/XI18N_OBJS -unknown- xorg
-./usr/X11R7/lib/X11/locale/ja.U90/XLC_LOCALE -unknown- xorg
+./usr/X11R7/lib/X11/locale/ja.U90 base-x11-obsolete obsolete
+./usr/X11R7/lib/X11/locale/ja.U90/Compose -unknown- obsolete
+./usr/X11R7/lib/X11/locale/ja.U90/XI18N_OBJS -unknown- obsolete
+./usr/X11R7/lib/X11/locale/ja.U90/XLC_LOCALE -unknown- obsolete
./usr/X11R7/lib/X11/locale/ja/Compose -unknown- xorg
./usr/X11R7/lib/X11/locale/ja/XI18N_OBJS -unknown- xorg
./usr/X11R7/lib/X11/locale/ja/XLC_LOCALE -unknown- xorg
diff -r 3f4dcc34d24d -r 8728bd1a1666 external/mit/xorg/bin/xmodmap/Makefile
--- a/external/mit/xorg/bin/xmodmap/Makefile Thu May 30 20:10:14 2013 +0000
+++ b/external/mit/xorg/bin/xmodmap/Makefile Thu May 30 23:42:19 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/20 23:17:51 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $
.include <bsd.own.mk>
@@ -12,5 +12,8 @@
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+COPTS.handle.c+=-Wno-error # uses XKeycodeToKeysym
+COPTS.exec.c+= -Wno-error # uses XKeycodeToKeysym
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
diff -r 3f4dcc34d24d -r 8728bd1a1666 external/mit/xorg/bin/xprop/Makefile
--- a/external/mit/xorg/bin/xprop/Makefile Thu May 30 20:10:14 2013 +0000
+++ b/external/mit/xorg/bin/xprop/Makefile Thu May 30 23:42:19 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/23 06:06:40 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/30 23:42:19 mrg Exp $
.include <bsd.own.mk>
@@ -13,5 +13,7 @@
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+COPTS.xprop.c+= -Wno-error # uses XKeycodeToKeysym
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
diff -r 3f4dcc34d24d -r 8728bd1a1666 external/mit/xorg/bin/xterm/Makefile
--- a/external/mit/xorg/bin/xterm/Makefile Thu May 30 20:10:14 2013 +0000
+++ b/external/mit/xorg/bin/xterm/Makefile Thu May 30 23:42:19 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/03/22 23:46:26 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2013/05/30 23:42:19 mrg Exp $
.include <bsd.own.mk>
@@ -36,6 +36,8 @@
.PATH: ${X11SRCDIR.${PROG}}
+COPTS.input.c+= -Wno-error # uses XKeycodeToKeysym
+
.include "Makefile.inc"
.include <bsd.x11.mk>
diff -r 3f4dcc34d24d -r 8728bd1a1666 external/mit/xorg/lib/libX11/Makefile.libx11
--- a/external/mit/xorg/lib/libX11/Makefile.libx11 Thu May 30 20:10:14 2013 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.libx11 Thu May 30 23:42:19 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.9 2012/04/04 10:59:45 joerg Exp $
+# $NetBSD: Makefile.libx11,v 1.10 2013/05/30 23:42:19 mrg Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -461,6 +461,7 @@
COPTS.Font.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h
+COPTS.XKBBind.c+= -Wno-error # uses XKeycodeToKeysym
CWARNFLAGS.clang+= -Wno-string-plus-int
diff -r 3f4dcc34d24d -r 8728bd1a1666 external/mit/xorg/lib/libX11/ximcp/Makefile
--- a/external/mit/xorg/lib/libX11/ximcp/Makefile Thu May 30 20:10:14 2013 +0000
+++ b/external/mit/xorg/lib/libX11/ximcp/Makefile Thu May 30 23:42:19 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= 2 # XXX
@@ -10,6 +10,7 @@
LIB= ximcp
LIBDIR= ${X11LIBDIR}/locale/lib/common
SRCS= ${SRCS.ximcp}
+CFLAGS+=-I${X11SRCDIR.X11}/src
CWARNFLAGS.clang+= -Wno-unused
diff -r 3f4dcc34d24d -r 8728bd1a1666 external/mit/xorg/share/nls/Makefile
--- a/external/mit/xorg/share/nls/Makefile Thu May 30 20:10:14 2013 +0000
+++ b/external/mit/xorg/share/nls/Makefile Thu May 30 23:42:19 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:35 apb Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
iso8859-1 iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 \
iso8859-7 iso8859-8 iso8859-9 iso8859-9e iso8859-10 iso8859-11 \
iso8859-13 iso8859-14 iso8859-15 \
- ja ja.JIS ja.S90 ja.SJIS ja.U90 ja_JP.UTF-8 \
+ ja ja.JIS ja.SJIS ja_JP.UTF-8 \
ko ko_KR.UTF-8 koi8-c koi8-r koi8-u \
microsoft-cp1251 microsoft-cp1255 microsoft-cp1256 mulelao-1 \
nokhchi-1 \
@@ -59,6 +59,6 @@
build_subdirs:
.for _dir in ${SUBDIR}
mkdir ${.CURDIR}/${_dir}
- printf '# $$NetBSD: Makefile,v 1.2 2008/10/25 22:27:35 apb Exp $$\n\nNLS_SUBDIR= ${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
+ printf '# $$NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $$\n\nNLS_SUBDIR= ${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
.endfor
diff -r 3f4dcc34d24d -r 8728bd1a1666 external/mit/xorg/share/nls/ja.S90/Makefile
--- a/external/mit/xorg/share/nls/ja.S90/Makefile Thu May 30 20:10:14 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
-
-NLS_SUBDIR= ja.S90
-
-.include "../Makefile.nls"
diff -r 3f4dcc34d24d -r 8728bd1a1666 external/mit/xorg/share/nls/ja.U90/Makefile
--- a/external/mit/xorg/share/nls/ja.U90/Makefile Thu May 30 20:10:14 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
-
-NLS_SUBDIR= ja.U90
-
-.include "../Makefile.nls"
diff -r 3f4dcc34d24d -r 8728bd1a1666 external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c
--- a/external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c Thu May 30 20:10:14 2013 +0000
+++ b/external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c Thu May 30 23:42:19 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xkbcomp-stubs.c,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $ */
+/* $NetBSD: xkbcomp-stubs.c,v 1.2 2013/05/30 23:42:20 mrg Exp $ */
/*-
* Copyright (c) 2003-2004 The NetBSD Foundation, Inc.
@@ -151,6 +151,12 @@
return 0;
}
+void *
+_XGetRequest(Display *dpy, CARD8 type, size_t len)
+{
+ return NULL;
+}
+
void (*_XCreateMutex_fn)(LockInfoPtr) = NULL;
void (**_XFreeMutex_fn_p)(LockInfoPtr) = &_XFreeMutex_fn;
Home |
Main Index |
Thread Index |
Old Index