rpms/libX11
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: rhbz#477174 don't hang in OOo, acroread, ekiga, xine, etc

Browse Source
This commit is contained in:
Caolan McNamara 2009-02-02 12:15:45 +00:00
parent 2723024519
commit 3b0b56d230
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libX11-1.1.99.2.hang.patch Normal file
View File

@ -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);
}

8
libX11.spec
View File

@ -1,7 +1,7 @@
Summary: X.Org X11 libX11 runtime library Summary: X.Org X11 libX11 runtime library
Name: libX11 Name: libX11
Version: 1.1.99.2 Version: 1.1.99.2
Release: 2%{?dist} Release: 3%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.x.org 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, # this patch is now committed upstream. When libX11-1.0.4 is released,
# manually confirm each patch hunk before removal. # manually confirm each patch hunk before removal.
Patch2: dont-forward-keycode-0.patch 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 BuildRequires: pkgconfig autoconf automake libtool
# xproto >= 7.0.6 required # xproto >= 7.0.6 required
@ -56,6 +58,7 @@ X.Org X11 libX11 development package
# find it later. # find it later.
#%patch0 -p0 -b .datadir-locale-dir-fix #%patch0 -p0 -b .datadir-locale-dir-fix
%patch2 -p1 -b .dont-forward-keycode-0 %patch2 -p1 -b .dont-forward-keycode-0
%patch3 -p1 -b .dont-hang
%build %build
./autogen.sh ./autogen.sh
@ -117,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%changelog %changelog
* Mon Feb 02 2009 Caolán McNamara <caolanm@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@redhat.com> 1.1.99.2-2 * Thu Dec 18 2008 Adam Jackson <ajax@redhat.com> 1.1.99.2-2
- BR: util-macros - BR: util-macros