[gentoo-commits] repo/gentoo:master commit in: kde-misc/yakuake/, kde-misc/yakuake/files/

[Andreas Sturmlechner]

commit:     48e8257aef51fc51bee5e605b2541f235b2ba6c6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 23:04:52 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 23:04:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e8257a

kde-misc/yakuake: Drop wayland fix that broke X

Gentoo-bug: 634416
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch | 28 ----------------------
 ...ake-3.0.4-r1.ebuild => yakuake-3.0.4-r2.ebuild} |  1 -
 2 files changed, 29 deletions(-)

diff --git a/kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch b/kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch
deleted file mode 100644
index cce53b8ac61..00000000000
--- a/kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3cdc1d0654dcd8e6eb3fc01d95fcccafe68cbb47 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@×××.org>
-Date: Thu, 12 Oct 2017 18:41:58 +0200
-Subject: Fix (my) yakuake on a wayland session
-
-KWindowSystem::activeWindow and winId are two entirely different things.
-
-Reviewed by Eike
----
- app/mainwindow.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
-index 6fa9160..028bb9c 100644
---- a/app/mainwindow.cpp
-+++ b/app/mainwindow.cpp
-@@ -1023,7 +1023,7 @@ void MainWindow::wmActiveWindowChanged()
-         return;
-     }
- 
--    if (!Settings::keepOpen() && isVisible() && KWindowSystem::activeWindow() != winId()) {
-+    if (!Settings::keepOpen() && hasFocus()) {
-         toggleWindowState();
-     }
- }
--- 
-cgit v0.11.2
-

diff --git a/kde-misc/yakuake/yakuake-3.0.4-r1.ebuild b/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild
similarity index 97%
rename from kde-misc/yakuake/yakuake-3.0.4-r1.ebuild
rename to kde-misc/yakuake/yakuake-3.0.4-r2.ebuild
index 937b781bd66..e82c0cbc12d 100644
--- a/kde-misc/yakuake/yakuake-3.0.4-r1.ebuild
+++ b/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild
@@ -50,5 +50,4 @@ PATCHES=(
 	"${FILESDIR}/${P}-qicon.patch"
 	"${FILESDIR}/${P}-qt-5.9-wayland.patch"
 	"${FILESDIR}/${P}-qdbus-crash.patch"
-	"${FILESDIR}/${P}-wayland.patch"
 )