From 3b0b56d23076015457b2f9f689d1c80c1a2560a9 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Mon, 2 Feb 2009 12:15:45 +0000 Subject: [PATCH] Resolves: rhbz#477174 don't hang in OOo, acroread, ekiga, xine, etc --- libX11-1.1.99.2.hang.patch | 13 +++++++++++++ libX11.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 libX11-1.1.99.2.hang.patch diff --git a/libX11-1.1.99.2.hang.patch b/libX11-1.1.99.2.hang.patch new file mode 100644 index 0000000..21cba03 --- /dev/null +++ b/libX11-1.1.99.2.hang.patch @@ -0,0 +1,13 @@ +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); + } + diff --git a/libX11.spec b/libX11.spec index c28efd9..de4ce40 100644 --- a/libX11.spec +++ b/libX11.spec @@ -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 @@ Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch # 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 @@ X.Org X11 libX11 development package # 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 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Feb 02 2009 Caolán McNamara 1.1.99.2-3 +- Resolves: rhbz#477174 don't hang in OOo, acroread, ekiga, xine, etc. + * Thu Dec 18 2008 Adam Jackson 1.1.99.2-2 - BR: util-macros