[neon/qt6/qt6-wayland/Neon/release] debian: abi bump and drop patch

[Carlos De Maine]

Git commit 3be1bce355b612d984d7a43fb2f8ada411b95114 by Carlos De Maine.
Committed on 16/02/2024 at 14:18.
Pushed by carlosdem into branch 'Neon/release'.

abi bump and drop patch

M  +4    -4    debian/control
D  +0    -51   debian/patches/krunner.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-wayland/-/commit/3be1bce355b612d984d7a43fb2f8ada411b95114

diff --git a/debian/control b/debian/control
index 6dcb9f5..fceb70c 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Build-Depends: cmake,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.6.1~),
-               qt6-declarative-dev (>= 6.6.1~),
+               qt6-base-dev (>= 6.6.2~),
+               qt6-declarative-dev (>= 6.6.2~),
                qt6-wayland-dev:native <cross>,
                xauth <!nocheck>,
                xvfb <!nocheck>,
@@ -47,8 +47,8 @@ Breaks: libqt6waylandeglclienthwintegration6,
         libqt6waylandeglcompositorhwintegration6,
 Replaces: libqt6waylandeglclienthwintegration6,
           libqt6waylandeglcompositorhwintegration6,
-Provides: qt6-waylandclient-private-abi (= 6.6.1),
-          qt6-waylandcompositor-private-abi (= 6.6.1),
+Provides: qt6-waylandclient-private-abi (= 6.6.2),
+          qt6-waylandcompositor-private-abi (= 6.6.2),
           libqt6waylandclient6,
           libqt6waylandcompositor6,
           libqt6waylandeglclienthwintegration6,
diff --git a/debian/patches/krunner.diff b/debian/patches/krunner.diff
deleted file mode 100644
index 58d4691..0000000
--- a/debian/patches/krunner.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp
-index ffd17ce8..fc5e7822 100644
---- a/src/client/qwaylandshmbackingstore.cpp
-+++ b/src/client/qwaylandshmbackingstore.cpp
-@@ -204,7 +204,6 @@ void QWaylandShmBackingStore::endPaint()
- void QWaylandShmBackingStore::ensureSize()
- {
-     waylandWindow()->setBackingStore(this);
--    waylandWindow()->createDecoration();
-     resize(mRequestedSize);
- }
- 
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index b34e448b..672ddc5b 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -1041,6 +1041,8 @@ void QWaylandWindow::setWindowFlags(Qt::WindowFlags flags)
- 
- bool QWaylandWindow::createDecoration()
- {
-+    Q_ASSERT_X(QThread::currentThreadId() == QThreadData::get2(thread())->threadId.loadRelaxed(),
-+               "QWaylandWindow::createDecoration", "not called from main thread");
-     if (!mDisplay->supportsWindowDecoration())
-         return false;
- 
-@@ -1121,11 +1123,7 @@ bool QWaylandWindow::createDecoration()
-         // size and are not redrawn, leaving the new buffer empty. As a simple
-         // work-around, we trigger a full extra update whenever the client-side
-         // window decorations are toggled while the window is showing.
--        // Note: createDecoration() is sometimes called from the render thread
--        // of Qt Quick. This is essentially wrong and could potentially cause problems,
--        // but until the underlying issue has been fixed, we have to use invokeMethod()
--        // here to avoid asserts.
--        QMetaObject::invokeMethod(window(), &QWindow::requestUpdate);
-+        window()->requestUpdate();
-     }
- 
-     return mWindowDecoration;
-diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
-index 039ec1a6..685ad1e4 100644
---- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
-+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
-@@ -313,8 +313,6 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface)
- 
-     if (m_currentWindow->isExposed())
-         m_currentWindow->setCanResize(false);
--    if (m_decorationsContext != EGL_NO_CONTEXT && !m_currentWindow->decoration())
--        m_currentWindow->createDecoration();
- 
-     if (eglSurface == EGL_NO_SURFACE) {
-         m_currentWindow->updateSurface(true);
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3982002..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-krunner.diff