[wayland] Remove blocking flush patch as it actually introduces deadlocks now
Adam Jackson
ajax at fedoraproject.org
Mon Jun 30 15:30:27 UTC 2014
commit efd78f36c5365355824fc26549d764d805175923
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jun 30 11:30:36 2014 -0400
Remove blocking flush patch as it actually introduces deadlocks now
wayland-1.2.0-blocking-flush.patch | 13 -------------
wayland.spec | 10 ++++------
2 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/wayland.spec b/wayland.spec
index 9fc4f01..3f9bb67 100644
--- a/wayland.spec
+++ b/wayland.spec
@@ -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 at 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 at lists.fedoraproject.org> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list