gentoo auto-resync : 19:09:2023 - 17:09:22

5 files changed, 61 insertions, 116 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 198e8ebd6c12..85e742154635 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,10 +1,9 @@
-AUX qtwayland-5.15.10-QTBUG-95434-convert-cursor-bitmap.patch 2406 BLAKE2B 523c1a932b46c0dccef224a4ecb11e147e32bc6655373d09fa7c3f7d0ca76fbb69284ce764462d8c4261d13acdf6ef65e5a05fac6cf75c23e264ed66ac42d9e1 SHA512 18366b5ede089581a2c1b1a87dd4d5ce3eb5a29606cb36cd9eefe7a4ee2861dfe87fcb75c44d6237b35e87a3c8106f6e78a34244230e0e20f9a808509daa6e86
-AUX qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch 1451 BLAKE2B 63b053f96f4added309a96d33caea1f361087511cb82249864b4a9971794739903e4df1c240c0a42f71295bb0b4f0f48338e6fcadfe9549372d2b581cb2464b6 SHA512 9be539b99cba04e3009a4a61eb5890708f8cafb09161e2d11868bb3a687591d6d4758a13c469ca22b89380cf1a1950d844c25212ead7b64f45ac275db464a051
 AUX qtwayland-6.5.2-drag-drop-segfault.patch 1808 BLAKE2B 2305e54b77d0ffd357b75c50ba41dfc32c03863354478f49bac2fb901d8153fa343234fce81179a54973db2b945bed6741225751698508768ff0a7756cbc088b SHA512 9bbc193952c73771a878fcb6d24fddd45c1f8563f44b392b80e112fe877330c8f2d917097f7f90ea8e4b645b9b70cef96a5b9bb80d5139c6ce6985d2cbe869a9
-DIST qtwayland-5.15.10-gentoo-kde-2.tar.xz 43076 BLAKE2B 735ac875c0957de47f90d08931eaaaf8d53b1db0012c7d0a592c78ae78da56ffc8a1ba9bbac0577a78d4c05a92a22acef51a6afc95db54bea2d1a2a9658b67c4 SHA512 e0131bb1f2a09597a85d1d8a402bcb1d529cbc44f62e9be8dd8eba9c10007ca4f83572ca48052529b2325cdd8d886abed1f96ba4e00768e4b1c2febe1eb5ef91
+DIST qtwayland-5.15.10-gentoo-kde-3.tar.xz 46984 BLAKE2B e0fa3708d1f91599d292d5c84e4285e165cfc14e6dfba420df487e33fb13fba3b19c4e722aa3c658eb6c33e775610a0d1363361a7dd7f67c1d2c275d852b9f4d SHA512 30333d9987311eeba7d970d75806a3fd3682856890b6c8bdf5048761f14c187dcaff45c9fed445a75c594772a2dd174eee39f550fcae25042bc7ab052e0743e1
 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477
-EBUILD qtwayland-5.15.10-r4.ebuild 1353 BLAKE2B 3cab556185c182f4cd8ed280737e1434c51ec1c52719688a2ca5372d81baa5edca8675b22a7c0f9601f7dacec65f54e7e361fd851a2f226dcefaac38180bd9b5 SHA512 0ac3e896cc8c6c717e44dc3119b1c5cf3cc4cc6d22538f837699528c61e29e11a3969538b0518d21c7d7b1362ac81910e9508197076481a51b4bece379f7dca2
+EBUILD qtwayland-5.15.10-r4.ebuild 1394 BLAKE2B 6b0e886f062477f44846655911f39e61a296cdc118ca67cd08890e661e705f92a8cf5d98c5c8e1b50e4a0c52deda6ba2fb8991326b0553d246b2761a6a51bc8d SHA512 d37fdbf9bf9549881ba9eb22ceedec3c88bcf208f20fc3faf99e5d8f9a2208de516e414dc93ea8f9fe6c73d2ea9591960ce44295f18d76537d8bc6e1ba581b41
+EBUILD qtwayland-5.15.10-r5.ebuild 1008 BLAKE2B 86dc986d9fe8b1d474635e86a0eaf3428ed91157d6f58e1d905585cb5308813ab2e46f2d3833f5b4b51e2e49c3d5c7cea35b4b4593ed57f8a8276b15a066c19f SHA512 9951aec219fa8bb6fcbdba6a2e2fe4825ccbb04a98b0a5af0b2beb3525dcde88508583381a4786cd0be7ff8a3ea8f642e3bd4446756015d69bc56566e606f1cd
 EBUILD qtwayland-6.5.2-r3.ebuild 1024 BLAKE2B 051c5c5e6e979b7b8d385bcf0653bbc7366dc45a3f78cf934b29343a40145a91f193c2325f97eae633516c5ec8d7bcffa4f422d8a8d557a28d29eb76e0d36034 SHA512 318426aa080d2f5d43f58836b50995f83a51df4735b85dbe02f5c9fd4413424bfb2a7dec54f79958527d5e83963d6f502404625d9d91f83cf76b8a979af64f78
 EBUILD qtwayland-6.5.9999.ebuild 943 BLAKE2B 1527a7fe4f074ab0d22e1144aa46ccb2356d040777c8d43fb38400c05fd5c4c5b48f90ca06bcd78171ae23cb9bfe65e2764a4c1c32fddc6fcebbba318d0cb83d SHA512 b678155903b89df2e6171ea1a38ae2aca9260f99779935b7af89cca59a14445fbcec71cf49671f3aaf467ab069fbac1c61df4fbb19766229d281786905a5f0d6
 EBUILD qtwayland-6.6.9999.ebuild 943 BLAKE2B 1527a7fe4f074ab0d22e1144aa46ccb2356d040777c8d43fb38400c05fd5c4c5b48f90ca06bcd78171ae23cb9bfe65e2764a4c1c32fddc6fcebbba318d0cb83d SHA512 b678155903b89df2e6171ea1a38ae2aca9260f99779935b7af89cca59a14445fbcec71cf49671f3aaf467ab069fbac1c61df4fbb19766229d281786905a5f0d6
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.10-QTBUG-95434-convert-cursor-bitmap.patch b/dev-qt/qtwayland/files/qtwayland-5.15.10-QTBUG-95434-convert-cursor-bitmap.patch
deleted file mode 100644
index 7b43ee3b2149..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.10-QTBUG-95434-convert-cursor-bitmap.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From dd5c9e2d894ca94faaeef7dfc3cc4344a7f62640 Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn@posteo.de>
-Date: Mon, 20 Feb 2023 14:02:23 +0100
-Subject: [PATCH] Convert cursor bitmap to supported format
-
-The 1-bit image formats QImage::Format_Mono and
-QImage::Format_MonoLSB used by cursor bitmaps don't have
-a corresponding wl_shm_format.
-
-Therefore, convert to a supported image format as necessary
-to make such bitmap cursors work on Wayland as well.
-
-Fixes: QTBUG-95434
-Change-Id: I402fd870b301ddc01075251b66f2cf7cc1923133
-Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-(cherry picked from commit 45ec1362f8fcb5ade92f4d2d4985b1c24e78c8ba)
-
-Backport changes: Use Qt::ReturnByValue version for QCursor::mask() and QCursor::bitmap()
----
- src/client/qwaylandcursor.cpp | 23 ++++++++++++++++++++++-
- 1 file changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/src/client/qwaylandcursor.cpp b/src/client/qwaylandcursor.cpp
-index e4eca9d4e..ba76ba2d0 100644
---- a/src/client/qwaylandcursor.cpp
-+++ b/src/client/qwaylandcursor.cpp
-@@ -44,6 +44,7 @@
- #include "qwaylandshmbackingstore_p.h"
- 
- #include <QtGui/QImageReader>
-+#include <QBitmap>
- #include <QDebug>
- 
- #include <wayland-cursor.h>
-@@ -250,7 +251,27 @@ QWaylandCursor::QWaylandCursor(QWaylandDisplay *display)
- QSharedPointer<QWaylandBuffer> QWaylandCursor::cursorBitmapBuffer(QWaylandDisplay *display, const QCursor *cursor)
- {
-     Q_ASSERT(cursor->shape() == Qt::BitmapCursor);
--    const QImage &img = cursor->pixmap().toImage();
-+
-+    const QBitmap mask = cursor->mask(Qt::ReturnByValue);
-+    QImage img;
-+    if (cursor->pixmap().isNull())
-+        img = cursor->bitmap(Qt::ReturnByValue).toImage();
-+    else
-+        img = cursor->pixmap().toImage();
-+
-+    // convert to supported format if necessary
-+    if (!display->shm()->formatSupported(img.format())) {
-+        if (mask.isNull()) {
-+            img.convertTo(QImage::Format_RGB32);
-+        } else {
-+            // preserve mask
-+            img.convertTo(QImage::Format_ARGB32);
-+            QPixmap pixmap = QPixmap::fromImage(img);
-+            pixmap.setMask(mask);
-+            img = pixmap.toImage();
-+        }
-+    }
-+
-     QSharedPointer<QWaylandShmBuffer> buffer(new QWaylandShmBuffer(display, img.size(), img.format()));
-     memcpy(buffer->image()->bits(), img.bits(), size_t(img.sizeInBytes()));
-     return buffer;
--- 
-GitLab
-
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch b/dev-qt/qtwayland/files/qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch
deleted file mode 100644
index abeb7f7a1e5d..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f90f19ec0155b82981046509160849f9a3aedd9b Mon Sep 17 00:00:00 2001
-From: Ilya Fedin <fedin-ilja2010@ya.ru>
-Date: Sun, 19 Mar 2023 10:20:11 +0400
-Subject: [PATCH] Client: Fix the mouse being stuck in pressed state after DnD
-
-I can still reproduce the problem using QtWidgets applications
-on KDE Plasma 5.27. Both Windows and macOS QPA have a similar quirk
-and they both send a MouseButtonRelease event rather than a MouseMove
-event.
-
-Amends f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba
-
-Task-number: QTBUG-97037
-Pick-to: 6.5 6.2 5.15
-Change-Id: I864a1cb68b3660d858623f943b3958f7cafbf955
-Reviewed-by: David Edmundson <davidedmundson@kde.org>
-(cherry picked from commit e3c74961b1c7415fd94678802ad7f8173d0be4c1)
----
- src/client/qwaylandinputdevice.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
-index 9a0fe49d..bc05583a 100644
---- a/src/client/qwaylandinputdevice.cpp
-+++ b/src/client/qwaylandinputdevice.cpp
-@@ -845,7 +845,7 @@ void QWaylandInputDevice::Pointer::releaseButtons()
-     mButtons = Qt::NoButton;
- 
-     if (auto *window = focusWindow()) {
--        MotionEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, mParent->modifiers());
-+        ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, Qt::NoButton, mParent->modifiers());
-         window->handleMouse(mParent, e);
-     }
- }
--- 
-2.40.0
-
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
index 88b6d7321d3a..995fc3d6e37e 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	QT5_KDEPATCHSET_REV=2
+	QT5_KDEPATCHSET_REV=3
 	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
@@ -31,14 +31,16 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="dev-util/wayland-scanner"
 
-PATCHES=(
-	# QTBUG-97037, pending upstream:
-	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/71
-	"${FILESDIR}/${PN}-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch"
-	# QTBUG-95434, pending/approved upstream:
-	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/79
-	"${FILESDIR}/${P}-QTBUG-95434-convert-cursor-bitmap.patch"
-)
+src_prepare() {
+	# new patchset for FILESDIR cleanup, drop past -r4 rev patches
+	pushd "${WORKDIR}/${P}-gentoo-kde-${QT5_KDEPATCHSET_REV}" > /dev/null || die
+		rm 0055-Replace-scale-with-devicePixelRatio-for-non-integer-.patch \
+			0056-Client-Fix-buffer-damage.patch \
+			0057-client-Fix-infinite-recursion-with-text-input-v2.patch || die
+	popd > /dev/null || die
+
+	qt5-build_src_prepare
+}
 
 src_configure() {
 	local myqmakeargs=(
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10-r5.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10-r5.ebuild
new file mode 100644
index 000000000000..2c0b9e5c9e3b
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.10-r5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=3
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+SLOT=5/${QT5_PV} # bug 815646
+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
+}
+
+src_install() {
+	qt5-build_src_install
+	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}