diff --git a/.gitignore b/.gitignore index 1db007e..c3f287a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtbase-opensource-src-5.9.2.tar.xz +/qtbase-opensource-src-5.9.3.tar.xz diff --git a/0106-Fix-dragging-inside-a-modal-window-when-a-QShapedPix.patch b/0106-Fix-dragging-inside-a-modal-window-when-a-QShapedPix.patch deleted file mode 100644 index be8939b..0000000 --- a/0106-Fix-dragging-inside-a-modal-window-when-a-QShapedPix.patch +++ /dev/null @@ -1,45 +0,0 @@ -From acdb3340321d1b8823b54f2ea492f975c6f942d8 Mon Sep 17 00:00:00 2001 -From: Andy Shaw -Date: Fri, 27 Oct 2017 08:36:25 +0200 -Subject: [PATCH 106/127] Fix dragging inside a modal window when a - QShapedPixmapWindow is used - -A regression was introduced with a3d59c7c7f675b0a4e128efeb781aa1c2f7db4c0 -which caused dragging to fail within a modal dialog on the XCB platform. -By adding an exception for the QShapedPixmapWindow, which is the window -used for the drag, we can allow that to continue to work whilst blocking -to the other newly created windows. - -Task-number: QTBUG-63846 -Change-Id: I7c7f365f30fcf5f04f50dc1a7fff7a09e6e5ed6c -Reviewed-by: Richard Moe Gustavsen ---- - src/gui/kernel/qwindow.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp -index 43b201e9b0..9e5b687851 100644 ---- a/src/gui/kernel/qwindow.cpp -+++ b/src/gui/kernel/qwindow.cpp -@@ -54,6 +54,7 @@ - # include "qaccessible.h" - #endif - #include "qhighdpiscaling_p.h" -+#include "qshapedpixmapdndwindow_p.h" - - #include - -@@ -576,7 +577,9 @@ void QWindow::setVisible(bool visible) - QGuiApplicationPrivate::showModalWindow(this); - else - QGuiApplicationPrivate::hideModalWindow(this); -- } else if (visible && QGuiApplication::modalWindow()) { -+ // QShapedPixmapWindow is used on some platforms for showing a drag pixmap, so don't block -+ // input to this window as it is performing a drag - QTBUG-63846 -+ } else if (visible && QGuiApplication::modalWindow() && !qobject_cast(this)) { - QGuiApplicationPrivate::updateBlockedStatus(this); - } - --- -2.14.3 - diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 2d66ef0..8463f1d 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -54,8 +54,8 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components -Version: 5.9.2 -Release: 5%{?dist} +Version: 5.9.3 +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -117,8 +117,6 @@ Patch67: https://bugreports.qt.io/secure/attachment/66353/xcberror_filter.patch ## upstream patches (5.9 branch) -Patch106: 0106-Fix-dragging-inside-a-modal-window-when-a-QShapedPix.patch - # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Those themes are there for platform integration. If the required libraries are # not there, the platform to integrate with isn't either. Then Qt will just @@ -349,8 +347,6 @@ Qt5 libraries used for drawing widgets and OpenGL items. %setup -q -n %{qt_module}-opensource-src-%{version} ## upstream fixes -%patch106 -p1 - %patch4 -p1 -b .QTBUG-35459 %patch50 -p1 -b .QT_VERSION_CHECK @@ -983,6 +979,9 @@ fi %changelog +* Wed Nov 22 2017 Jan Grulich - 5.9.3-1 +- 5.9.3 + * Thu Nov 09 2017 Rex Dieter - 5.9.2-5 - categoried logging for xcb entries (#1497564, QTBUG-55167) diff --git a/sources b/sources index 2624a33..8bb4ec0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-opensource-src-5.9.2.tar.xz) = a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 +SHA512 (qtbase-opensource-src-5.9.3.tar.xz) = 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c