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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6593B1581C1 for ; Tue, 9 Jul 2024 14:35:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A14C9E2AE7; Tue, 9 Jul 2024 14:35:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82FBFE2AE7 for ; Tue, 9 Jul 2024 14:35:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE82C335DC3 for ; Tue, 9 Jul 2024 14:35:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9BAE1DFB for ; Tue, 9 Jul 2024 14:35:07 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1720535670.6ee50c5f09b80ba9c8990f9fbff084dc378dc4e0.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/files/, dev-qt/qtwayland/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch dev-qt/qtwayland/qtwayland-6.7.2-r1.ebuild dev-qt/qtwayland/qtwayland-6.7.2.ebuild X-VCS-Directories: dev-qt/qtwayland/files/ dev-qt/qtwayland/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 6ee50c5f09b80ba9c8990f9fbff084dc378dc4e0 X-VCS-Branch: master Date: Tue, 9 Jul 2024 14:35:07 +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: aaf1e02b-04ca-4e0d-b6de-fa4d4d8645a8 X-Archives-Hash: 2e569d2e00ee9da1d142c959ee8ccf07 commit: 6ee50c5f09b80ba9c8990f9fbff084dc378dc4e0 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jul 9 14:29:24 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jul 9 14:34:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee50c5f dev-qt/qtwayland: backport regression fix for plasmashell Straight-to-stable given kind of a trival+important fix and want to avoid a double stablereq bug while 6.7.2 is still being stabilized. Signed-off-by: Ionen Wolkens gentoo.org> .../files/qtwayland-6.7.2-plasma-popup.patch | 25 ++++++++++++++++++++++ ...land-6.7.2.ebuild => qtwayland-6.7.2-r1.ebuild} | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch new file mode 100644 index 000000000000..25c7918a5a8b --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-6.7.2-plasma-popup.patch @@ -0,0 +1,25 @@ +Fixed in qtwayland-6.7.3 + +https://mail.kde.org/pipermail/distributions/2024-July/001512.html +https://invent.kde.org/qt/qt/qtwayland/-/commit/92bcb8f6b7a852c7a5d662fc34de561692a7a454 +From: Vlad Zahorodnii +Date: Thu, 20 Jun 2024 11:25:06 +0300 +Subject: [PATCH] Client: Ensure that guessed popup parent has a shell surface + +The last input window may not have a shell surface if it is a subsurface +or that window has been just made invisible. +--- a/src/client/qwaylandwindow.cpp ++++ b/src/client/qwaylandwindow.cpp +@@ -1157,8 +1157,10 @@ QWaylandWindow *QWaylandWindow::guessTransientParent() const + return mTopPopup; + } + +- if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) +- return display()->lastInputWindow(); ++ if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) { ++ if (auto lastInputWindow = display()->lastInputWindow()) ++ return closestShellSurfaceWindow(lastInputWindow->window()); ++ } + + return nullptr; + } diff --git a/dev-qt/qtwayland/qtwayland-6.7.2.ebuild b/dev-qt/qtwayland/qtwayland-6.7.2-r1.ebuild similarity index 96% rename from dev-qt/qtwayland/qtwayland-6.7.2.ebuild rename to dev-qt/qtwayland/qtwayland-6.7.2-r1.ebuild index 1d847bfe9c81..954acc3d10d2 100644 --- a/dev-qt/qtwayland/qtwayland-6.7.2.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.7.2-r1.ebuild @@ -28,6 +28,10 @@ DEPEND=" " BDEPEND="dev-util/wayland-scanner" +PATCHES=( + "${FILESDIR}"/${P}-plasma-popup.patch +) + CMAKE_SKIP_TESTS=( # segfaults for not-looked-into reasons, but not considered # an issue given >=seatv5 exists since wayland-1.10 (2016)