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 9F661158087 for ; Sat, 22 Jan 2022 12:20:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 873552BC024; Sat, 22 Jan 2022 12:20:33 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E435D2BC024 for ; Sat, 22 Jan 2022 12:20:32 +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 7B5E53430C9 for ; Sat, 22 Jan 2022 12:20:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 978E62A3 for ; Sat, 22 Jan 2022 12:20:29 +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: <1642853144.16ef3978955c80e44daf8ccfb2c68463d4aefede.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/, dev-qt/qtwayland/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwayland/Manifest dev-qt/qtwayland/files/qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild X-VCS-Directories: dev-qt/qtwayland/files/ dev-qt/qtwayland/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 16ef3978955c80e44daf8ccfb2c68463d4aefede X-VCS-Branch: master Date: Sat, 22 Jan 2022 12:20:29 +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: 8b77bc33-c7d3-46cc-842d-d6e44ffa306a X-Archives-Hash: a52a0097277c75399019feba3a5ab19c commit: 16ef3978955c80e44daf8ccfb2c68463d4aefede Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 22 12:04:42 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 22 12:05:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ef3978 dev-qt/qtwayland: Drop 5.15.2-r16 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwayland/Manifest | 1 - ...-fix-crash-when-iterating-through-outputs.patch | 36 ---------------- dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild | 48 ---------------------- 3 files changed, 85 deletions(-) diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 343c801c49a2..b5b66bd5c2dd 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,3 +1,2 @@ DIST qtwayland-5.15.2-4644d51f.tar.gz 831697 BLAKE2B c3d60416ef71030018918ec5157122e2585d270d5aa1a74d66874a33f14f0c4ac85da5a1dd7bfb422a1090f79e5d2c08763c68fe724416b34bad16f945d1740c SHA512 e350396e9bdfa6f0fda938af74c722792d50473eb3d786442ba11919e7801f0cd8d045916c8e49d8a63ffd966376cb74e7cc1c3d4d1732e71061fb8343a497d3 DIST qtwayland-5.15.2-867540b9.tar.gz 830061 BLAKE2B b831288d6a3e671631b4df00eb1edb72e35128f3ed5a73983b3e15193f554fddcd0337deb832d44b795d2e37f0601fe35b8b0fcb5986bcc44154d172f3a54193 SHA512 b834802811d9f65559ef5e7468189b53c666e390aa09edeb490e5fee2dece13082b11da0f8b5924b89f7dc8e1eba375a485940f4dfbf0445f3d1e96033e33f24 -DIST qtwayland-5.15.2-eb422ab5.tar.gz 829140 BLAKE2B e913e481741b23873a88db32896c7f3445a2ddee2dc9cfdf8e132fdd79021de369506e32ce9ed50977fb1c42d624169b7d67c9247f7609276e699e5ab3a9462e SHA512 b5094b00feab5909b4de6382a3633fc321d5f5fbc34e4cbde1f364123b24990df95cef5c34a90f73dca67b0578e0da71b894f771ebbd8d152dcdc71b114d9773 diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch deleted file mode 100644 index cf37737e0226..000000000000 --- a/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 46ed85a80b28d519cf5887bbdce55d1bf57886c3 Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Sun, 14 Nov 2021 13:54:19 +0000 -Subject: [PATCH] Client: Avoid processing of events when showing windows - -The only time we want to dispatch events from the wayland socket is when -the application is waiting for external events. Doing so at any other -time will cause unpredictable behavior in client code. - -This caused a crash downstream where we had outputs get altered whilst -itterating through outputs, which shouldn't happen. - -There is no benefit to flushing here, it won't make anything appear -faster as we haven't attached the buffer yet. - -Change-Id: Ie13eae4012dab96a93d8810f468d1343402b8c28 -Reviewed-by: Qt CI Bot -Reviewed-by: Aleix Pol Gonzalez ---- - src/client/qwaylandwindow.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index 635c92a08..b0d1c0d1c 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -477,7 +477,6 @@ void QWaylandWindow::setVisible(bool visible) - if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip) - activePopups << this; - initWindow(); -- mDisplay->flushRequests(); - - setGeometry(windowGeometry()); - // Don't flush the events here, or else the newly visible window may start drawing, but since --- -2.16.3 diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild deleted file mode 100644 index cb1a79288c53..000000000000 --- a/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_COMMIT=eb422ab5e07498a7a8d086f6a942ee35ab3c9776 -inherit qt5-build - -DESCRIPTION="Wayland platform plugin for Qt" -SLOT=5/${QT5_PV} # bug 815646 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -IUSE="vulkan X" - -DEPEND=" - dev-libs/wayland - =dev-qt/qtcore-${QT5_PV}*:5= - =dev-qt/qtdeclarative-${QT5_PV}*:5= - =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?] - media-libs/libglvnd - vulkan? ( dev-util/vulkan-headers ) - X? ( - =dev-qt/qtgui-${QT5_PV}*[-gles2-only] - x11-libs/libX11 - x11-libs/libXcomposite - ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-util/wayland-scanner -" - -PATCHES=( - "${FILESDIR}"/${P}-fix-crash-when-iterating-through-outputs.patch # KDE-bug 438839 -) - -src_configure() { - local myqmakeargs=( - -- - $(qt_use vulkan feature-wayland-vulkan-server-buffer) - $(qt_use X feature-xcomposite-egl) - $(qt_use X feature-xcomposite-glx) - ) - qt5-build_src_configure -}