From 903a3d4d1cc510795636c49510c571b10a19be12 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sun, 15 Aug 2021 00:15:13 +0300 Subject: [PATCH] qt5-wayland rebuild kde-patch --- .../qt5/qt5-wayland/files/qt_kde.patch | 23 +++++++++++++++++-- desktop/toolkit/qt5/qt5-wayland/pspec.xml | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch index c6323ad9ab..a50c3713a6 100644 --- a/desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch +++ b/desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch @@ -479,7 +479,7 @@ index df1c94f2..050cfdc0 100644 #if QT_CONFIG(cursor) diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index bc031ed5..e96d8fe9 100644 +index bc031ed5..bd70f4af 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -194,10 +194,11 @@ void QWaylandWindow::initWindow() @@ -539,7 +539,26 @@ index bc031ed5..e96d8fe9 100644 // Don't flush the events here, or else the newly visible window may start drawing, but since // there was no frame before it will be stuck at the waitForFrameSync() in // QWaylandShmBackingStore::beginPaint(). -@@ -1231,12 +1239,14 @@ bool QWaylandWindow::isOpaque() const +@@ -456,14 +464,15 @@ void QWaylandWindow::lower() + + void QWaylandWindow::setMask(const QRegion &mask) + { ++ QReadLocker locker(&mSurfaceLock); ++ if (!mSurface) ++ return; ++ + if (mMask == mask) + return; + + mMask = mask; + +- if (!mSurface) +- return; +- + if (mMask.isEmpty()) { + mSurface->set_input_region(nullptr); + +@@ -1231,12 +1240,14 @@ bool QWaylandWindow::isOpaque() const void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea) { diff --git a/desktop/toolkit/qt5/qt5-wayland/pspec.xml b/desktop/toolkit/qt5/qt5-wayland/pspec.xml index 1bec23e3aa..0095164fd4 100755 --- a/desktop/toolkit/qt5/qt5-wayland/pspec.xml +++ b/desktop/toolkit/qt5/qt5-wayland/pspec.xml @@ -86,7 +86,7 @@ - 2021-07-30 + 2021-08-14 5.15.2 Rebuild Mustafa Cinasal