diff options
Diffstat (limited to 'dev-qt/qtwayland')
| -rw-r--r-- | dev-qt/qtwayland/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qtwayland/files/qtwayland-5.15.8-KDEBUG-466674.patch | 33 | ||||
| -rw-r--r-- | dev-qt/qtwayland/qtwayland-5.15.8-r2.ebuild (renamed from dev-qt/qtwayland/qtwayland-5.15.8-r1.ebuild) | 2 |
3 files changed, 37 insertions, 1 deletions
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index ce6b8e5bed5d..7c74091eb807 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,8 +1,9 @@ +AUX qtwayland-5.15.8-KDEBUG-466674.patch 1292 BLAKE2B 3330c420c0d940143fd231f9adc1373981b123396756ba986610d2d591f46ab0fe9c9a682f185fc3de6f59dfe8f73239d524dba91b729ec6f6169cac1aaa071c SHA512 5613a0fc404bf578f3ad67d206fe7a312f5fac14ce5939ae94153354ee3f7cf5d522d5787450c064bbec4ec5981ab8566f4f3495e02acc560579cf7c85b2dbb4 DIST qtwayland-5.15.8-gentoo-kde-1.tar.xz 44488 BLAKE2B bfdd7c2959eb99e115eaf01d617464359a549513958c997dd8b1a86bda755dec44d24b6619650bf385b2894a2001a712a344b093fc94e8cde40ac9c20323903e SHA512 3cd52fc78f2451c38c6d2b0dd958895016a94b255e38ff3909f40e4bcb1ef760332fde4cffd32ab11e868ce0afe6629f325613c88b8fd85ca28f1583194ce229 DIST qtwayland-5.15.8-gentoo-kde-2.tar.xz 46592 BLAKE2B 0f2c460038a5b6f6fb7ea38edf61b392e95caa6356e8c070bde9d7939e20aaee4a45a581e08d04ad34f2a2da6317c2a16c40e58272d0c256fd16f0a1ce6fa34a SHA512 8b6c94e032a35f6ec6400fa292b1c7b864504d5c94d095c20fd41da8576eab4325bf7312b08cca00825aa858e175510b8b37c5877207fb4d60edde99c77c9886 DIST qtwayland-everywhere-opensource-src-5.15.8.tar.xz 568268 BLAKE2B b4e982015e25104b3270b48a180b5726ba85e83fd9616422422d8729dc09bc94bbeecfe2096e388eadb0930e4abfdd3b0349eba2bd1d8f742f0c74b5e72aeac5 SHA512 6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d DIST qtwayland-everywhere-src-6.4.2.tar.xz 836720 BLAKE2B d8a6b84712081097775f083f3887c18eb001fd2beba32b2abc930ec3b932f6f19b347fe2fde3b98f35c1e7e31661974b13468fb176e73bdf557a330c80d847fd SHA512 29d3f3e7fade666bcd3145106f1d782122ac3fcf94811d25917c9f45af0dc8cddb3c2149545344d91e86f86490029555758ed2e180f241703251c22c7ec15122 -EBUILD qtwayland-5.15.8-r1.ebuild 1008 BLAKE2B 3a090b525823841c5aa13162aae1d657feb03603f09b38004266d36c3139201749b89ef8ac4236b4ac9417a43bf2e755ace0429053e821d5e25107ef97425743 SHA512 e40d2b554c95a4c02dd934ccb90ed1f14047d5a2f9b4e2e26ebd9ff7eecb3b34917911aa4d7847683d45a0342d6b8f6b8e765e24cf014c58e2d7d773d8393322 +EBUILD qtwayland-5.15.8-r2.ebuild 1060 BLAKE2B 0d08483aaa43a6c062ecf065fd9147cbeadb0350e0ce58cef70926aff9df46802e6e58ff8e61d9f878c0065d8e0f4db003dda5e06a2f2f0f1cac84f4368f64c5 SHA512 48da251aa914c5f4f71204b797e4c1b7450709a068b3ece8cdcbae8647007bc408f9514b0d1e14c14a2d0acc9822a5acc4dc1d3ba3d21b5e11c4b227dc2e4293 EBUILD qtwayland-5.15.8.ebuild 1002 BLAKE2B 4a77721f71912a69ac8da399cf959dccbf1141a7ba4f2a10e64a5bbfac97be16925a271767a227d84756aa256d0a419a4575a65c98ab402c5fd8bba3991868b6 SHA512 4591113cdcb1cc58cd2740d555243b4ffea4c507a2ef3ce3a06c2982dec8da850256d78347a1843b16455d313f4175d421451f93b6fd00bf387be1f86a01ea7b EBUILD qtwayland-6.4.2.ebuild 438 BLAKE2B b419dc79923c1f81cf59b47d3f95cf43372260430cd16593089229011756c78663d062ce5b23464df27753427257bcea89ed745c0f8f0a4a1b7e7328dad60441 SHA512 a6d1cd0314a2dbcd74e3a4cc3ba2cba7b4145331c0b7617fe387cbeea4d9cb0643ab20d897df6953a21274771d3e64a6e99dce79bf41d33383508fb7b037c32e MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2 diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.8-KDEBUG-466674.patch b/dev-qt/qtwayland/files/qtwayland-5.15.8-KDEBUG-466674.patch new file mode 100644 index 000000000000..06ab3214f770 --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-5.15.8-KDEBUG-466674.patch @@ -0,0 +1,33 @@ +From 5049ff99ea2687919a2246332511a2753c72d3cd Mon Sep 17 00:00:00 2001 +From: Aleix Pol <aleixpol@kde.org> +Date: Mon, 6 Mar 2023 01:11:45 +0100 +Subject: [PATCH] client: Do not cast placeholder screens to QWaylandScreen + +It's wrong to C-cast an object to a class that isn't theirs. Check if it +is a placeholder first. + +Pick-to: 5.15 6.2 6.5 +Change-Id: I45d3c423422ae6638a033fb0f4cfefc7cd4460f0 +Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> +Reviewed-by: David Edmundson <davidedmundson@kde.org> +(cherry picked from commit a53f022393a1276dbf8eccbae04cb0bd6cea0160) +--- + src/client/qwaylandnativeinterface.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp +index bf54a1a00..9763c3123 100644 +--- a/src/client/qwaylandnativeinterface.cpp ++++ b/src/client/qwaylandnativeinterface.cpp +@@ -139,7 +139,7 @@ void *QWaylandNativeInterface::nativeResourceForScreen(const QByteArray &resourc + { + QByteArray lowerCaseResource = resourceString.toLower(); + +- if (lowerCaseResource == "output") ++ if (lowerCaseResource == "output" && !screen->handle()->isPlaceholder()) + return ((QWaylandScreen *) screen->handle())->output(); + + return nullptr; +-- +GitLab + diff --git a/dev-qt/qtwayland/qtwayland-5.15.8-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.8-r2.ebuild index 9cceea0f85cb..b80975a7165f 100644 --- a/dev-qt/qtwayland/qtwayland-5.15.8-r1.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15.8-r2.ebuild @@ -31,6 +31,8 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="dev-util/wayland-scanner" +PATCHES=( "${FILESDIR}/${P}-KDEBUG-466674.patch" ) + src_configure() { local myqmakeargs=( -- |