diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-04-09 23:35:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-09 23:35:30 +0100 |
commit | 47d5e233005d470dbd431a280e64ce6073fc7149 (patch) | |
tree | 135efe53d72c541429f68d7ed82186f2b34fcdb6 /dev-qt/qtwidgets | |
parent | bac9556f73da9ac333933778ce81c053bd989a26 (diff) |
gentoo auto-resync : 09:04:2023 - 23:35:30
Diffstat (limited to 'dev-qt/qtwidgets')
-rw-r--r-- | dev-qt/qtwidgets/Manifest | 6 | ||||
-rw-r--r-- | dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch | 47 | ||||
-rw-r--r-- | dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild | 63 | ||||
-rw-r--r-- | dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild | 65 | ||||
-rw-r--r-- | dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild | 2 |
5 files changed, 2 insertions, 181 deletions
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index b7d19df12e6a..24b8db598ef3 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1,9 +1,5 @@ -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-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b 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 1253 BLAKE2B da2efc3cd5815a3abe41aab2e9ce54ab309d22983f71d7790c911463ce574def908f02469b4a91fc0ea2be001fb52117535845c2df9c8db2be1d07000a56fb69 SHA512 050efc3b7bcfebf988f9ae73ccdc7512ccebca2cebf0865fb85c377fa16e5bcad217d6ede9b8ec9e4b0a7dd1ce39b44fd1abd7e536be1de06ed1734c4a8be6f8 -EBUILD qtwidgets-5.15.8-r4.ebuild 1206 BLAKE2B 19adde31e27352891be060d2eac7d7939ab98815e2230a64ae83d6fc9a56d405d4a979051d03693dec170788950009cd6074829553b57fe038ac6d2aa6c583e7 SHA512 0b34b199305325c1a181ddc59b0f3b7ba6e1cf324537b6edda38ce58319f8e0f3f30103294cc3fee97723b2465947335dbcac24ac8685bca8e1793f0f56a1067 +EBUILD qtwidgets-5.15.8-r4.ebuild 1200 BLAKE2B 57e9f18072ffad18c20740250b0b448f96aaf35d3049bce3294cf53214cf76e137a1822c473ab00f9da91330b71b7539cb8cb41eb2d876987110d5f0b2b95aa7 SHA512 e5f16b55d009c67da5bf754daefe4334119339d5dbaa5e239e7e8b51f3f042491d2f478153807be1259c4176c5e2f5501b9c90501bed300de7982adec203db12 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 deleted file mode 100644 index c6ad77e54d44..000000000000 --- a/dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch +++ /dev/null @@ -1,47 +0,0 @@ -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-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild deleted file mode 100644 index 41e6e38727ff..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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 -) - -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 -} diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild deleted file mode 100644 index 02594c03b53f..000000000000 --- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# 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 -} diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild index a445122d69a2..55f414e2c25f 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r4.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then QT5_KDEPATCHSET_REV=6 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase" |