- libxcb 1.5

.cvsignore

@@ -2,3 +2,4 @@ libxcb-1.2.tar.bz2
 xpyb-1.1.tar.bz2
 libxcb-1.3.tar.bz2
 libxcb-1.4.tar.bz2
+libxcb-1.5.tar.bz2

libxcb-1.4-keepalive.patch

@@ -1,28 +0,0 @@
-From 1cf2a87def76f4646fe05e282b45605d572f2513 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 2 Dec 2009 14:31:56 -0500
-Subject: [PATCH] setsockopt(SO_KEEPALIVE) on TCP display connections.
-
-This matches xtrans behaviour in SocketINETConnect, and makes it so apps
-don't hang forever if their display dies.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/xcb_util.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/xcb_util.c b/src/xcb_util.c
-index 55aadb7..c3cbfa6 100644
---- a/src/xcb_util.c
-+++ b/src/xcb_util.c
-@@ -260,6 +260,7 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
-         if(fd >= 0) {
-             int on = 1;
-             setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
-+	    setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
- 
-             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
-                 break;
--- 
-1.6.5.2
-

libxcb.spec

@@ -6,8 +6,8 @@
 #define bootstrap 1
 
 Name:           libxcb
-Version:        1.4
+Version:        1.5
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -22,7 +22,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source1:	pthread-stubs.pc.in
 Source2:	http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2 
 
-Patch1:		libxcb-1.4-keepalive.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
@@ -30,7 +29,7 @@ BuildRequires:  graphviz
 BuildRequires:  libXau-devel
 BuildRequires:  libxslt
 BuildRequires:	python-devel
-BuildRequires:  xcb-proto >= 1.5
+BuildRequires:  xcb-proto >= 1.6
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  xorg-x11-util-macros
 %if !0%{?bootstrap}
@@ -72,7 +71,6 @@ Python bindings for %{name}.
 
 %prep
 %setup -q -b2
-%patch1 -p1 -b .keepalive
 
 %if !0%{?bootstrap}
 pushd ../xpyb-%{xpyb_version}
@@ -158,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jan 13 2010 Dave Airlie <airlied@redhat.com> 1.5-1
+- libxcb 1.5
+
 * Wed Dec 02 2009 Adam Jackson <ajax@redhat.com> 1.4-2
 - libxcb-1.4-keepalive.patch: setsockopt(SO_KEEPALIVE) for TCP (#476415)
 

sources

@@ -1,2 +1,3 @@
 0d82bbaa97f89e41aada9fab5630147a  xpyb-1.1.tar.bz2
 b00fd506c717dea01f595e8da31f6914  libxcb-1.4.tar.bz2
+d19c0ba6ba42ebccd3d62d8bb147b551  libxcb-1.5.tar.bz2