rpms/libX11/devel libX11-1.1.99.2.hang.patch, NONE, 1.1 libX11.spec, 1.54, 1.55

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv419

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.99.2.hang.patch 
Log Message:
Resolves: rhbz#477174 don't hang in OOo, acroread, ekiga, xine, etc

libX11-1.1.99.2.hang.patch:

--- NEW FILE libX11-1.1.99.2.hang.patch ---
diff -ru libX11-1.1.99.2.orig/src/xcb_disp.c libX11-1.1.99.2/src/xcb_disp.c
--- libX11-1.1.99.2.orig/src/xcb_disp.c	2009-02-02 11:53:49.000000000 +0000
+++ libX11-1.1.99.2/src/xcb_disp.c	2009-02-02 11:57:55.000000000 +0000
@@ -94,6 +94,9 @@
 	dpy->xcb->next_xid = xcb_generate_id(dpy->xcb->connection);
 
 	dpy->xcb->event_notify = xcondition_malloc();
+	if (!dpy->xcb->event_notify)
+		return 0;
+	xcondition_init(dpy->xcb->event_notify);
 	return !xcb_connection_has_error(c);
 }
 


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libX11.spec	18 Dec 2008 21:40:39 -0000	1.54
+++ libX11.spec	2 Feb 2009 12:15:45 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.99.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -15,6 +15,8 @@
 # this patch is now committed upstream.  When libX11-1.0.4 is released,
 # manually confirm each patch hunk before removal.
 Patch2: dont-forward-keycode-0.patch
+#http://lists.freedesktop.org/archives/xorg/2009-January/043133.html
+Patch3: libX11-1.1.99.2.hang.patch 
 
 BuildRequires: pkgconfig autoconf automake libtool
 # xproto >= 7.0.6 required
@@ -56,6 +58,7 @@
 # find it later.
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
+%patch3 -p1 -b .dont-hang
 
 %build
 ./autogen.sh
@@ -117,6 +120,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Feb 02 2009 Caolán McNamara <caolanm at redhat.com> 1.1.99.2-3
+- Resolves: rhbz#477174 don't hang in OOo, acroread, ekiga, xine, etc.
+
 * Thu Dec 18 2008 Adam Jackson <ajax at redhat.com> 1.1.99.2-2
 - BR: util-macros