Update to 1.1.4:

Adam Jackson (2):
      Bug #14029: Don't LockDisplay() recursively.
      libX11 1.1.4

Alan Coopersmith (6):
      X.Org Bug #4312: incorrect comment asterisk in XAnyEvent.3x man
page
      XErrorDB updates for Render 0.9 & XFixes 4.0
      Add WM_LOCALE_NAME to list of properties set in XSetWMProperties
comment
      Spell out number in XkbGetKeyVirtualModMap man page to avoid cpp
errors from #
      Add support for building lint library with --enable-lint-library
      Man page typo fixes

Anton Zinoviev (1):
      Additions to the Compose file for UTF-8

Daniel Stone (1):
      Colours: Fix --disable-xcms

Eric Anholt (2):
      Add XF86 keyboard/monitor brightness keysyms to the keysymbdb.
      Bug #2081: Note the range limitation of XSetScreenSaver arguments.

Eric S. Raymond (9):
      Bug #9516: Markup error in XAllocWMHints.3x
      Bug 9523: Markup problems in XQueryExtension.3x
      Bug #9650: Bad markup in XLoadFont.3x manual page
      Bug #9651: Bad markup in XcmsColor.3x
      Bug #9652: Bad markup in XDrawArc.3x
      Bug #9653: Bad markup in XQueryColor.3x
      Bug #9654: Bad markup in XrmGetFileDatabase.3x
      Bug #9655: Bad markup in XrmUniqueQuark.3x
      Bug #9658: Bad markup on XIfEvent.3x

Ian Romanick (1):
      Make sure nls/am_ET.UTF-8/Makefile is created by configure.

James Cloos (12):
      Fix SMP Compose targets
      Add some compose sequences
      Compose fix for Latin-1 (from Debian)
      Add additional Euro signs to compose
      Patch for Catalan locales
      Add compose file for Ethiopic to match new keyboard in
xkeyboard-config
      Fix typo
      Use the new dead_psili and dead_dasia keysyms added to
proto/x11proto 7.0.11
      Fix the <U\x+> keysyms in the en_US.UTF-8 Compose file
      Update the currency symbols block of en_US.UTF-8/Compose.pre
      Add <dead_stroke> compose sequences
      add a comment to en_US.UTF-8/Compose

Jamey Sharp (1):
      Two threads can request sequence sync and XID fetch
simultaneously.

Jeremy C. Reed (1):
      Fix a mutex reference-counting bug.

Jeremy Huddleston (3):
      Define __DARWIN__ when host_os =3D=3D darwin* as needed in SetLocale.=
c
      Use __APPLE__ instead of __DARWIN__
      Added launchd support.

Kim Woelders (1):
      Fix bs_BA entries in locale.dir.pre

Kristian H=C3=B8gsberg (1):
      Add GLX 1.4 requests and errors.

Samuel Thibault (1):
      X.Org Bug #12983: Typos in ./man/XChangeKeyboardControl.man

S=C3=B8ren Sandmann Pedersen (1):
      XIM: Fix a hand when switching input context.

Yann Droneaud (1):
      XIM: Properly initialise client event

7 files changed, 38 insertions, 55 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 9d5069ef6b3..18151402754 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2007/08/05 22:39:38 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/17 12:33:56 wiz Exp $
 #
 
-DISTNAME=		libX11-1.1.3
+DISTNAME=		libX11-1.1.4
 CATEGORIES=		x11 devel
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index 90d83e67cce..c5f415c97e5 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/07/12 15:02:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/17 12:33:56 wiz Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -831,6 +831,9 @@ share/X11/XKeysymDB
 share/X11/locale/C/Compose
 share/X11/locale/C/XI18N_OBJS
 share/X11/locale/C/XLC_LOCALE
+share/X11/locale/am_ET.UTF-8/Compose
+share/X11/locale/am_ET.UTF-8/XI18N_OBJS
+share/X11/locale/am_ET.UTF-8/XLC_LOCALE
 share/X11/locale/armscii-8/Compose
 share/X11/locale/armscii-8/XI18N_OBJS
 share/X11/locale/armscii-8/XLC_LOCALE
@@ -1058,6 +1061,7 @@ share/X11/locale/zh_TW/XLC_LOCALE
 @dirrm share/X11/locale/en_US.UTF-8
 @dirrm share/X11/locale/el_GR.UTF-8
 @dirrm share/X11/locale/armscii-8
+@dirrm share/X11/locale/am_ET.UTF-8
 @dirrm share/X11/locale/C
 @dirrm share/X11/locale
 @comment @dirrm share/X11
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index d1dff47aed4..3b441fba6ad 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.8 2008/01/14 07:12:53 tnn Exp $
+$NetBSD: distinfo,v 1.9 2008/04/17 12:33:56 wiz Exp $
 
-SHA1 (libX11-1.1.3.tar.bz2) = 235f69172b262f874d2a2d7bd17e8197aea5b767
-RMD160 (libX11-1.1.3.tar.bz2) = fcb8d5d31befa0ae227210dc7274c17b30c37fad
-Size (libX11-1.1.3.tar.bz2) = 1526958 bytes
+SHA1 (libX11-1.1.4.tar.bz2) = e91092e22c3b48371c3549afba1b6a457acb2d7e
+RMD160 (libX11-1.1.4.tar.bz2) = 42776389986e0b158f703a9b88fdf95bb5095d1f
+Size (libX11-1.1.4.tar.bz2) = 1576030 bytes
 SHA1 (patch-aa) = 7c1905781ca9467adfb45e2cad9b710533bbcd17
-SHA1 (patch-ab) = 000f81dd5d21cbabf38e91b5066e8f1ce43ff957
-SHA1 (patch-ac) = 9b3bea367661efeef337f8b9ae62d5f430a2204e
+SHA1 (patch-ac) = 83b31655e0762bc76d0b35a5b79dc4654f67c8a3
 SHA1 (patch-ad) = 58645e734f48334ce5cbf62f5870d087d95194ee
-SHA1 (patch-ae) = 124c47038ac2c12dd37f3f63606396b9ed976822
+SHA1 (patch-ae) = f9957bdb7a03c87dd24c2d4bfe4f0f46fd955fcc
 SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
-SHA1 (patch-ag) = 0d1cf4804049fd3640d627ddfbab7b717f20b445
+SHA1 (patch-ag) = 626875c0c772264ea53fbf4f6e9c2228f7628ecf
 SHA1 (patch-ah) = 3565c046484ba7b7d18cd5ddc3265870f143ffda
diff --git a/x11/libX11/patches/patch-ab b/x11/libX11/patches/patch-ab
deleted file mode 100644
index a0d6e6a4ee4..00000000000
--- a/x11/libX11/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/07/12 15:02:09 joerg Exp $
-
---- src/Xrm.c.orig	2006-09-25 12:57:47.000000000 +0200
-+++ src/Xrm.c
-@@ -808,6 +808,7 @@ void XrmCombineDatabase(
- 	    }
- 	}
- 	(from->methods->destroy)(from->mbstate);
-+	_XUnlockMutex(&from->linfo);
- 	_XFreeMutex(&from->linfo);
- 	Xfree((char *)from);
- 	_XUnlockMutex(&(*into)->linfo);
-@@ -2656,6 +2657,7 @@ void XrmDestroyDatabase(
- 	    else
- 		DestroyNTable(table);
- 	}
-+	_XUnlockMutex(&db->linfo);
- 	_XFreeMutex(&db->linfo);
- 	(*db->methods->destroy)(db->mbstate);
- 	Xfree((char *)db);
diff --git a/x11/libX11/patches/patch-ac b/x11/libX11/patches/patch-ac
index deb162eeda0..09fdb9c2dc5 100644
--- a/x11/libX11/patches/patch-ac
+++ b/x11/libX11/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2007/08/05 22:39:38 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2008/04/17 12:33:56 wiz Exp $
 
---- configure.orig	2007-08-06 00:08:02.000000000 +0200
+--- configure.orig	2008-03-06 20:48:42.000000000 +0000
 +++ configure
-@@ -926,6 +926,8 @@ XKB_FALSE
+@@ -927,6 +927,8 @@ XKB_FALSE
  XKBPROTO_CFLAGS
  XKBPROTO_LIBS
  XKBPROTO_REQUIRES
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.2 2007/08/05 22:39:38 joerg Exp $
  LINT
  LINT_FLAGS
  LINT_TRUE
-@@ -23423,6 +23425,15 @@ else
+@@ -23507,6 +23509,15 @@ else
  fi
  
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ac,v 1.2 2007/08/05 22:39:38 joerg Exp $
  
  
  for ac_header in stdlib.h unistd.h
-@@ -24523,6 +24534,13 @@ echo "$as_me: error: conditional \"XKB\"
+@@ -24641,6 +24652,13 @@ echo "$as_me: error: conditional \"XKB\"
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -41,7 +41,7 @@ $NetBSD: patch-ac,v 1.2 2007/08/05 22:39:38 joerg Exp $
  if test -z "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -25339,6 +25357,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
+@@ -25466,6 +25486,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
  XKBPROTO_CFLAGS!$XKBPROTO_CFLAGS$ac_delim
  XKBPROTO_LIBS!$XKBPROTO_LIBS$ac_delim
  XKBPROTO_REQUIRES!$XKBPROTO_REQUIRES$ac_delim
@@ -50,12 +50,12 @@ $NetBSD: patch-ac,v 1.2 2007/08/05 22:39:38 joerg Exp $
  LINT!$LINT$ac_delim
  LINT_FLAGS!$LINT_FLAGS$ac_delim
  LINT_TRUE!$LINT_TRUE$ac_delim
-@@ -25360,7 +25380,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -25490,7 +25512,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/x11/libX11/patches/patch-ae b/x11/libX11/patches/patch-ae
index 91cd2d78f55..bdf3126eafa 100644
--- a/x11/libX11/patches/patch-ae
+++ b/x11/libX11/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2007/08/05 22:39:39 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $
 
---- src/util/Makefile.in.orig	2007-08-06 00:07:57.000000000 +0200
+--- src/util/Makefile.in.orig	2008-03-06 20:48:52.000000000 +0000
 +++ src/util/Makefile.in
 @@ -34,7 +34,6 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -17,7 +17,7 @@ $NetBSD: patch-ae,v 1.2 2007/08/05 22:39:39 joerg Exp $
 +xmakekeys_SOURCES = xmakekeys.c
 +xmakekeys_OBJECTS = xmakekeys.$(OBJEXT)
 +xmakekeys_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
 @@ -62,8 +64,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
@@ -34,7 +34,7 @@ $NetBSD: patch-ae,v 1.2 2007/08/05 22:39:39 joerg Exp $
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -223,10 +228,9 @@ sysconfdir = @sysconfdir@
+@@ -225,10 +230,9 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -47,7 +47,7 @@ $NetBSD: patch-ae,v 1.2 2007/08/05 22:39:39 joerg Exp $
  EXTRA_DIST = mkks.sh
  
  # Check source code with tools like lint & sparse
-@@ -276,6 +280,9 @@ clean-noinstPROGRAMS:
+@@ -278,6 +282,9 @@ clean-noinstPROGRAMS:
  makekeys$(EXEEXT): $(makekeys_OBJECTS) $(makekeys_DEPENDENCIES) 
  	@rm -f makekeys$(EXEEXT)
  	$(makekeys_LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS)
@@ -57,7 +57,7 @@ $NetBSD: patch-ae,v 1.2 2007/08/05 22:39:39 joerg Exp $
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -284,6 +291,7 @@ distclean-compile:
+@@ -286,6 +293,7 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys-makekeys.Po@am__quote@
@@ -65,7 +65,7 @@ $NetBSD: patch-ae,v 1.2 2007/08/05 22:39:39 joerg Exp $
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -503,6 +511,10 @@ uninstall-am:
+@@ -504,6 +512,10 @@ uninstall-am:
  	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
  
diff --git a/x11/libX11/patches/patch-ag b/x11/libX11/patches/patch-ag
index 8367eeb902d..ab1e65b8b9d 100644
--- a/x11/libX11/patches/patch-ag
+++ b/x11/libX11/patches/patch-ag
@@ -1,18 +1,18 @@
-$NetBSD: patch-ag,v 1.2 2007/08/05 22:39:39 joerg Exp $
+$NetBSD: patch-ag,v 1.3 2008/04/17 12:33:56 wiz Exp $
 
---- src/Makefile.in.orig	2007-08-06 00:07:52.000000000 +0200
+--- src/Makefile.in.orig	2008-03-06 20:48:51.000000000 +0000
 +++ src/Makefile.in
 @@ -512,6 +512,8 @@ libX11_la_LIBADD = \
- @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- @LINT_TRUE@		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+ 	$(X11_LIBS) \
+ 	$(XDMCP_LIBS)
  
 +@CROSS_COMPILING_FALSE@MAKEKEYS = $(top_builddir)/src/util/makekeys
 +@CROSS_COMPILING_TRUE@MAKEKEYS = $(top_builddir)/src/util/xmakekeys
- all: $(BUILT_SOURCES) config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -1214,7 +1216,7 @@ preprocess: $(patsubst %.c,%.ii,$(libX11
- @LINT_TRUE@	done
+ # Check source code with tools like lint & sparse
+ @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -1243,7 +1245,7 @@ preprocess: $(patsubst %.c,%.ii,$(libX11
+ @MAKE_LINT_LIB_TRUE@	$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
  
  ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
 -	$(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h