summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-04-09 22:09:21 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-04-09 22:17:04 +0200
commitb5e383230114250606e67244e3c06792d2543559 (patch)
tree660f93cc6450c12e639190f7011e01f4ecd47962 /dev-qt/qtwidgets
parentdev-qt/qtgui: drop 5.15.8-r3 (diff)
downloadgentoo-b5e383230114250606e67244e3c06792d2543559.tar.gz
gentoo-b5e383230114250606e67244e3c06792d2543559.tar.bz2
gentoo-b5e383230114250606e67244e3c06792d2543559.zip
dev-qt/qtwidgets: drop 5.15.8-r2, 5.15.8-r3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtwidgets')
-rw-r--r--dev-qt/qtwidgets/Manifest1
-rw-r--r--dev-qt/qtwidgets/files/qtwidgets-5.15.8-QTBUG-106569.patch47
-rw-r--r--dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild63
-rw-r--r--dev-qt/qtwidgets/qtwidgets-5.15.8-r3.ebuild65
4 files changed, 0 insertions, 176 deletions
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index f65bdbf9d40c..2acd6e73513c 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,4 +1,3 @@
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
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
-}