summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-09-25 22:08:11 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-09-25 23:33:56 +0200
commit59925e0907212348a775b3436b92ea56904fc835 (patch)
treef05028aba66a4376f32aaf259bee9803e34bbd9a /dev-qt/qtwidgets
parentdev-qt/qtwidgets: Drop 5.12.5 (r0) (diff)
downloadgentoo-59925e0907212348a775b3436b92ea56904fc835.tar.gz
gentoo-59925e0907212348a775b3436b92ea56904fc835.tar.bz2
gentoo-59925e0907212348a775b3436b92ea56904fc835.zip
dev-qt: Drop Qt 5.12.4
Package-Manager: Portage-2.3.76, Repoman-2.3.17 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.12.4-fix-notification-of-QDockWidget.patch37
-rw-r--r--dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch41
-rw-r--r--dev-qt/qtwidgets/qtwidgets-5.12.4-r2.ebuild63
4 files changed, 0 insertions, 142 deletions
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index a1c8a32a3a46..1e1de0c37b5b 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,3 +1,2 @@
DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
-DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch b/dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch
deleted file mode 100644
index 5f72fef9d34c..000000000000
--- a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: fix notification of QDockWidget when it gets undocked
- Before the patch the notification was emitted only when the docker
- was attached to the panel or changed a position on it.
- .
- It looks like the old behavior was documented in a unittest,
- so this patch might actually be a "behavior change".
- .
- Note: https://mail.kde.org/pipermail/distributions/2019-April/000317.html
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=06b8644953fc5267
-Last-Update: 2019-06-14
-
---- a/src/widgets/widgets/qdockwidget.cpp
-+++ b/src/widgets/widgets/qdockwidget.cpp
-@@ -1171,6 +1171,8 @@ void QDockWidgetPrivate::setWindowState(
- QMainWindowLayout *mwlayout = qt_mainwindow_layout_from_dock(q);
- if (mwlayout)
- emit q->dockLocationChanged(mwlayout->dockWidgetArea(q));
-+ } else {
-+ emit q->dockLocationChanged(Qt::NoDockWidgetArea);
- }
- }
-
---- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
-+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
-@@ -669,7 +669,11 @@ void tst_QDockWidget::dockLocationChange
- spy.clear();
-
- dw.setFloating(true);
-- QTest::qWait(100);
-+ QTRY_COMPARE(spy.count(), 1);
-+ QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)),
-+ Qt::NoDockWidgetArea);
-+ spy.clear();
-+
- dw.setFloating(false);
- QTRY_COMPARE(spy.count(), 1);
- QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)),
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch b/dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch
deleted file mode 100644
index 777d0195a53f..000000000000
--- a/dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From deac052a40c93633041da058d5c73c9e91aa76c7 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
-Date: Fri, 12 Jul 2019 12:28:29 +0200
-Subject: [PATCH] Revert "Reset QWidget's winId when backing window surface is
- destroyed"
-
-This reverts commit a9246c7132a2c8864d3ae6cebd260bb9ee711fcb.
-
-The QWidget machinery is way to fragile to reset the winId under the
-feet of QWidget like that. We would potentially need to include all
-the logic in QWidget::destroy. This also ties into the flow between
-QtGui and QtWidgets during window closing, which is still unresolved.
-
-Change-Id: I168048a63c89796398eb5331a80ce3e5c8d9a208
-Fixes: QTBUG-76588
-Task-number: QTBUG-69289
-Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
----
- src/widgets/kernel/qwidget.cpp | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
-index fdb38729032..6f0f39a3443 100644
---- a/src/widgets/kernel/qwidget.cpp
-+++ b/src/widgets/kernel/qwidget.cpp
-@@ -9382,12 +9382,6 @@ bool QWidget::event(QEvent *event)
- d->renderToTextureReallyDirty = 1;
- #endif
- break;
-- case QEvent::PlatformSurface: {
-- auto surfaceEvent = static_cast<QPlatformSurfaceEvent*>(event);
-- if (surfaceEvent->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed)
-- d->setWinId(0);
-- break;
-- }
- #ifndef QT_NO_PROPERTIES
- case QEvent::DynamicPropertyChange: {
- const QByteArray &propName = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName();
---
-2.16.3
diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.4-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.4-r2.ebuild
deleted file mode 100644
index 9d414296830e..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.12.4-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
- gtk? (
- ~dev-qt/qtgui-${PV}[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=(
- gtk:gtk3:
- ::widgets
- !:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :widgets
-)
-
-PATCHES+=(
- "${FILESDIR}/${P}-revert-reset-winId.patch" # bug 689704
- "${FILESDIR}/${P}-fix-notification-of-QDockWidget.patch"
- # Still pending: https://codereview.qt-project.org/c/qt/qtbase/+/255384
- "${FILESDIR}/${P}-synth-enterleaveEvent-for-accepted-QTabletEvent.patch"
-)
-
-src_configure() {
- local myconf=(
- -opengl $(usex gles2 es2 desktop)
- $(qt_use gtk)
- -gui
- $(qt_use png libpng system)
- -widgets
- $(qt_use xcb xcb system)
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
- )
- qt5-build_src_configure
-}