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

Dmitry Shachnev null at kde.org
Mon Apr 29 17:44:39 BST 2024


Git commit 87bf27b88a08f281decc0dc025fafa86a90edaac by Dmitry Shachnev.
Committed on 06/01/2023 at 07:37.
Pushed by jriddell into branch 'Neon/unstable'.

Refresh other patches.

M  +1    -0    debian/changelog
M  +3    -3    debian/patches/0041-Only-close-popup-in-the-the-hierchary.patch
M  +2    -2    debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
M  +1    -1    debian/patches/skip_animated_cursor_test.diff

https://invent.kde.org/neon/qt/qtwayland/-/commit/87bf27b88a08f281decc0dc025fafa86a90edaac

diff --git a/debian/changelog b/debian/changelog
index df713b5..9460f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtwayland-opensource-src (5.15.8-1) UNRELEASED; urgency=medium
   * Drop patches that are included in the new release:
     - 0015-Fix-the-logic-for-decoding-modifiers-map-in-Wayland-.patch
     - 0026-Do-not-create-decorations-when-the-shellSurface-is-n.patch
+  * Refresh other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 Jan 2023 11:12:42 +0400
 
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 156a3d8..7b8d106 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
@@ -1,4 +1,4 @@
-From 6df6ff51718eda0f06c2df6edb22e8a4fc9c353e Mon Sep 17 00:00:00 2001
+From 81ddf70997f62d5f1a02d89048c5ec2d3cd27eaf Mon Sep 17 00:00:00 2001
 From: Weng Xuetian <wengxt at gmail.com>
 Date: Wed, 20 Jul 2022 15:57:40 -0700
 Subject: [PATCH] Only close popup in the the hierchary
@@ -235,7 +235,7 @@ Reviewed-by: David Edmundson <davidedmundson at kde.org>
      }
  }
  
-@@ -392,8 +401,6 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
+@@ -393,8 +402,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
-@@ -406,8 +413,9 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
+@@ -407,8 +414,9 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
      positioner->set_anchor(QtWayland::xdg_positioner::anchor_top_left);
      positioner->set_gravity(QtWayland::xdg_positioner::gravity_bottom_right);
      positioner->set_size(m_window->geometry().width(), m_window->geometry().height());
diff --git a/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch b/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
index 554f12d..f102d51 100644
--- a/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
+++ b/debian/patches/0047-client-Synthesize-enter-leave-event-for-popup-in-xdg.patch
@@ -1,4 +1,4 @@
-From 489a0a1fc1db61f46e2b232ae4523723a05304b7 Mon Sep 17 00:00:00 2001
+From 4939cb0b313727474e340cf31a8037ede91517d3 Mon Sep 17 00:00:00 2001
 From: Liang Qi <liang.qi at qt.io>
 Date: Fri, 11 Mar 2022 09:17:25 +0100
 Subject: [PATCH] client: Synthesize enter/leave event for popup in xdg-shell
@@ -40,7 +40,7 @@ Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo at qt.io>
      }
  }
  
-@@ -437,6 +447,23 @@ void QWaylandXdgSurface::setGrabPopup(QWaylandWindow *parent, QWaylandInputDevic
+@@ -438,6 +448,23 @@ void QWaylandXdgSurface::setGrabPopup(QWaylandWindow *parent, QWaylandInputDevic
      }
      setPopup(parent);
      m_popup->grab(device, serial);
diff --git a/debian/patches/skip_animated_cursor_test.diff b/debian/patches/skip_animated_cursor_test.diff
index f9ce048..b4546ba 100644
--- a/debian/patches/skip_animated_cursor_test.diff
+++ b/debian/patches/skip_animated_cursor_test.diff
@@ -6,7 +6,7 @@ Last-Update: 2020-04-30
 
 --- a/tests/auto/client/seatv4/tst_seatv4.cpp
 +++ b/tests/auto/client/seatv4/tst_seatv4.cpp
-@@ -570,6 +570,7 @@ void tst_seatv4::hidpiBitmapCursorNonInt
+@@ -568,6 +568,7 @@ void tst_seatv4::hidpiBitmapCursorNonInt
  
  void tst_seatv4::animatedCursor()
  {



More information about the Neon-commits mailing list