diff --git a/.gitignore b/.gitignore index 97c9d64..7a601fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/kwin-5.2.2.tar.xz -/kwin-5.2.95.tar.xz -/kwin-5.3.0.tar.xz -/kwin-5.3.1.tar.xz -/kwin-5.3.2.tar.xz -/kwin-5.4.0.tar.xz +/kwin-5.4.1.tar.xz diff --git a/kwin-5.4.0-delete-the-quit-process-not-useractionsmenu.patch b/kwin-5.4.0-delete-the-quit-process-not-useractionsmenu.patch deleted file mode 100644 index 918f85e..0000000 --- a/kwin-5.4.0-delete-the-quit-process-not-useractionsmenu.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Thomas Lübking -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(&QProcess::finished), this, &QProcess::deleteLater); -+ connect(p, static_cast(&QProcess::finished), p, &QProcess::deleteLater); - connect(p, static_cast(&QProcess::error), this, - [p] (QProcess::ProcessError e) { - if (e == QProcess::FailedToStart) { - diff --git a/kwin.spec b/kwin.spec index 98199b3..db26cfc 100644 --- a/kwin.spec +++ b/kwin.spec @@ -6,8 +6,8 @@ %endif Name: kwin -Version: 5.4.0 -Release: 4%{?dist} +Version: 5.4.1 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -25,7 +25,6 @@ URL: https://projects.kde.org/projects/kde/workspace/kwin 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 @@ -251,6 +250,9 @@ fi %changelog +* Wed Sep 09 2015 Rex Dieter - 5.4.1-1 +- 5.4.1 + * Wed Sep 02 2015 Rex Dieter 5.4.0-4 - versioned kf5-kwayland dep too - make kwayland-integration dep arch'd diff --git a/sources b/sources index 61c1fd9..4fa5a41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f92fbd1829df43755dc7cefc87d1e1d kwin-5.4.0.tar.xz +91e85616bd899d2a610311b2ca1de622 kwin-5.4.1.tar.xz