pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/libX11 Update to libX11-1.1.5: integrates the pat...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8dfd13b4f9fb
branches: trunk
changeset: 547449:8dfd13b4f9fb
user: bjs <bjs%pkgsrc.org@localhost>
date: Tue Sep 16 21:57:09 2008 +0000
description:
Update to libX11-1.1.5: integrates the patches listed as removed
as well as a number of i18n fixes.
diffstat:
x11/libX11/Makefile | 5 +--
x11/libX11/distinfo | 21 ++++-----------
x11/libX11/patches/patch-aa | 44 ++------------------------------
x11/libX11/patches/patch-ab | 21 ---------------
x11/libX11/patches/patch-ac | 24 +++++++++---------
x11/libX11/patches/patch-ah | 60 ---------------------------------------------
x11/libX11/patches/patch-ai | 17 ------------
x11/libX11/patches/patch-aj | 18 -------------
x11/libX11/patches/patch-ak | 44 ---------------------------------
x11/libX11/patches/patch-al | 27 --------------------
x11/libX11/patches/patch-am | 15 -----------
x11/libX11/patches/patch-an | 27 --------------------
x11/libX11/patches/patch-ao | 15 -----------
13 files changed, 23 insertions(+), 315 deletions(-)
diffs (truncated from 477 to 300 lines):
diff -r b2684edff779 -r 8dfd13b4f9fb x11/libX11/Makefile
--- a/x11/libX11/Makefile Tue Sep 16 21:23:42 2008 +0000
+++ b/x11/libX11/Makefile Tue Sep 16 21:57:09 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2008/07/24 01:07:31 bjs Exp $
+# $NetBSD: Makefile,v 1.16 2008/09/16 21:57:09 bjs Exp $
#
-DISTNAME= libX11-1.1.4
-PKGREVISION= 2
+DISTNAME= libX11-1.1.5
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
diff -r b2684edff779 -r 8dfd13b4f9fb x11/libX11/distinfo
--- a/x11/libX11/distinfo Tue Sep 16 21:23:42 2008 +0000
+++ b/x11/libX11/distinfo Tue Sep 16 21:57:09 2008 +0000
@@ -1,20 +1,11 @@
-$NetBSD: distinfo,v 1.11 2008/07/24 01:07:31 bjs Exp $
+$NetBSD: distinfo,v 1.12 2008/09/16 21:57:09 bjs Exp $
-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) = 00b07dfbf3e9b7b8ea636bb9ce4b5a037db56f61
-SHA1 (patch-ab) = 7cb4fe18ec4e4f3305a1508ddd77ef41a5f98cb8
-SHA1 (patch-ac) = a5473e31ce8b60c9ee9f19a453face3dffb9ab24
+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 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
SHA1 (patch-ag) = 626875c0c772264ea53fbf4f6e9c2228f7628ecf
-SHA1 (patch-ah) = 20c4e36f8b8d0b805abe55e4246c02bdd32108da
-SHA1 (patch-ai) = 164a5dd68278552a0d6e389815568d8c38982927
-SHA1 (patch-aj) = 1da0dec1119b66940b7627bb51d3834d813026ab
-SHA1 (patch-ak) = 0320b2ef0a6e93fe0b23a5b0b903505b58182deb
-SHA1 (patch-al) = fc39dd845dc49dce15b80f2c8ff7e1766e85656c
-SHA1 (patch-am) = b1946f578716c261b5fd0a99d7eba2876e197a61
-SHA1 (patch-an) = 00b554db6b9e957b714190a3dc7e9d3c9c10b1a0
-SHA1 (patch-ao) = 2ee7efa67cfa8f6be2ebcab5fdcc2be71c1cf961
diff -r b2684edff779 -r 8dfd13b4f9fb x11/libX11/patches/patch-aa
--- a/x11/libX11/patches/patch-aa Tue Sep 16 21:23:42 2008 +0000
+++ b/x11/libX11/patches/patch-aa Tue Sep 16 21:57:09 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2008/07/24 01:07:31 bjs Exp $
+$NetBSD: patch-aa,v 1.6 2008/09/16 21:57:09 bjs Exp $
Include pthread.h as thread stubs might be macros like on NetBSD.
@@ -7,7 +7,7 @@
Also, don't look for keysmydef.h, as this could break cross
builds (from GIT).
---- configure.ac.orig 2008-03-06 15:48:26.000000000 -0500
+--- configure.ac.orig 2008-09-04 17:38:59.000000000 -0400
+++ configure.ac
@@ -180,7 +180,7 @@ esac
AC_SUBST(XTHREADS)
@@ -29,45 +29,7 @@
freebsd*)
XTHREAD_CFLAGS="-D_THREAD_SAFE"
XTHREADLIB="-pthread" ;;
-@@ -220,31 +220,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL,
- #
- # Find keysymdef.h
- #
--KEYSYMDEF=""
- AC_MSG_CHECKING([keysymdef.h])
--for flag in $XPROTO_CFLAGS -I/usr/include; do
-- case "$KEYSYMDEF" in
-- "")
-- case "$flag" in
-- *-I*)
-- dir=`echo "$flag" | sed 's/ *-I//'`
-- file="$dir/X11/keysymdef.h"
-- if test -f "$file"; then
-- KEYSYMDEF="$file"
-- fi
-- ;;
-- esac
-- ;;
-- esac
--done
--case "$KEYSYMDEF" in
--"")
-- AC_MSG_ERROR([Cannot find keysymdef.h])
-- ;;
--*)
-+dir=`pkg-config --variable=includedir xproto`
-+KEYSYMDEF="$dir/X11/keysymdef.h"
-+if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
-- ;;
--esac
-+else
-+ AC_MSG_ERROR([Cannot find keysymdef.h])
-+fi
- AC_SUBST(KEYSYMDEF)
-
- AM_CONDITIONAL(UDC, test xfalse = xtrue)
-@@ -322,6 +305,8 @@ else
+@@ -305,6 +305,8 @@ else
fi
AC_SUBST(XKBPROTO_REQUIRES)
diff -r b2684edff779 -r 8dfd13b4f9fb x11/libX11/patches/patch-ab
--- a/x11/libX11/patches/patch-ab Tue Sep 16 21:23:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/07/24 01:07:31 bjs Exp $
-
-IM: Respect XMODIFIERS for Thai locale (bug #15719)
-
---- modules/im/ximcp/imThaiIm.c.orig 2008-03-06 15:45:06.000000000 -0500
-+++ modules/im/ximcp/imThaiIm.c
-@@ -67,7 +67,13 @@ _XimCheckIfThaiProcessing(im)
- char *language;
-
- _XGetLCValues(im->core.lcd, XlcNLanguage, &language, NULL);
-- if(strcmp(language, THAI_LANGUAGE_NAME) == 0) {
-+ if(strcmp(language, THAI_LANGUAGE_NAME) == 0 &&
-+ (strcmp(im->core.im_name, "") == 0 ||
-+ strcmp(im->core.im_name, "BasicCheck") == 0 ||
-+ strcmp(im->core.im_name, "Strict") == 0 ||
-+ strcmp(im->core.im_name, "Thaicat") == 0 ||
-+ strcmp(im->core.im_name, "Passthrough") == 0))
-+ {
- return(True);
- }
- return(False);
diff -r b2684edff779 -r 8dfd13b4f9fb x11/libX11/patches/patch-ac
--- a/x11/libX11/patches/patch-ac Tue Sep 16 21:23:42 2008 +0000
+++ b/x11/libX11/patches/patch-ac Tue Sep 16 21:57:09 2008 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.5 2008/07/24 01:07:31 bjs Exp $
+$NetBSD: patch-ac,v 1.6 2008/09/16 21:57:09 bjs Exp $
_POSIX_THREAD_SAFE_FUNCTIONS is not used on NetBSD. Instead,
let's use _REENTRANT.
---- configure.orig 2008-03-06 15:48:42.000000000 -0500
+--- configure.orig 2008-09-04 17:48:46.000000000 -0400
+++ configure
-@@ -927,6 +927,8 @@ XKB_FALSE
+@@ -929,6 +929,8 @@ XKB_FALSE
XKBPROTO_CFLAGS
XKBPROTO_LIBS
XKBPROTO_REQUIRES
@@ -14,7 +14,7 @@
LINT
LINT_FLAGS
LINT_TRUE
-@@ -22885,43 +22887,38 @@ esac
+@@ -23393,43 +23395,38 @@ esac
@@ -70,7 +70,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -22930,28 +22927,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23438,28 +23435,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 @@
if test x$thrstubs = xyes; then
THRSTUBS_TRUE=
THRSTUBS_FALSE='#'
-@@ -22966,8 +22970,8 @@ if test x$xthreads = xyes ; then
+@@ -23474,8 +23478,8 @@ if test x$xthreads = xyes ; then
linux*|openbsd*|gnu*|k*bsd*-gnu)
XTHREADLIB=-lpthread ;;
netbsd*)
@@ -129,7 +129,7 @@
freebsd*)
XTHREAD_CFLAGS="-D_THREAD_SAFE"
XTHREADLIB="-pthread" ;;
-@@ -23507,6 +23511,15 @@ else
+@@ -24006,6 +24010,15 @@ else
fi
@@ -145,7 +145,7 @@
for ac_header in stdlib.h unistd.h
-@@ -24641,6 +24654,13 @@ echo "$as_me: error: conditional \"XKB\"
+@@ -25140,6 +25153,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 @@
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
-@@ -25466,6 +25486,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
+@@ -25967,6 +25993,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 @@
LINT!$LINT$ac_delim
LINT_FLAGS!$LINT_FLAGS$ac_delim
LINT_TRUE!$LINT_TRUE$ac_delim
-@@ -25490,7 +25512,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -25991,7 +26019,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` = 83; then
-+ 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` = 85; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r b2684edff779 -r 8dfd13b4f9fb x11/libX11/patches/patch-ah
--- a/x11/libX11/patches/patch-ah Tue Sep 16 21:23:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2008/07/24 01:07:31 bjs Exp $
-
---- src/XlibInt.c.orig 2008-07-23 01:53:49.000000000 -0400
-+++ src/XlibInt.c
-@@ -206,8 +206,6 @@ static char *_XAsyncReply(
- Bool discard);
- #endif /* !USE_XCB */
-
--#define SEQLIMIT (65535 - (BUFSIZE / SIZEOF(xReq)) - 10)
--
- /*
- * The following routines are internal routines used by Xlib for protocol
- * packet transmission and reception.
-@@ -570,24 +568,34 @@ _XWaitForReadable(
- }
- #endif /* !USE_XCB */
-
-+static int sync_hazard(Display *dpy)
-+{
-+ unsigned long span = dpy->request - dpy->last_request_read;
-+ unsigned long hazard = min((dpy->bufmax - dpy->buffer) / SIZEOF(xReq), 65535 - 10);
-+ return span >= 65535 - hazard - 10;
-+}
-+
- static
- int _XSeqSyncFunction(
- register Display *dpy)
- {
- xGetInputFocusReply rep;
- register xReq *req;
-+ int sent_sync = 0;
-
- LockDisplay(dpy);
-- if ((dpy->request - dpy->last_request_read) >= (BUFSIZE / SIZEOF(xReq))) {
-+ if ((dpy->request - dpy->last_request_read) >= (65535 - BUFSIZE/SIZEOF(xReq))) {
- GetEmptyReq(GetInputFocus, req);
- (void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-+ sent_sync = 1;
- }
- /* could get XID handler while waiting for reply in MT env */
-- if (dpy->synchandler == _XSeqSyncFunction) {
-+ if (dpy->synchandler == _XSeqSyncFunction && !sync_hazard(dpy)) {
- dpy->synchandler = dpy->savedsynchandler;
- dpy->flags &= ~XlibDisplayPrivSync;
- }
- UnlockDisplay(dpy);
-+ if (sent_sync)
- SyncHandle();
- return 0;
- }
-@@ -595,8 +603,7 @@ int _XSeqSyncFunction(
- void _XSetSeqSyncFunction(
- register Display *dpy)
- {
-- if ((dpy->request - dpy->last_request_read) >= SEQLIMIT &&
-- !(dpy->flags & XlibDisplayPrivSync)) {
-+ if (!(dpy->flags & XlibDisplayPrivSync) && sync_hazard(dpy)) {
- dpy->savedsynchandler = dpy->synchandler;
- dpy->synchandler = _XSeqSyncFunction;
- dpy->flags |= XlibDisplayPrivSync;
diff -r b2684edff779 -r 8dfd13b4f9fb x11/libX11/patches/patch-ai
--- a/x11/libX11/patches/patch-ai Tue Sep 16 21:23:42 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2008/07/24 01:07:31 bjs Exp $
-
-Bug #15884: Remove useless sleep()'s from the connection code.
-
---- modules/im/ximcp/imTrans.c.orig 2008-03-06 15:45:06.000000000 -0500
-+++ modules/im/ximcp/imTrans.c
-@@ -77,10 +77,7 @@ _XimTransConnect(
- spec->trans_conn = NULL;
-
- if (connect_stat == TRANS_TRY_CONNECT_AGAIN)
Home |
Main Index |
Thread Index |
Old Index