[neon/qt6/qt6-wayland/Neon/release] debian/patches: drop upstreamed patch
Carlos De Maine
null at kde.org
Mon Oct 28 08:30:20 GMT 2024
Git commit bd2c108905dcb0a22e4805625b5b7a5e1748baeb by Carlos De Maine.
Committed on 28/10/2024 at 08:30.
Pushed by carlosdem into branch 'Neon/release'.
drop upstreamed patch
D +0 -32 debian/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff
M +0 -1 debian/patches/series
https://invent.kde.org/neon/qt6/qt6-wayland/-/commit/bd2c108905dcb0a22e4805625b5b7a5e1748baeb
diff --git a/debian/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff b/debian/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff
deleted file mode 100644
index f7da1fb..0000000
--- a/debian/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 92bcb8f6b7a852c7a5d662fc34de561692a7a454
-Author: Vlad Zahorodnii <vlad.zahorodnii at kde.org>
-Date: Thu Jun 20 11:25:06 2024 +0300
-
- Client: Ensure that guessed popup parent has a shell surface
-
- The last input window may not have a shell surface if it is a subsurface
- or that window has been just made invisible.
-
- Change-Id: Iad11c68659579429ddc5d9ba0038975b25da8e0d
- Reviewed-by: David Edmundson <davidedmundson at kde.org>
- (cherry picked from commit 52c406cec149634680489faeeaf06bb1258cd12f)
- Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
- (cherry picked from commit 7d04c18531276c94bfdf2f9a955d6f02554b28b2)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 22aeba10..c3725ffc 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -1157,8 +1157,10 @@ QWaylandWindow *QWaylandWindow::guessTransientParent() const
- return mTopPopup;
- }
-
-- if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup)
-- return display()->lastInputWindow();
-+ if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) {
-+ if (auto lastInputWindow = display()->lastInputWindow())
-+ return closestShellSurfaceWindow(lastInputWindow->window());
-+ }
-
- return nullptr;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 533899a..9183732 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff
c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff
More information about the Neon-commits
mailing list