From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6CF28138359 for ; Sat, 22 Aug 2020 20:32:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84953E082D; Sat, 22 Aug 2020 20:32:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57526E082D for ; Sat, 22 Aug 2020 20:32:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BE60340E64 for ; Sat, 22 Aug 2020 20:32:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D06C931A for ; Sat, 22 Aug 2020 20:32:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1598128305.19205cda205f5f66ebd4cf18ee4627a7b268d2bb.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/, kde-apps/yakuake/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch kde-apps/yakuake/yakuake-20.04.3-r1.ebuild X-VCS-Directories: kde-apps/yakuake/files/ kde-apps/yakuake/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 19205cda205f5f66ebd4cf18ee4627a7b268d2bb X-VCS-Branch: master Date: Sat, 22 Aug 2020 20:32:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ceb0af3-569e-42f0-8e42-78589eb6d560 X-Archives-Hash: 085fb3b0fbc5b9fd894778ac0ca16995 commit: 19205cda205f5f66ebd4cf18ee4627a7b268d2bb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 22 20:31:30 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 22 20:31:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19205cda kde-apps/yakuake: Fix fullscreen mode regression KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=424286 Reported-by: Agostino Sarubbo gentoo.org> Bug: https://bugs.gentoo.org/736858 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> ...ke-20.04.3-fix-fullscreen-mode-regression.patch | 37 +++++++++++++ kde-apps/yakuake/yakuake-20.04.3-r1.ebuild | 60 ++++++++++++++++++++++ 2 files changed, 97 insertions(+) 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 00000000000..21b26ab0091 --- /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 +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 00000000000..078df434035 --- /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 +}