From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- dev-qt/qtwayland/Manifest | 7 ++-- ...-fix-crash-when-iterating-through-outputs.patch | 36 ++++++++++++++++ dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild | 42 ------------------- dev-qt/qtwayland/qtwayland-5.15.2-r15.ebuild | 44 -------------------- dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild | 48 ++++++++++++++++++++++ 5 files changed, 87 insertions(+), 90 deletions(-) create mode 100644 dev-qt/qtwayland/files/qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch delete mode 100644 dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild delete mode 100644 dev-qt/qtwayland/qtwayland-5.15.2-r15.ebuild create mode 100644 dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild (limited to 'dev-qt/qtwayland') diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 379cb131ed6f..7f206b3bd4d8 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,5 +1,4 @@ -DIST qtwayland-5.15.2-992833ca.tar.gz 829101 BLAKE2B a00cce48b06b9537561e51598dceb3b2cf2f77ccba869b726b7ac473764dd64024ef759a8d46dd3f3e1161c27fcb1c70ce20a5c3d6f2e9938950cd38f84bc2c2 SHA512 3520a7b8b27703b3306a5e852498c1805f359e09d2622ed53b5ee2038e6e99d3d0132f47d78167cdf4a1d1f0d4955f8440cec897fcc4dc24f7d3a3a7a493c584 -DIST qtwayland-5.15.2-efe6edca.tar.gz 829293 BLAKE2B 6ccc5a4e111818cc65855eb4570727f30932bec9a749069550d07332df719eaeec0baf472c025150a32c9c380294f5e9496ad3babd181887a02fc37d1bfd5f2a SHA512 87190cd1ade57c98da972a2f5d48aa0376ccc4bfa589f5832b8a62a63b3eafa6acf88d812ae98c484d4b02878ae2c1986c3759c0ba3f46894c76af713d7b8346 -EBUILD qtwayland-5.15.2-r14.ebuild 947 BLAKE2B 070d7d6ca6b8dde6e64bb8c582b3a946b04a3e308dd63befced14f781fb6b9c0d372ba052ca95451f3ebf9287c238f22302e9e8c254eaeb0044e950721835d78 SHA512 5d688eab3936bf5e83c42343ec0e80b01c390c78026752c53edb3352d5904cd691908748d7a1555e6c5e87aed9d419c4e13bc8e974f4f93441a53f86542c5cbf -EBUILD qtwayland-5.15.2-r15.ebuild 960 BLAKE2B de634c9be1e9ff8c0e8d36d145293dfd2c9a494c5a963416b49077db8654e58f18441552495d2424a099056a2e8f9da59ec3c68cfad9cd297044a2e6731c89d0 SHA512 be42c15847f05f42c103096bab930a0a47fec82be74bbb6cc0c940ef24cf0dad3faa06f55117ab6107d08ecf64d1a3d975a6469538840e71eb67b66c6c942244 +AUX qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch 1471 BLAKE2B d1f46af1c39967a04f10f887dc02c055fff30e8e88349ec1a009090df8ce27899c8c08e1c9cbb4584fb0861e734f4e3ae74ad994f8d902de4bd2dcc6523ec765 SHA512 1c231dd3b86e75e92ae488a176ae8c0317b9e889dc2a21c239a97823ca4eb8deab6a0e6c4011050d8a01f5414b2c70e962de9b974a05ffe96e8dd44630fd9fea +DIST qtwayland-5.15.2-eb422ab5.tar.gz 829140 BLAKE2B e913e481741b23873a88db32896c7f3445a2ddee2dc9cfdf8e132fdd79021de369506e32ce9ed50977fb1c42d624169b7d67c9247f7609276e699e5ab3a9462e SHA512 b5094b00feab5909b4de6382a3633fc321d5f5fbc34e4cbde1f364123b24990df95cef5c34a90f73dca67b0578e0da71b894f771ebbd8d152dcdc71b114d9773 +EBUILD qtwayland-5.15.2-r16.ebuild 1051 BLAKE2B c55f2cecbb7b982b335c4faab58b08de69c52f72516da981c72dae5f6dbe8c7bb75623161b223670022fd323ff3ef9f7c4d85246a7940bb30b2835534cca2099 SHA512 a245da56e2acd5a90dd5c820f50e3676c90bb38a46de9caafe24138e031b796264944f0f0241bab744b6f33535a5b49d840d8bbc54109159cc59a8d1bfcebe8b MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2 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 new file mode 100644 index 000000000000..cf37737e0226 --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch @@ -0,0 +1,36 @@ +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-r14.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild deleted file mode 100644 index 3fa36666cf6f..000000000000 --- a/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_COMMIT=efe6edcaf8eba601dff99ec6ad4457c8a4442f86 -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 - >=x11-libs/libxkbcommon-0.2.0 - vulkan? ( dev-util/vulkan-headers ) - X? ( - =dev-qt/qtgui-${QT5_PV}*[-gles2-only] - x11-libs/libX11 - x11-libs/libXcomposite - ) -" -RDEPEND="${DEPEND}" - -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 -} diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r15.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r15.ebuild deleted file mode 100644 index ea619cd58e78..000000000000 --- a/dev-qt/qtwayland/qtwayland-5.15.2-r15.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_COMMIT=992833ca741efe8f533c61abfaf129a1d8bfcfee -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 -" - -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 -} diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild new file mode 100644 index 000000000000..cb1a79288c53 --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild @@ -0,0 +1,48 @@ +# 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 +} -- cgit v1.2.3