diff options
Diffstat (limited to 'dev-qt/qtwayland')
| -rw-r--r-- | dev-qt/qtwayland/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch | 29 | ||||
| -rw-r--r-- | dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild (renamed from dev-qt/qtwayland/qtwayland-6.7.2-r2.ebuild) | 1 |
3 files changed, 32 insertions, 1 deletions
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 6ba1294e779b..388fc3934a59 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,4 +1,5 @@ AUX qtwayland-6.7.2-drag-drop.patch 2349 BLAKE2B e22347050b017831c8039700dc3658c468e2e4577df2e9afabd73574b311c3f8c2ed5ca40138cd9b4bdf1e2bb9e4c5333ab2856a1a46e879ca84308f7cf585d4 SHA512 ea6780aed6ec30dae53e73d7be9329b1daa59db704c6d32aff776a72b12411fa1a0d4376d1bf295a57df9761e2f81d3644d626d37f7a7490324ee79dbd23ce5d +AUX qtwayland-6.7.2-null-screen.patch 1208 BLAKE2B 7ccc921245d3dccb1c3ea440becc85959bf94fa0b7836097c862f966396d68850af660531edcdd4637ac2a752a8bf50bdca6260ceb753b921eee85783d4ab714 SHA512 b3336eb707abafc8928893ac3e61c708a7cb43873b2fdb1576ac6dc6c74b52d9ca45d80c30f3d5fb8d374fb72fbb19cb7b0b799528f820bcda87704375841516 AUX qtwayland-6.7.2-plasma-popup.patch 1032 BLAKE2B 81a0c2dceac3bde808f463d0d2ad6159fd362528b2b37ed018283a05e4d317f6d31fcf87815e2b041aece5f49ae60bd4dfd7a2861aa2ea71f914343e6ff422ad SHA512 c5a63dfd9ff7a3a36bc7fce76b7c6b7ceb12b03dd9f758690cbfca715afc8989c747b4a535749ee44f6827e3af576d614050e0672263a32b420dd37aee008fb0 AUX qtwayland-6.7.2-thread-safety.patch 2420 BLAKE2B 4e5d871bd93a24cc2bb5c879a9eb336aacbfe20c3a6df15777ccdfb41a4d2b84484097a7d0680a5c02631cb84864259cdc9e68d04b0ab654275bd73ec92700b8 SHA512 18978aac57472575ee2dbcd44d1dbb7d21e6a116589cd78d9530272e0c67c8e730d2bf8272cc92cbd78d460ba710cb408595e11c59dca2649d8565cf4e7b135f DIST qtwayland-5.15.14-gentoo-kde-1.tar.xz 47472 BLAKE2B 3812e5f18bcb857cf3c76cf8a53525a84b14bc4cf8430f4339c1ef9a5d6208dcdfba3f052bcc80c6ad8815db2415207e2eb5ed07bbf9e7076be675f2a4cee3c0 SHA512 912bc902e4f9d945dac396c75a2af9896e3002535a51e6b5b07166c38b9d6ea073da3d93db07742a0db295dd5f8167fdef351230adcb2145704c36b576c0f5e3 @@ -6,7 +7,7 @@ DIST qtwayland-everywhere-opensource-src-5.15.14.tar.xz 560916 BLAKE2B a5edb2144 DIST qtwayland-everywhere-src-6.7.2.tar.xz 1123220 BLAKE2B 70c2d8942afc4e1629d2ef34b6c062ecb5800185bb37e150c1d66a5216606028d2f59668991bddb5036572c962e92c3658d336167a7f9ffbf3d2f4d609a771f9 SHA512 2cd4f45f05ae60bc7f82b94f2e9c217ee4b8322f60381e1b079b90e0687e51cfbeb10b5dd724e1cca7e422b1b101d2b91c0ee47b1a732411cef330fb052c97c2 EBUILD qtwayland-5.15.14.ebuild 1214 BLAKE2B 4d974a96e807dfbad6bf480bb6faf022828c9cab0fd5bc82b6c6455344fafd7a349f1f232fa62a00e32cc073cda39aead004657e7b4072f49890442baeda3252 SHA512 75966f4a890e77a29937d63ed50a8095d579fab4871f2d091bb410443a0101fabc592a6cfbe033b12d6f0663c196930a32c85a062a10de4f8dc13eee4103b86b EBUILD qtwayland-6.7.2-r1.ebuild 1527 BLAKE2B efe529b2925dc1ec8ce987a3eed243afcece1963d84345aeb1b758d5fbbe59d29c06229eaa4ee88f9fd2f776ed9f34136f9c0750b9be3bbc1fcad93fc076ec14 SHA512 001a07a9ee53545f18ca970c9dc7caece8055a1eb559d6e52fc0a1c5e6c7f9b14ff03098c203d6f1f823283b6b1143edba980258073f0eb884b82e9d570d6026 -EBUILD qtwayland-6.7.2-r2.ebuild 1609 BLAKE2B dc92fd51dd6ddf104845bc682d7b4c1388f59e6c5937a6ef77c37f2e3015adf088ade2276b008bac5bb90b03d7cb83774857bf1e31e0dd2adfb323190dcea29a SHA512 4824a37fe6511187ff0909d1ae086b4f9aa96c5c98fe27a4a0723c54ad257d4d5f6ce0eef0b0c73ee0650a860977dc843bf0f03a6604218e8324dfd7ee0c626e +EBUILD qtwayland-6.7.2-r3.ebuild 1647 BLAKE2B 9c7b25e745214f7c272688fe7a0b574ca3eae1d122e2269da410242b7a86cbcac1217f2c8564ad7bcc6a5e41d49e8a04d8704e0be5955ae2016d5cf22070bd2d SHA512 d14c2b24dc5321d865120aae6aab05e54095ba3ba46456694a6876e6b170a03d30f056e9754392fa94dda019e5a1feaf82abd7d55ab6a0366c0dfac2c78f0b34 EBUILD qtwayland-6.7.9999.ebuild 1229 BLAKE2B a2ef0eece20a69fae358c8c0e22dd05c7d5a04cdd508e1ecb90883c87a6bc365db6443413e7a2150282d26ba8666361b281bd261f5f7a34b0bff24abf96bb723 SHA512 9465226c56e239182b87812bf532ba63e2632830d24e5b7aff53160ba587834bdb7faf9dde05da61084e0a44551cbbbd5599f0988ed92c0e0bc77a016a0ce289 EBUILD qtwayland-6.8.9999.ebuild 1604 BLAKE2B 955233e9dce7287eab5e8ccb13b548e44bc31dc71a195f665c1422a33045a309a131cf4443714a31799a2c1a387fc0ffc1d4f653c6b7bd25de77cae8f92c2e68 SHA512 374607e7b5f0e65e89ce1dc9e2cb714212a876c556826ca92cfb347a6a7bea8dd2f94e3455dd3e2fd66cf16a5e23350e2ca4fb316139626eb0c7bc46f66fb800 EBUILD qtwayland-6.9999.ebuild 1604 BLAKE2B 955233e9dce7287eab5e8ccb13b548e44bc31dc71a195f665c1422a33045a309a131cf4443714a31799a2c1a387fc0ffc1d4f653c6b7bd25de77cae8f92c2e68 SHA512 374607e7b5f0e65e89ce1dc9e2cb714212a876c556826ca92cfb347a6a7bea8dd2f94e3455dd3e2fd66cf16a5e23350e2ca4fb316139626eb0c7bc46f66fb800 diff --git a/dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch b/dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch new file mode 100644 index 000000000000..6a7e85a8f4b6 --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-6.7.2-null-screen.patch @@ -0,0 +1,29 @@ +Backport of [1] for [2], will be fixed in qtwayland-6.7.3. + +[1] https://codereview.qt-project.org/c/qt/qtwayland/+/576718 +[2] https://bugs.kde.org/show_bug.cgi?id=489072 + +From: David Edmundson <davidedmundson@kde.org> +Date: Wed, 10 Jul 2024 09:00:33 +0100 +Subject: [PATCH] client: Guard against windows being on a null screen + +calculateScreenFromSurfaceEvents uses the screen information from our +surface enter events. If this is not set yet, or refers to outputs not +yet complete we fall back to the QWindow::screen. This was introduced in +e03613524fc9f6be5c4cd7e9bdb00bc09c7f1e0b. + +It was assumed that this would always be a valid value as QtBase keeps +it updated, but there are apparently paths for it to still be null. + +It will be evaluated again when the surface receives a wl_enter event or +the output that we have entered is finally initialised and we will then +be marked as on the correct screen. +--- a/src/client/qwaylandwindow.cpp ++++ b/src/client/qwaylandwindow.cpp +@@ -1406,5 +1406,5 @@ + QPlatformScreen *newScreen = calculateScreenFromSurfaceEvents(); + +- if (newScreen->screen() == window()->screen()) ++ if (!newScreen || newScreen->screen() == window()->screen()) + return; + diff --git a/dev-qt/qtwayland/qtwayland-6.7.2-r2.ebuild b/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild index eab3c3a8d3a5..7124b7617bf1 100644 --- a/dev-qt/qtwayland/qtwayland-6.7.2-r2.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.7.2-r3.ebuild @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-plasma-popup.patch "${FILESDIR}"/${P}-drag-drop.patch "${FILESDIR}"/${P}-thread-safety.patch + "${FILESDIR}"/${P}-null-screen.patch ) CMAKE_SKIP_TESTS=( |