Update to 1.2:

New libX11 release to go with libxcb 1.2.

Some more fixes, janitorial work, NLS updates, and the long-awaited
addition of ☭ and ♥ to your favorite Compose file.  Details follow in
the shortlog from 1.1.99.2.

Cheers,
Julien

Adam Jackson (1):
      Fix leak in _XimXGetReadData

Alan Coopersmith (1):
      Add README with pointers to mailing list, bugzilla & git repos

Brian Rogers (1):
      Initialize event_notify after allocating the memory for it.

Colin Harrison (1):
      Fix copy/paste typo in imLcPrs

James Cloos (7):
      [nls]  Add some UTF-8 Compose sequences
      [nls] Annotate the Bépo compose sequences
      Use C comments rather than initial doubled hashes to exclude lines from .pre files
      Revert "For nls/*.pre, allow people to comment lines by starting them with '##'."
      [i18n] s/U00DC/Udiaeresis/g
      NLS: Add UTF-8 compose file for Finnish
      dolt: allow older versions of bash to compile the library

Jeremy Huddleston (1):
      Force local transport when using the launchd socket.

Julien Cristau (2):
      Check Xmalloc return value in _XConnectXCB
      Bump to 1.2

Ken Thomases (1):
      [i18n] Provide translation from XK_partialderivative (8ef) to Unicode (U2202)

Paulo Cesar Pereira de Andrade (10):
      Janitor: ansification, make distcheck, compiler warnings.
      Janitor: Correct some gcc/sparse warnings.
      patches to avoid gcc warnings for libX11 (#1)
      patches to avoid gcc warnings for libX11 (#2)
      patches to avoid gcc warnings for libX11 (#3)
      patches to avoid gcc warnings for libX11 (#4)
      WORD64 compile fix. This bug catched on a overview of the code.
      Don't add prototypes for functions that don't exist.
      Allow multiple inclusions of cursorfont.h, cosmetic patch.
      Check if a function argument is NULL.

Peter Hutterer (2):
      Add XF86Suspend, XF86Hibernate to KeysymDB.
      Fix wrong implies symbol.

Stefan Dirsch (3):
      Added remaining hunk of Egbert's patch to prevent XIM deadlocks (#1182).
      Added remaining xlib patch required for gb18030 support (#1573).
      Fixed strange font mixups, when fontsets are still used (#2676, Novell #74299).

Will Thompson (2):
      Add two essential compose sequences
      NLS: Compose: Non-aliasing CCCP

vehemens (1):
      [i18n] Distribute new headers which were added for gb18030 support.

6 files changed, 53 insertions, 65 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 43bb5211ced..f8bf07084e1 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2008/09/16 21:57:09 bjs Exp $
+# $NetBSD: Makefile,v 1.17 2009/02/21 16:44:29 wiz Exp $
 #
 
-DISTNAME=		libX11-1.1.5
+DISTNAME=		libX11-1.2
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 4ab5a36b8f0..caace8ae4fa 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2008/09/16 21:57:09 bjs Exp $
+$NetBSD: distinfo,v 1.13 2009/02/21 16:44:29 wiz Exp $
 
-SHA1 (libX11-1.1.5.tar.bz2) = b703cb7c97e5aa35bf04a8df798e128ae16cf0d0
-RMD160 (libX11-1.1.5.tar.bz2) = 78567a999640851e7daba1ab44603ec099d0b619
-Size (libX11-1.1.5.tar.bz2) = 1585005 bytes
-SHA1 (patch-aa) = 599bac98260dd066b1e26b9569eba964a6cb6c02
-SHA1 (patch-ac) = 3bad58728e5e84e305058580e9a819314cf68bb7
-SHA1 (patch-ad) = 58645e734f48334ce5cbf62f5870d087d95194ee
-SHA1 (patch-ae) = f9957bdb7a03c87dd24c2d4bfe4f0f46fd955fcc
+SHA1 (libX11-1.2.tar.bz2) = b3d2bbdb5839031f4372c5711348d493c7a41dd6
+RMD160 (libX11-1.2.tar.bz2) = 9d736a55f7d56a4f0f4969c9f84210f05e846de4
+Size (libX11-1.2.tar.bz2) = 1805478 bytes
+SHA1 (patch-aa) = 6a9fec9f8cc4f47de8d21043f7f73a20b6263f7d
+SHA1 (patch-ac) = 42e89ec091e53ef2b714bacc56f357f540223799
+SHA1 (patch-ad) = 9015aa648f7f90d555bcf98d00b080ec39a7c364
+SHA1 (patch-ae) = af22062dd5a232de52f1bd3091e3a002ee915143
 SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
 SHA1 (patch-ag) = 626875c0c772264ea53fbf4f6e9c2228f7628ecf
diff --git a/x11/libX11/patches/patch-aa b/x11/libX11/patches/patch-aa
index 507348063d9..579a3cf28f7 100644
--- a/x11/libX11/patches/patch-aa
+++ b/x11/libX11/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2008/09/16 21:57:09 bjs Exp $
+$NetBSD: patch-aa,v 1.7 2009/02/21 16:44:29 wiz Exp $
 
 Include pthread.h as thread stubs might be macros like on NetBSD.
 
@@ -7,18 +7,18 @@ Define conditional for cross-compiling support.
 Also, don't look for keysmydef.h, as this could break cross
 builds (from GIT).
 
---- configure.ac.orig	2008-09-04 17:38:59.000000000 -0400
+--- configure.ac.orig	2009-02-17 14:38:52.000000000 +0000
 +++ configure.ac
-@@ -180,7 +180,7 @@ esac
- AC_SUBST(XTHREADS)
- AC_SUBST(XUSE_MTSAFE_API)
+@@ -215,7 +215,7 @@ xyes)
+ 	;;
+ esac
  
 -AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"])
 +AC_CHECK_DECLS([pthread_self], [thrstubs="no"], [thrstubs="yes"], [[#include <pthread.h>]])
  AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
  
  dnl XXX incomplete, please fill this in
-@@ -189,8 +189,8 @@ if test x$xthreads = xyes ; then
+@@ -224,8 +224,8 @@ if test x$xthreads = xyes ; then
      linux*|openbsd*|gnu*|k*bsd*-gnu)
          XTHREADLIB=-lpthread ;;
      netbsd*)
@@ -29,7 +29,7 @@ builds (from GIT).
      freebsd*)
          XTHREAD_CFLAGS="-D_THREAD_SAFE"
          XTHREADLIB="-pthread" ;;
-@@ -305,6 +305,8 @@ else
+@@ -340,6 +340,8 @@ else
  fi
  AC_SUBST(XKBPROTO_REQUIRES)
  
diff --git a/x11/libX11/patches/patch-ac b/x11/libX11/patches/patch-ac
index 44ad02bb943..1177b2618f1 100644
--- a/x11/libX11/patches/patch-ac
+++ b/x11/libX11/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.6 2008/09/16 21:57:09 bjs Exp $
+$NetBSD: patch-ac,v 1.7 2009/02/21 16:44:29 wiz Exp $
 
 _POSIX_THREAD_SAFE_FUNCTIONS is not used on NetBSD.  Instead,
 let's use _REENTRANT.
 
---- configure.orig	2008-09-04 17:48:46.000000000 -0400
+--- configure.orig	2009-02-17 15:10:53.000000000 +0000
 +++ configure
-@@ -929,6 +929,8 @@ XKB_FALSE
+@@ -932,6 +932,8 @@ XKB_FALSE
  XKBPROTO_CFLAGS
  XKBPROTO_LIBS
  XKBPROTO_REQUIRES
@@ -14,9 +14,9 @@ let's use _REENTRANT.
  LINT
  LINT_FLAGS
  LINT_TRUE
-@@ -23393,43 +23395,38 @@ esac
- 
- 
+@@ -23828,43 +23830,38 @@ _ACEOF
+ 	;;
+ esac
  
 -{ echo "$as_me:$LINENO: checking for pthread_self in -lc" >&5
 -echo $ECHO_N "checking for pthread_self in -lc... $ECHO_C" >&6; }
@@ -70,7 +70,7 @@ let's use _REENTRANT.
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -23438,28 +23435,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23873,28 +23870,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@ -118,7 +118,7 @@ let's use _REENTRANT.
   if test x$thrstubs = xyes; then
    THRSTUBS_TRUE=
    THRSTUBS_FALSE='#'
-@@ -23474,8 +23478,8 @@ if test x$xthreads = xyes ; then
+@@ -23909,8 +23913,8 @@ if test x$xthreads = xyes ; then
      linux*|openbsd*|gnu*|k*bsd*-gnu)
          XTHREADLIB=-lpthread ;;
      netbsd*)
@@ -129,7 +129,7 @@ let's use _REENTRANT.
      freebsd*)
          XTHREAD_CFLAGS="-D_THREAD_SAFE"
          XTHREADLIB="-pthread" ;;
-@@ -24006,6 +24010,15 @@ else
+@@ -24441,6 +24445,15 @@ else
  fi
  
  
@@ -145,7 +145,7 @@ let's use _REENTRANT.
  
  
  for ac_header in stdlib.h unistd.h
-@@ -25140,6 +25153,13 @@ echo "$as_me: error: conditional \"XKB\"
+@@ -25582,6 +25595,13 @@ echo "$as_me: error: conditional \"XKB\"
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -159,7 +159,7 @@ let's use _REENTRANT.
  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
-@@ -25967,6 +25993,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
+@@ -26412,6 +26432,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
@@ -168,12 +168,12 @@ let's use _REENTRANT.
  LINT!$LINT$ac_delim
  LINT_FLAGS!$LINT_FLAGS$ac_delim
  LINT_TRUE!$LINT_TRUE$ac_delim
-@@ -25991,7 +26019,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -26438,7 +26460,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` = 85; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; 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-ad b/x11/libX11/patches/patch-ad
index 62b4f74faa9..947398ea33c 100644
--- a/x11/libX11/patches/patch-ad
+++ b/x11/libX11/patches/patch-ad
@@ -1,23 +1,22 @@
-$NetBSD: patch-ad,v 1.2 2007/08/05 22:39:38 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2009/02/21 16:44:29 wiz Exp $
 
---- src/util/Makefile.am.orig	2007-05-16 17:34:44.000000000 +0200
+--- src/util/Makefile.am.orig	2009-02-02 16:34:16.000000000 +0000
 +++ src/util/Makefile.am
-@@ -1,11 +1,15 @@
+@@ -1,9 +1,16 @@
  # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
  
 -noinst_PROGRAMS=makekeys
-+noinst_PROGRAMS=	makekeys$(EXEEXT) $(MAKEKEYS_PROG)
++noinst_PROGRAMS=makekeys $(MAKEKEYS_PROG)
  
  makekeys_CFLAGS=$(X11_CFLAGS)
-+if CROSS_COMPILING
-+MAKEKEYS_PROG=		xmakekeys$(EXEEXT)
  
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++if CROSS_COMPILING
++MAKEKEYS_PROG=         xmakekeys$(EXEEXT)
 +xmakekeys$(EXEEXT): makekeys.c
 +	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
-+	    $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c
++		$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c
 +endif
++
+ CC = @CC_FOR_BUILD@
  
  EXTRA_DIST = mkks.sh
- 
diff --git a/x11/libX11/patches/patch-ae b/x11/libX11/patches/patch-ae
index bdf3126eafa..4e8f387066b 100644
--- a/x11/libX11/patches/patch-ae
+++ b/x11/libX11/patches/patch-ae
@@ -1,16 +1,18 @@
-$NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2009/02/21 16:44:29 wiz Exp $
 
---- src/util/Makefile.in.orig	2008-03-06 20:48:52.000000000 +0000
+--- src/util/Makefile.in.orig	2009-02-17 15:11:02.000000000 +0000
 +++ src/util/Makefile.in
-@@ -34,7 +34,6 @@ PRE_UNINSTALL = :
+@@ -34,7 +34,8 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
 -noinst_PROGRAMS = makekeys$(EXEEXT)
++noinst_PROGRAMS = makekeys$(EXEEXT) $(MAKEKEYS_PROG)
++@CROSS_COMPILING_TRUE@MAKEKEYS_PROG = xmakekeys$(EXEEXT)
  subdir = src/util
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -53,6 +52,9 @@ makekeys_LDADD = $(LDADD)
+@@ -53,6 +54,9 @@ makekeys_LDADD = $(LDADD)
  makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  	$(LDFLAGS) -o $@
@@ -20,10 +22,10 @@ $NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $
  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
- 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
+@@ -62,8 +66,11 @@ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
 -SOURCES = makekeys.c
 -DIST_SOURCES = makekeys.c
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -34,20 +36,7 @@ $NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -225,10 +230,9 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-+noinst_PROGRAMS = makekeys$(EXEEXT) $(MAKEKEYS_PROG)
- makekeys_CFLAGS = $(X11_CFLAGS)
--
--#override CC = gcc
--LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+@CROSS_COMPILING_TRUE@MAKEKEYS_PROG = xmakekeys$(EXEEXT)
- EXTRA_DIST = mkks.sh
- 
- # Check source code with tools like lint & sparse
-@@ -278,6 +282,9 @@ clean-noinstPROGRAMS:
+@@ -282,6 +289,9 @@ clean-noinstPROGRAMS:
  makekeys$(EXEEXT): $(makekeys_OBJECTS) $(makekeys_DEPENDENCIES) 
  	@rm -f makekeys$(EXEEXT)
  	$(makekeys_LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS)
@@ -57,7 +46,7 @@ $NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -286,6 +293,7 @@ distclean-compile:
+@@ -290,6 +300,7 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys-makekeys.Po@am__quote@
@@ -65,7 +54,7 @@ $NetBSD: patch-ae,v 1.3 2008/04/17 12:33:56 wiz Exp $
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -504,6 +512,10 @@ uninstall-am:
+@@ -508,6 +519,10 @@ uninstall-am:
  	pdf pdf-am ps ps-am tags uninstall uninstall-am