Remove blocking flush patch as it actually introduces deadlocks now

This commit is contained in:
Adam Jackson 2014-06-30 11:30:36 -04:00
parent 95d2b84211
commit efd78f36c5
2 changed files with 4 additions and 19 deletions

View File

@ -1,13 +0,0 @@
diff -up wayland-1.2.0/src/connection.c.jx wayland-1.2.0/src/connection.c
--- wayland-1.2.0/src/connection.c.jx 2013-07-12 21:52:33.000000000 -0400
+++ wayland-1.2.0/src/connection.c 2013-10-07 13:30:40.418925754 -0400
@@ -283,8 +283,7 @@ wl_connection_flush(struct wl_connection
msg.msg_flags = 0;
do {
- len = sendmsg(connection->fd, &msg,
- MSG_NOSIGNAL | MSG_DONTWAIT);
+ len = sendmsg(connection->fd, &msg, MSG_NOSIGNAL);
} while (len == -1 && errno == EINTR);
if (len == -1)

View File

@ -2,7 +2,7 @@
Name: wayland
Version: 1.5.0
Release: 2%{?gitdate:.%{gitdate}}%{?dist}
Release: 3%{?gitdate:.%{gitdate}}%{?dist}
Summary: Wayland Compositor Infrastructure
Group: User Interface/X
@ -14,10 +14,6 @@ Source0: wayland-%{gitdate}.tar.xz
Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
%endif
Source1: make-git-snapshot.sh
# If this code throws -EAGAIN then wl_proxy_marshal can die, and take your
# Xwayland server (and thus session) with it. Probably wants to be solved
# in some other way, but this will do for now.
Patch0: wayland-1.2.0-blocking-flush.patch
BuildRequires: autoconf automake libtool
BuildRequires: doxygen
@ -86,7 +82,6 @@ Headers and symlinks for developing wayland server applications.
%prep
%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch0 -p1 -b .flush
%build
autoreconf -v --install
@ -170,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/wayland-server.pc
%changelog
* Mon Jun 30 2014 Adam Jackson <ajax@redhat.com> 1.5.0-3
- Remove blocking flush patch as it actually introduces deadlocks now
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild