Add upstream crash fix, install kwayland-integration for kwin-wayland

epel9
Dan Vrátil 10 years ago
parent 1d293a7ece
commit 6366a16242

Binary file not shown.

@ -0,0 +1,25 @@
From: Thomas Lübking <thomas.luebking@gmail.com>
Date: Sun, 23 Aug 2015 18:56:10 +0000
Subject: delete the quit process, not UserActinsMenu
X-Git-Url: http://quickgit.kde.org/?p=kwin.git&a=commitdiff&h=a97b6e0fd6a5eff53e3fccff825998feb4026a34
---
delete the quit process, not UserActinsMenu
BUG: 351643
FIXED-IN: 5.4.1
REVIEW: 124895
---
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -314,7 +314,7 @@
p->setArguments(args);
p->setProcessEnvironment(kwinApp()->processStartupEnvironment());
p->setProgram(QStringLiteral("kcmshell5"));
- connect(p, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &QProcess::deleteLater);
+ connect(p, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), p, &QProcess::deleteLater);
connect(p, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error), this,
[p] (QProcess::ProcessError e) {
if (e == QProcess::FailedToStart) {

@ -7,7 +7,7 @@
Name: kwin
Version: 5.4.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: KDE Window manager
# all sources are effectively GPLv2+, except for:
@ -24,9 +24,10 @@ URL: https://projects.kde.org/projects/kde/workspace/kwin
%endif
Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
## upstream patches
Patch10: kwin-5.4.0-delete-the-quit-process-not-useractionsmenu.patch
## upstreamable patches
# session management, https://git.reviewboard.kde.org/r/123580/
# followup to add discard support
# Base
BuildRequires: kf5-rpm-macros
@ -117,6 +118,7 @@ Provides: firstboot(windowmanager) = kwin
%package wayland
Summary: KDE Window Manager with experimental Wayland support
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: kwayland-integration >= %{version}
# libkdeinit5_kwin*
%{?kf5_kinit_requires}
%description wayland
@ -243,6 +245,10 @@ fi
%changelog
* Tue Aug 25 2015 Daniel Vrátil <dvratil@redhat.com> - 5.4.0-2
- add upstream patch to fix crash
- make sure kwayland-integration is installed for kwin-wayland
* Fri Aug 21 2015 Daniel Vrátil <dvratil@redhat.com> - 5.4.0-1
- Plasma 5.4.0

Loading…
Cancel
Save