rpms/libxcb/F-8 libxcb-1.0-lock-asserts.patch, NONE, 1.1 libxcb.spec, 1.3, 1.4

[Soren Sandmann Pedersen (ssp)]

Author: ssp

Update of /cvs/pkgs/rpms/libxcb/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14899

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.0-lock-asserts.patch 
Log Message:
%changelog
* Tue Dec 4 2007 Soren Sandmann <sandmann at redhat.com> 1.0-4
- libxcb-1.0-lock-asserts.patch, see bug 11390.



libxcb-1.0-lock-asserts.patch:

--- NEW FILE libxcb-1.0-lock-asserts.patch ---
diff -up libxcb-1.0/src/xcb_xlib.c.lock-assert libxcb-1.0/src/xcb_xlib.c
--- libxcb-1.0/src/xcb_xlib.c.lock-assert	2007-12-04 18:15:26.000000000 -0500
+++ libxcb-1.0/src/xcb_xlib.c	2007-12-04 18:16:00.000000000 -0500
@@ -38,7 +38,6 @@ unsigned int xcb_get_request_sent(xcb_co
 void xcb_xlib_lock(xcb_connection_t *c)
 {
     _xcb_lock_io(c);
-    assert(!c->xlib.lock);
     c->xlib.lock = 1;
     c->xlib.thread = pthread_self();
     _xcb_unlock_io(c);
@@ -47,8 +46,6 @@ void xcb_xlib_lock(xcb_connection_t *c)
 void xcb_xlib_unlock(xcb_connection_t *c)
 {
     _xcb_lock_io(c);
-    assert(c->xlib.lock);
-    assert(pthread_equal(c->xlib.thread, pthread_self()));
     c->xlib.lock = 0;
     pthread_cond_broadcast(&c->xlib.cond);
     _xcb_unlock_io(c);


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/F-8/libxcb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libxcb.spec	24 Aug 2007 21:44:02 -0000	1.3
+++ libxcb.spec	4 Dec 2007 23:24:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libxcb
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@
 
 Patch0:         libxcb-1.0-no-pthread-stubs.patch
 Patch1:		libxcb-1.0-abstract-socket.patch
+Patch2:         libxcb-1.0-lock-asserts.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
@@ -47,6 +48,7 @@
 %setup -q
 %patch0 -p1 -b .pthread-stubs
 %patch1 -p1 -b .abstract
+%patch2 -p1 -b .lock-asserts
 
 %build
 autoreconf -v --install
@@ -80,6 +82,9 @@
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Tue Dec 4 2007 Soren Sandmann <sandmann at redhat.com> 1.0-4
+- libxcb-1.0-lock-asserts.patch, see bug 11390.
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> 1.0-3
 - libxcb-1.0-abstract-socket.patch: When connecting to the X server, prefer
   abstract-namespace unix sockets to filesystem-bound sockets.