[neon/qt/qtwayland/Neon/unstable] debian: Refresh other patches.

[Dmitry Shachnev]

Git commit 53a35999029e8d98815ff3523de098ae3341b59d by Dmitry Shachnev.
Committed on 10/06/2023 at 21:02.
Pushed by jriddell into branch 'Neon/unstable'.

Refresh other patches.

M  +1    -0    debian/changelog
M  +1    -1    debian/patches/0006-Client-Set-XdgShell-size-hints-before-the-first-comm.patch
M  +4    -4    debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch

https://invent.kde.org/neon/qt/qtwayland/-/commit/53a35999029e8d98815ff3523de098ae3341b59d

diff --git a/debian/changelog b/debian/changelog
index f67815e..3b9a7bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtwayland-opensource-src (5.15.10-1) UNRELEASED; urgency=medium
   * Drop patches, included in the new release:
     - 0042-Build-fixes-for-GCC-11.patch
     - 0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
+  * Refresh other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 10 Jun 2023 20:46:10 +0300
 
diff --git a/debian/patches/0006-Client-Set-XdgShell-size-hints-before-the-first-comm.patch b/debian/patches/0006-Client-Set-XdgShell-size-hints-before-the-first-comm.patch
index ca6d7cf..902d15c 100644
--- a/debian/patches/0006-Client-Set-XdgShell-size-hints-before-the-first-comm.patch
+++ b/debian/patches/0006-Client-Set-XdgShell-size-hints-before-the-first-comm.patch
@@ -30,7 +30,7 @@ Reviewed-by: Aleix Pol Gonzalez <aleixpol at kde.org>
      m_applied = m_pending;
      qCDebug(lcQpaWayland) << "Applied pending xdg_toplevel configure event:" << m_applied.size << m_applied.states;
  }
-@@ -257,6 +255,7 @@ QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *shell, ::xdg_surface *s
+@@ -267,6 +265,7 @@ QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *shell, ::xdg_surface *s
                  m_toplevel->set_parent(parentXdgSurface->m_toplevel->object());
          }
      }
diff --git a/debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch b/debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
index 36c00c8..8b3138b 100644
--- a/debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
+++ b/debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
@@ -232,10 +232,10 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
          Q_ASSERT(shell->m_topmostGrabbingPopup == this);
 -        shell->m_topmostGrabbingPopup = m_parent->m_popup;
 +        shell->m_topmostGrabbingPopup = m_parentXdgSurface ? m_parentXdgSurface->m_popup : nullptr;
-     }
- }
+         m_grabbing = false;
  
-@@ -393,8 +402,6 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
+         // Synthesize Qt enter/leave events for popup
+@@ -403,8 +412,6 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
  {
      Q_ASSERT(!m_toplevel && !m_popup);
  
@@ -244,7 +244,7 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
      auto positioner = new QtWayland::xdg_positioner(m_shell->create_positioner());
      // set_popup expects a position relative to the parent
      QPoint transientPos = m_window->geometry().topLeft(); // this is absolute
-@@ -411,8 +418,9 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
+@@ -421,8 +428,9 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
          | QtWayland::xdg_positioner::constraint_adjustment_slide_y
          | QtWayland::xdg_positioner::constraint_adjustment_flip_x
          | QtWayland::xdg_positioner::constraint_adjustment_flip_y);