diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-02-07 03:24:06 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-02-07 03:24:06 +0800 |
| commit | 54eb6449a3c489f56a4182b2a59607833cfb9171 (patch) | |
| tree | 51dca378a097da7ad94b5e73a8db5dd8934ec915 | |
| parent | 6fa69262ceaea4230b421bdb6a1914afa4e9c0f6 (diff) | |
| download | xorg-devel-ports-54eb6449a3c489f56a4182b2a59607833cfb9171.tar.gz xorg-devel-ports-54eb6449a3c489f56a4182b2a59607833cfb9171.tar.zst xorg-devel-ports-54eb6449a3c489f56a4182b2a59607833cfb9171.zip | |
Reupdate to 1.8.
Thanks to legwork by Erandir for figure out the hang issue and submit the patch.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@401 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11/libxcb/Makefile | 4 | ||||
| -rw-r--r-- | x11/libxcb/distinfo | 4 | ||||
| -rw-r--r-- | x11/libxcb/files/patch-src-xcb_in.c | 22 | ||||
| -rw-r--r-- | x11/libxcb/pkg-plist | 1 |
4 files changed, 27 insertions, 4 deletions
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile index 1f41da6..5ec0f7d 100644 --- a/x11/libxcb/Makefile +++ b/x11/libxcb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libxcb -PORTVERSION= 1.7 +PORTVERSION= 1.8 CATEGORIES= x11 python MASTER_SITES= http://xcb.freedesktop.org/dist/ @@ -29,7 +29,7 @@ USE_GNOME= gnomehack USE_GMAKE= yes USE_LDCONFIG= yes USE_XORG= xau xdmcp -USE_PYTHON_BUILD= 2.5-2.7 +USE_PYTHON_BUILD= 2.5+ GNU_CONFIGURE= yes .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo index 6354685..e811f69 100644 --- a/x11/libxcb/distinfo +++ b/x11/libxcb/distinfo @@ -1,2 +1,2 @@ -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df -SIZE (libxcb-1.7.tar.bz2) = 318619 +SHA256 (libxcb-1.8.tar.bz2) = 25c3600bec104c5aa6e9f559bfe0011b0e223bde726b849b58f758c2d4e6fc5e +SIZE (libxcb-1.8.tar.bz2) = 372730 diff --git a/x11/libxcb/files/patch-src-xcb_in.c b/x11/libxcb/files/patch-src-xcb_in.c new file mode 100644 index 0000000..b42784e --- /dev/null +++ b/x11/libxcb/files/patch-src-xcb_in.c @@ -0,0 +1,22 @@ +For some reason the recv() hangs on FreeBSD, but works on linux. + +--- src/xcb_in.c ++++ src/xcb_in.c +@@ -269,7 +269,7 @@ static int read_block(const int fd, void *buf, const ssize_t len) + int done = 0; + while(done < len) + { +- int ret = recv(fd, ((char *) buf) + done, len - done,MSG_WAITALL); ++ int ret = read(fd, ((char *) buf) + done, len - done); + if(ret > 0) + done += ret; + #ifndef _WIN32 +@@ -661,7 +661,7 @@ void _xcb_in_replies_done(xcb_connection_t *c) + + int _xcb_in_read(xcb_connection_t *c) + { +- int n = recv(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len,MSG_WAITALL); ++ int n = read(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len); + if(n > 0) + c->in.queue_len += n; + while(read_packet(c)) diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist index dc30e21..80bc7ab 100644 --- a/x11/libxcb/pkg-plist +++ b/x11/libxcb/pkg-plist @@ -18,6 +18,7 @@ include/xcb/xcbext.h include/xcb/xevie.h include/xcb/xf86dri.h include/xcb/xfixes.h +include/xcb/xkb.h include/xcb/xinerama.h include/xcb/xinput.h include/xcb/xprint.h |