diff options
Diffstat (limited to 'dev-qt/qtwidgets')
| -rw-r--r-- | dev-qt/qtwidgets/Manifest | 6 | ||||
| -rw-r--r-- | dev-qt/qtwidgets/files/qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch | 37 | ||||
| -rw-r--r-- | dev-qt/qtwidgets/files/qtwidgets-5.12.4-revert-reset-winId.patch | 41 | ||||
| -rw-r--r-- | dev-qt/qtwidgets/qtwidgets-5.12.4-r2.ebuild | 63 | ||||
| -rw-r--r-- | dev-qt/qtwidgets/qtwidgets-5.12.5-r1.ebuild (renamed from dev-qt/qtwidgets/qtwidgets-5.12.5.ebuild) | 5 |
5 files changed, 6 insertions, 146 deletions
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index 54d12963e1e6..fc4179e4c222 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1,10 +1,6 @@ -AUX qtwidgets-5.12.4-fix-notification-of-QDockWidget.patch 1476 BLAKE2B 046a588ad0345ee8ebc76abff6a0042aaa3d45ea89ea34c4e16587cf206cb7c869cc875e9cf9a8c4f124f8bb55fbbf19bc411f1279392dca8fcf57a49ecc5862 SHA512 da9249530c6718052cdbdff277319e99274dc6a545a963efe81d45900078e081908cf2e83ea6bc5ed273586b464f17a0f8bf7b41b58be8f3392615b432ae3302 -AUX qtwidgets-5.12.4-revert-reset-winId.patch 1657 BLAKE2B 72a1cb720871ab907e22e0f26ddbc60a995002f99433a99da2e6e44ca5acae9611e155d301eed83ddbb84894e4238c08e050823e422ffcd646e3ff4bdf273879 SHA512 abfa16a13685f9689b176daaf600bfe31d03de6d61f8543430857e6823405d593ed4021e4290d627ad5c27ff7e17afb2801411deb13e6c1df435fd32a2eba370 AUX qtwidgets-5.12.4-synth-enterleaveEvent-for-accepted-QTabletEvent.patch 2015 BLAKE2B 6aefa4fd585a7b4bdde335d48a90270c611c1762703ccac330641d761004dbed0df01cd683778c7b02175f0ac00de67709cff8474af958e486ca40f92ecdb15b SHA512 18c2e6c0b55f53f08d3ab3d1a65a83d264a203a8f9948a41a763e1306e462d70f0bac2156f4503f61c31ee38369dfec81e25685d2289db82bee78fda010a351e 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 EBUILD qtwidgets-5.12.3.ebuild 1042 BLAKE2B 2d926509df7f1d79e5fc9ca45ab0f0eb7d3a019b975771c3e2c95b13801f82ae4c43eaf528080b724d87abaf16d637590c4529fcd5a9fd58976f3e79668e13b3 SHA512 2883a409b5012eb8ca7a51c49be0523332753de7c5d8d13151dd21977ae509802d09aa28685115631437b5771c20d87a6067e92901d65924f0cc0915791b2e2a -EBUILD qtwidgets-5.12.4-r2.ebuild 1325 BLAKE2B 12764ac5c577a6740308a2d574d8de00e746a0768e70d19b4263f65b689450864cfacf961a4b8f3a4e9e3cbe49b9188a197b399b12eded2e642464618d834603 SHA512 9ff7feeb1a245a9162da6a6242baf7074fc4535d673d4c76ea9fccbb195be06fc3404fb936960aee5bebef651b5373b56f5265a0caba2bb3589ffc0b4a1527d4 -EBUILD qtwidgets-5.12.5.ebuild 1048 BLAKE2B 8ed85958b331fae7430ac60666ccf444e9653caeebe8d71795169b350ca6babd39b7015191d9eb6371c144fa324dbd2d30bc8e6c00c5706279ec7a1f731cc68f SHA512 91f9dcfe7869fedcc353b949522bd85ababa7ab7f000f0c41ec7354257276ab1d80b517d9a69572ebfa29f259c64c00bae14097a4dece57de5a19caf0882ce26 +EBUILD qtwidgets-5.12.5-r1.ebuild 1217 BLAKE2B 45dd40022c33f69d97f4820ae13829afc157d48f8d8da830907268c88120be6f918d108bd9662f416410dcab8930be2be6289e570d6bd754f1b4e9b90cf38f6f SHA512 e538b5f521c5b087ca6d54f5d9a0ad220ffb72d84a54ac1fa6dac11dc8d8ab934835f66f848dc3e6b243631d5c26b16f3eb988b773d817c916b4cd648ac5697c MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192 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 -} diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.5.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.5-r1.ebuild index 85ceaa9c401e..57de535678f4 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.12.5.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.12.5-r1.ebuild @@ -42,6 +42,11 @@ QT5_GENTOO_PRIVATE_CONFIG=( :widgets ) +PATCHES+=( + # Still pending: https://codereview.qt-project.org/c/qt/qtbase/+/255384 + "${FILESDIR}/${PN}-5.12.4-synth-enterleaveEvent-for-accepted-QTabletEvent.patch" +) + src_configure() { local myconf=( -opengl $(usex gles2 es2 desktop) |