gentoo auto-resync : 08:03:2023 - 11:59:47

9 files changed, 187 insertions, 1 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index b3e108649701..0f39614d22c7 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 3b9bee157cef..58d89fb8c22c 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,4 +1,6 @@
 DIST qtconnectivity-5.15.8-gentoo-kde-1.tar.xz 3388 BLAKE2B 4bb7a04f4727ded42483ad58bfe16fc74ad441423bef641ba03219992c94818ec99a9850a64be8e69f497701867fba502ba468ab6ac3809e5476083b7df3daa3 SHA512 8950506d4f03780187ace868d6133ef9087c980db941c9e10b5d9d926c927d7d3bdafd5988f7f325160d0959a35a5fe5a2723fb1948e90c993e54e39beb2c0cc
+DIST qtconnectivity-5.15.8-gentoo-kde-2.tar.xz 5520 BLAKE2B e847c894f1318d5bc01bea7c8c668f23a725582908ae61d70a258c29c259f3bf79aaf4784cf4c57e08eb3a01e598be6698871e71e8d76cba6affce3164f7920f SHA512 b89e979f372de7a88294dfa7c917b3d736110da7c73c5576bcb0fec8216d206b3da9bed61b7c13d63f677b6547f0fdb06b3e44b014eeafcf6987777d49764ea9
 DIST qtconnectivity-everywhere-opensource-src-5.15.8.tar.xz 2822448 BLAKE2B eb6a05aaf3b0f71df7e122f46444d971ca38d7927a71725b2e3cc3b39566f136fbd765b0072a27c214b43b230bad57deddf6c0cc57b3691331cc80645aa6984b SHA512 d600e7b600a8cc204333b69bbbd37bc6f4d578bf50406a705c9bc9b04a0399461c8cc8e3bf89a8e0a8820897e9d586d77543570de6229a0cfed312b422b9fda6
+EBUILD qtbluetooth-5.15.8-r1.ebuild 696 BLAKE2B 73b6a7f29debdded9559b84d71956510b142d1998ada55f5c10b48c520961ce06ab28d204670826a472dc7229e786b95f88f5af1103d9f6b7c83dbf20ce919d8 SHA512 34ab8450bc6f5e145c6a91ba9c0e2b8e624a509b5a70ddd456d772bd13b5c06c2cc26f36c8d19c9b6172b2ed3af43d536fa74169062670b55fc8a4b0ee4d9b06
 EBUILD qtbluetooth-5.15.8.ebuild 692 BLAKE2B 4af9aa0de9cf6e818b91455ad24bcf8ef43ba11fbd065296e913f03d3d2be710b60e5b3a70dde4bcbc9586ae89dae6eb834076d4efbfbfdc7b357bdc1f620e94 SHA512 51a05f1fe96bf9c26063748220eec461f46913359d998d4608908fab21eb272da9441c3bed99a40589461b7a1e27da9dcc5c3750cab2528afdfa949c7c858045
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.8-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.8-r1.ebuild
new file mode 100644
index 000000000000..4f1c6bc59be1
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.8-r1.ebuild
@@ -0,0 +1,34 @@
+# 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=2
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+QT5_MODULE="qtconnectivity"
+inherit qt5-build
+
+DESCRIPTION="Bluetooth support library for the Qt5 framework"
+
+IUSE="qml"
+
+DEPEND="
+	=dev-qt/qtconcurrent-${QT5_PV}*
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtdbus-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
+	>=net-wireless/bluez-5:=
+	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e 's/nfc//' src/src.pro || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
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=(
 		--
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 3a0295b582bf..27d0e14f65cc 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,5 +1,7 @@
+AUX qtwidgets-5.15.8-QTBUG-106569.patch 1986 BLAKE2B f8030cf8c3f683517d36a80fd3b8da575b74801adba771b8f267745877a809d92ff5f23fac0bde08efdcabc431338829cf96cb6d13eb4d43552a0bb7e3d7868e SHA512 19b6643361683c852d817d850108055ae86a27f658b0fd7dfa5b98bfe47374113ad4c149a120b48d25444d7d54ce645b01c3a94d4f980fc0055f2269961bbe48
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
 DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 EBUILD qtwidgets-5.15.8-r2.ebuild 1200 BLAKE2B 81fb29cbaccc25e1ee0a094551410909e1869ee23c85d1c86c05beb0c9f93046a1672a7619ba4a41fad91f59db5e6cba250d82263a57c960695cd69d5c713b60 SHA512 95a331bbaa646d7bbf48a183434300a64e887cb51a1c5a3bf2683267d4f99d479639fe394d043dfe00996933382c2c7f2f886638c9d9dcd404085138ae5bf2ca
+EBUILD qtwidgets-5.15.8-r3.ebuild 1257 BLAKE2B 31e48170ec7a614c3ea5e13137863144c6872003352adc5e7a7c1a255bbe89352279595adb8b34fdbd42680cfc7dde934444d264e43929adaa82a6a10ec5132d SHA512 7fd24222f87001d16ff5bb20ff87677decf85134ca76112770cb24c3146c5e2c7262d99973b6dc7d8c6b57c29a72b6fb2727e856147b7fc79050a90e52556099
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch b/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch
new file mode 100644
index 000000000000..c6ad77e54d44
--- /dev/null
+++ b/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch
@@ -0,0 +1,47 @@
+From 9a42df40228d246260cdcd40d2d582a2684439e4 Mon Sep 17 00:00:00 2001
+From: Volker Hilsheimer <volker.hilsheimer@qt.io>
+Date: Fri, 10 Feb 2023 14:49:51 +0100
+Subject: [PATCH] QAbstractItemView: don't access invalid indexes on copy-key
+
+When pressing the copy key the view tried to access the model's data for
+the currentIndex() without checking whether the index is valid. This
+resulted in debug output to the console, and might break models that
+didn't check incoming indexes for validity (or asserted validity).
+
+Fix this by checking whether the currentIndex() is valid before reading
+the model's data for that index.
+
+Fixes: QTBUG-106569
+Pick-to: 6.5 6.4 6.2 5.15
+Change-Id: Ide75fbdfdbd1451ab6d48f07b22136553c5b2468
+Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
+(cherry picked from commit 3a0c33da3d913431391c5b7f4f0e93ea9d2221dc)
+---
+ src/widgets/itemviews/qabstractitemview.cpp | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
+index 5e65c59796..774b78dc4f 100644
+--- a/src/widgets/itemviews/qabstractitemview.cpp
++++ b/src/widgets/itemviews/qabstractitemview.cpp
+@@ -2338,11 +2338,12 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
+ 
+ #if !defined(QT_NO_CLIPBOARD) && !defined(QT_NO_SHORTCUT)
+     if (event == QKeySequence::Copy) {
+-        QVariant variant;
+-        if (d->model)
+-            variant = d->model->data(currentIndex(), Qt::DisplayRole);
+-        if (variant.canConvert<QString>())
+-            QGuiApplication::clipboard()->setText(variant.toString());
++        const QModelIndex index = currentIndex();
++        if (index.isValid() && d->model) {
++            const QVariant variant = d->model->data(index, Qt::DisplayRole);
++            if (variant.canConvert<QString>())
++                QGuiApplication::clipboard()->setText(variant.toString());
++        }
+         event->accept();
+     }
+ #endif
+-- 
+GitLab
+
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild
new file mode 100644
index 000000000000..0c8b74215015
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild
@@ -0,0 +1,65 @@
+# 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=5
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
+
+# keep IUSE defaults in sync with qtgui
+IUSE="dbus gles2-only gtk +png +X"
+REQUIRED_USE="gtk? ( dbus )"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
+	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
+	gtk? (
+		dev-libs/glib:2
+		=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	dbus:xdgdesktopportal:
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+PATCHES=( "${FILESDIR}/${P}-QTBUG-106569.patch" )
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2-only es2 desktop)
+		$(usev dbus -dbus-linked)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use X xcb)
+		$(usev X '-xcb-xlib -xkbcommon')
+	)
+	qt5-build_src_configure
+}