From 6053f91ee36932d983e8c302f12b3abd896eb484 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Tue, 20 Oct 2015 06:17:32 -0500
Subject: [PATCH] .spec cosmetics, backport kwin/aurorae crasher fix
 (kde#346857)

---
 ...elay-closeWindow-to-next-event-cycle.patch | 37 +++++++++++++++++++
 kwin.spec                                     | 21 +++++++----
 2 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 0003-decorations-Delay-closeWindow-to-next-event-cycle.patch

diff --git a/0003-decorations-Delay-closeWindow-to-next-event-cycle.patch b/0003-decorations-Delay-closeWindow-to-next-event-cycle.patch
new file mode 100644
index 0000000..df4c4e5
--- /dev/null
+++ b/0003-decorations-Delay-closeWindow-to-next-event-cycle.patch
@@ -0,0 +1,37 @@
+From 10ad9262a184e1afc088bee35b7fa4c188d9d63f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
+Date: Mon, 19 Oct 2015 17:26:17 +0200
+Subject: [PATCH 3/3] [decorations] Delay closeWindow to next event cycle
+
+Once again our famous "closing glxgears crashes Aurorae".
+
+BUG: 346857
+FIXED-IN: 5.4.3
+REVIEW: 125704
+---
+ decorations/decoratedclient.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/decorations/decoratedclient.cpp b/decorations/decoratedclient.cpp
+index 9ebd241..69b2032 100644
+--- a/decorations/decoratedclient.cpp
++++ b/decorations/decoratedclient.cpp
+@@ -163,10 +163,14 @@ DELEGATE(requestToggleKeepBelow, KeepBelowOp)
+ 
+ DELEGATE(requestContextHelp, showContextHelp)
+ DELEGATE(requestMinimize, minimize)
+-DELEGATE(requestClose, closeWindow)
+ 
+ #undef DELEGATE
+ 
++void DecoratedClientImpl::requestClose()
++{
++    QMetaObject::invokeMethod(m_client, "closeWindow", Qt::QueuedConnection);
++}
++
+ QColor DecoratedClientImpl::color(KDecoration2::ColorGroup group, KDecoration2::ColorRole role) const
+ {
+     auto dp = m_client->decorationPalette();
+-- 
+2.5.0
+
diff --git a/kwin.spec b/kwin.spec
index e6cdb34..b36db96 100644
--- a/kwin.spec
+++ b/kwin.spec
@@ -2,19 +2,19 @@
 # NOTE: Does not build on F20 due to too old Wayland and requires kf5-kwayland,
 # which is not available in Fedora yet
 %if 0%{?fedora} > 21
-%global         wayland 1
+%global  wayland 1
 %endif
 
-Name:           kwin
+Name:    kwin
 Version: 5.4.2
-Release: 1%{?dist}
-Summary:        KDE Window manager
+Release: 2%{?dist}
+Summary: KDE Window manager
 
 # all sources are effectively GPLv2+, except for:
 # scripts/enforcedeco/contents/code/main.js
 # KDE e.V. may determine that future GPL versions are accepted
-License:        GPLv2 or GPLv3
-URL:            https://projects.kde.org/projects/kde/workspace/kwin
+License: GPLv2 or GPLv3
+URL:     https://projects.kde.org/projects/kde/workspace/kwin
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -22,17 +22,19 @@ URL:            https://projects.kde.org/projects/kde/workspace/kwin
 %else
 %global stable stable
 %endif
-Source0:        http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
 
 %global majmin_ver %(echo %{version} | cut -d. -f1,2)
 
 ## upstream patches
+Patch3: 0003-decorations-Delay-closeWindow-to-next-event-cycle.patch
 
 ## upstreamable patches
 
 # Base
-BuildRequires:  kf5-rpm-macros
+BuildRequires:  cmake
 BuildRequires:  extra-cmake-modules
+BuildRequires:  kf5-rpm-macros
 
 # Qt
 BuildRequires:  qt5-qtbase-devel
@@ -251,6 +253,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.2-2
+- .spec cosmetics, backport kwin/aurorae crasher fix (kde#346857)
+
 * Thu Oct 01 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.2-1
 - 5.4.2