diff --git a/0002-Guard-mResizeDirty-by-the-correctMutex.patch b/0002-Guard-mResizeDirty-by-the-correctMutex.patch deleted file mode 100644 index 6cbe5ed..0000000 --- a/0002-Guard-mResizeDirty-by-the-correctMutex.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 133b84352063dd959ae0cf21888dd10aa1443b76 Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Thu, 3 Feb 2022 19:42:33 +0000 -Subject: [PATCH 2/3] Guard mResizeDirty by the correctMutex - -mResizeDirty is used in the GUI thread in setCanResize which can be -called from the GUI thread. It is queried and set whilst the resizeLock -is held. We need to guard our usage. - -Change-Id: I5f8dcf8aa2cb2c4bb6274103df1da9e3e268605a ---- - src/client/qwaylandwindow.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index 30ae5345..61700b32 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -357,11 +357,12 @@ void QWaylandWindow::setGeometry(const QRect &rect) - if (mWindowDecoration) - mWindowDecoration->update(); - -- if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize) -+ if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize) { -+ QMutexLocker lock(&mResizeLock); - mResizeDirty = true; -- else -+ } else { - QWindowSystemInterface::handleGeometryChange(window(), geometry()); -- -+ } - mSentInitialResize = true; - } - QRect exposeGeometry(QPoint(), geometry().size()); --- -2.34.0 - diff --git a/_service b/_service index 8c917ee..030fa3e 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ enable - 5.15.5+kde@TAG_OFFSET@ + 5.15.6+kde@TAG_OFFSET@ https://invent.kde.org/qt/qt/qtwayland.git git qtwayland-everywhere-src kde/5.15 - v5.15.5-lts-lgpl + v5.15.6-lts-lgpl enable diff --git a/libqt5-qtwayland.changes b/libqt5-qtwayland.changes index b4c4c93..6e17f0c 100644 --- a/libqt5-qtwayland.changes +++ b/libqt5-qtwayland.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Sep 26 12:03:24 UTC 2022 - Fabian Vogt + +- Update to version 5.15.6+kde49, rebased upstream: + * Call `finishDrag()` in `QWaylandDataDevice::dragSourceCancelled()` + * Client: support high-dpi mode for window icon + * Avoid calling requestUpdate from wrong thread + * Fix missing update when toggling client-side decorations + * Use CRLF line delimiter for text/uri-list data + * Fix compile tests + * client: Synthesize enter/leave event for popup in xdg-shell + * Guard mResizeDirty by the correctMutex + * Client: clear focus on touch cancel + * Build fixes for GCC 11 + * Only close popup in the the hierchary + * Cleanup up all subsurface QQuickItems correctly + * linux-dmabuf-unstable-v1: Fix importing dmabuf buffers with modifiers + * Add BlankCursor for cursor names map + * client: Gracefully handle shutdown and window hiding +- Drop patches, now upstream: + * 0002-Guard-mResizeDirty-by-the-correctMutex.patch + ------------------------------------------------------------------- Mon Jun 27 13:10:47 UTC 2022 - Fabian Vogt diff --git a/libqt5-qtwayland.spec b/libqt5-qtwayland.spec index a60fa65..c9d8301 100644 --- a/libqt5-qtwayland.spec +++ b/libqt5-qtwayland.spec @@ -22,11 +22,11 @@ %define qt5_snapshot 1 %define libname libQt5WaylandCompositor5 %define base_name libqt5 -%define real_version 5.15.5 -%define so_version 5.15.5 +%define real_version 5.15.6 +%define so_version 5.15.6 %define tar_version qtwayland-everywhere-src-%{version} Name: libqt5-qtwayland -Version: 5.15.5+kde39 +Version: 5.15.6+kde49 Release: 0 Summary: Qt 5 Wayland Addon # The wayland compositor files are GPL-3.0-or-later @@ -35,8 +35,6 @@ Group: Development/Libraries/X11 URL: https://www.qt.io Source: %{tar_version}.tar.xz Source1: baselibs.conf -# https://codereview.qt-project.org/c/qt/qtwayland/+/393828/1 -Patch3: 0002-Guard-mResizeDirty-by-the-correctMutex.patch BuildRequires: fdupes BuildRequires: libqt5-qtbase-private-headers-devel >= %{real_version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{real_version} diff --git a/qtwayland-everywhere-src-5.15.5+kde39.obscpio b/qtwayland-everywhere-src-5.15.5+kde39.obscpio deleted file mode 100644 index da3987a..0000000 --- a/qtwayland-everywhere-src-5.15.5+kde39.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25a1c1fa101e85950c9d8080aebf99cec45670adf0d9d88e8f73e8c09a92484c -size 4693516 diff --git a/qtwayland-everywhere-src-5.15.6+kde49.obscpio b/qtwayland-everywhere-src-5.15.6+kde49.obscpio new file mode 100644 index 0000000..c6e6207 --- /dev/null +++ b/qtwayland-everywhere-src-5.15.6+kde49.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:464afcdd5be266e51762de8b676d86166daaa79c7480d2ee1dadf618266fadde +size 4699660 diff --git a/qtwayland-everywhere-src.obsinfo b/qtwayland-everywhere-src.obsinfo index dd1fac7..4f9dd5f 100644 --- a/qtwayland-everywhere-src.obsinfo +++ b/qtwayland-everywhere-src.obsinfo @@ -1,4 +1,4 @@ name: qtwayland-everywhere-src -version: 5.15.5+kde39 -mtime: 1655756241 -commit: 64fa557eb30fc1219bec50a45107ea1a983411ed +version: 5.15.6+kde49 +mtime: 1663847935 +commit: 31241d7fb6a7ffb8f56bc8ac35ed9f3bc61735b5