head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.14
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.12
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.10
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.8
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.6
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.4
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.2
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.1.0.2
	cube-native-xorg-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2008.09.16.21.57.10;	author bjs;	state dead;
branches;
next	1.1;

1.1
date	2008.07.24.01.07.31;	author bjs;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to libX11-1.1.5:  integrates the patches listed as removed
as well as a number of i18n fixes.
@
text
@$NetBSD: patch-ao,v 1.1 2008/07/24 01:07:31 bjs Exp $

Warning fix.

--- src/xlibi18n/lcWrap.c.orig	2008-03-06 15:45:06.000000000 -0500
+++ src/xlibi18n/lcWrap.c
@@@@ -154,7 +154,7 @@@@ _XlcDefaultMapModifiers(
 #ifdef WIN32
 	{
 	    char *s;
-	    for (s = mods; s = strchr(s, '@@'); s++) {
+	    for (s = mods; (s = strchr(s, '@@')); s++) {
 		for (s++; *s && *s != '='; s++) {
 		    if (*s == '#') {
 			*s = '=';
@


1.1
log
@
Properly define XTHREAD_CFLAGS/XTHREADLIB on NetBSD:  We do not
want -pthread in XTHREAD_CFLAGS, as this will end up linking everything
against libpthread.  Thus, in keeping with our gcc specfile, define
_REENTRANT in XTHREAD_CFLAGS instead.  XTHREADLIB is now
-pthread, not -lpthread.

While here, update to head of libX11-1.1 branch in GIT (with the
exception of some unicode changes which caused mkpatches to choke).

changes:

 - IM: Respect XMODIFIERS for Thai locale (bug #15719)
 - Bug #15884: Remove useless sleep()'s from the connection code.
 - NLS: Make UTF-8 the default for Russian
 - ConnDis: properly cast 'addr' before accessing it as a byte array.
 - added error check in Xcms color file parser; closes bug #15305
 - Fix missing error condition in cmsColNm.c, also.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@