diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-08-22 22:31:30 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-08-22 22:31:45 +0200 |
commit | 19205cda205f5f66ebd4cf18ee4627a7b268d2bb (patch) | |
tree | e3f645c912b0abd24e917b01f71316bd22676d1e /kde-apps | |
parent | dev-db/mysql: use app-arch/zstd from system (diff) | |
download | gentoo-19205cda205f5f66ebd4cf18ee4627a7b268d2bb.tar.gz gentoo-19205cda205f5f66ebd4cf18ee4627a7b268d2bb.tar.bz2 gentoo-19205cda205f5f66ebd4cf18ee4627a7b268d2bb.zip |
kde-apps/yakuake: Fix fullscreen mode regression
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=424286
Reported-by: Agostino Sarubbo <ago@gentoo.org>
Bug: https://bugs.gentoo.org/736858
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps')
-rw-r--r-- | kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch | 37 | ||||
-rw-r--r-- | kde-apps/yakuake/yakuake-20.04.3-r1.ebuild | 60 |
2 files changed, 97 insertions, 0 deletions
diff --git a/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch b/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch new file mode 100644 index 000000000000..21b26ab00916 --- /dev/null +++ b/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch @@ -0,0 +1,37 @@ +From 21b2d50d4c23cd375acda57ed03af288ae0651af Mon Sep 17 00:00:00 2001 +From: Anton Karmanov <bergertroll@insiberia.net> +Date: Thu, 16 Jul 2020 23:34:16 +0500 +Subject: [PATCH] Fix fullscreen mode regression + +BUG: 424286 +(cherry picked from commit 946ecc7fb569244f78f8658148b3bef9911a5af4) +--- + app/mainwindow.cpp | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp +index d8303bd..2d22a9d 100644 +--- a/app/mainwindow.cpp ++++ b/app/mainwindow.cpp +@@ -1136,14 +1136,13 @@ void MainWindow::wmActiveWindowChanged() + + void MainWindow::changeEvent(QEvent* event) + { +- if (event->type() == QEvent::WindowStateChange) +- { +- if ((windowState() & Qt::WindowMaximized)) +- { ++ if (event->type() == QEvent::WindowStateChange && !m_isFullscreen) { ++ if (windowState().testFlag(Qt::WindowMaximized)) { + // Don't alter settings to new size so unmaximizing restores previous geometry. + setWindowGeometry(100, 100, Settings::position()); + setWindowState(Qt::WindowMaximized); +- } else { ++ } ++ else { + setWindowGeometry(Settings::width(), Settings::height(), Settings::position()); + } + } +-- +GitLab + diff --git a/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild b/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild new file mode 100644 index 000000000000..078df4340358 --- /dev/null +++ b/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PVCUT=$(ver_cut 1-3) +KFMIN=5.70.0 +QTMIN=5.14.2 +inherit ecm kde.org + +DESCRIPTION="Quake-style terminal emulator based on konsole" +HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake" + +LICENSE="GPL-2 LGPL-2" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="absolute-position X" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/konsole-${PVCUT}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-fix-fullscreen-mode-regression.patch ) # bug 736858 + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package absolute-position KF5Wayland) + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} |