diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-18 01:04:52 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-18 01:04:52 +0200 |
| commit | 48e8257aef51fc51bee5e605b2541f235b2ba6c6 (patch) | |
| tree | b871b4de97e0ae4b7d164724bff06bce6065095b /kde-misc/yakuake | |
| parent | www-plugins/chrome-binary-plugins: automated update (62.0.3202.62, 62.0.3202.... (diff) | |
| download | gentoo-48e8257aef51fc51bee5e605b2541f235b2ba6c6.tar.gz gentoo-48e8257aef51fc51bee5e605b2541f235b2ba6c6.tar.bz2 gentoo-48e8257aef51fc51bee5e605b2541f235b2ba6c6.zip | |
kde-misc/yakuake: Drop wayland fix that broke X
Gentoo-bug: 634416
Package-Manager: Portage-2.3.11, Repoman-2.3.3
Diffstat (limited to 'kde-misc/yakuake')
| -rw-r--r-- | kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch | 28 | ||||
| -rw-r--r-- | kde-misc/yakuake/yakuake-3.0.4-r2.ebuild (renamed from kde-misc/yakuake/yakuake-3.0.4-r1.ebuild) | 1 |
2 files changed, 0 insertions, 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 cce53b8ac612..000000000000 --- 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@kde.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 index 937b781bd665..e82c0cbc12da 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" ) |