- libxcb 1.4 (#518597)

.cvsignore

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

libxcb-1.1-no-pthread-stubs.patch

@@ -1,12 +0,0 @@
-diff -up libxcb-1.3/configure.ac.jx libxcb-1.3/configure.ac
---- libxcb-1.3/configure.ac.jx	2009-07-14 11:40:00.000000000 -0400
-+++ libxcb-1.3/configure.ac	2009-07-14 11:40:38.000000000 -0400
-@@ -33,7 +33,7 @@ AC_SUBST(HTML_CHECK_RESULT)
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.5)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"

libxcb-1.3-to-git-e06955.patch

@@ -1,26 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e13092a..5de3b09 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -75,7 +75,7 @@ EXTSOURCES += randr.c
- EXTENSION_XML += randr.xml
- if BUILD_RANDR
- lib_LTLIBRARIES += libxcb-randr.la
--libxcb_randr_la_LDFLAGS = -version-info 1:0:0
-+libxcb_randr_la_LDFLAGS = -version-info 1:0:1
- libxcb_randr_la_LIBADD = $(XCB_LIBS)
- nodist_libxcb_randr_la_SOURCES = randr.c randr.h
- endif
-diff --git a/src/xcb_out.c b/src/xcb_out.c
-index 4c6ab13..b3050fe 100644
---- a/src/xcb_out.c
-+++ b/src/xcb_out.c
-@@ -242,7 +242,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect
-             vector[1].iov_base = (uint32_t *) vector[1].iov_base + 1;
-             vector[1].iov_len -= sizeof(uint32_t);
-         }
--        vector[0].iov_len = sizeof(uint32_t) * (prefix[0] ? 1 : 0 | prefix[2] ? 2 : 0);
-+        vector[0].iov_len = sizeof(uint32_t) * ((prefix[0] ? 1 : 0) + (prefix[2] ? 2 : 0));
-         vector[0].iov_base = prefix + !prefix[0];
-     }
- 

libxcb.spec

@@ -6,8 +6,8 @@
 #define bootstrap 1
 
 Name:           libxcb
-Version:        1.3
+Version:        1.4
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -22,9 +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 
 
-Patch0:         libxcb-1.1-no-pthread-stubs.patch
-Patch1:		libxcb-1.3-to-git-e06955.patch
-
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -73,8 +70,6 @@ Python bindings for %{name}.
 
 %prep
 %setup -q -b2
-%patch0 -p1 -b .pthread-stubs
-%patch1 -p1 -b .git
 
 %if !0%{?bootstrap}
 pushd ../xpyb-%{xpyb_version}
@@ -160,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 27 2009 Adam Jackson <ajax@redhat.com> 1.4-1
+- libxcb 1.4 (#518597)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

sources

@@ -1,3 +1,2 @@
-ae32b7846a7d83f5ec542a5431117564  libxcb-1.2.tar.bz2
 0d82bbaa97f89e41aada9fab5630147a  xpyb-1.1.tar.bz2
-74b18b863df6dd669e1df9854f96c329  libxcb-1.3.tar.bz2
+b00fd506c717dea01f595e8da31f6914  libxcb-1.4.tar.bz2