[neon/qt6/qt6-wayland/Neon/unstable] debian/patches: drop patches that are in 6.6.0
Carlos De Maine
null at kde.org
Wed Jul 12 07:38:40 BST 2023
Git commit ef4024cf41191c4fced287e2133449a02336456e by Carlos De Maine.
Committed on 12/07/2023 at 06:38.
Pushed by carlosdem into branch 'Neon/unstable'.
drop patches that are in 6.6.0
D +0 -14 debian/patches/22daca49b807fefba58113a06b86df4274e49f62.diff
D +0 -13 debian/patches/7358255e45d9fa30cb213f1bb419fe8c46157a6c.diff
M +1 -2 debian/patches/series
https://invent.kde.org/neon/qt6/qt6-wayland/-/commit/ef4024cf41191c4fced287e2133449a02336456e
diff --git a/debian/patches/22daca49b807fefba58113a06b86df4274e49f62.diff b/debian/patches/22daca49b807fefba58113a06b86df4274e49f62.diff
deleted file mode 100644
index e88ecee..0000000
--- a/debian/patches/22daca49b807fefba58113a06b86df4274e49f62.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp
-index e9d82100fad675746adfa9042ebffb379d34d458..80a9a7739159da0f266cda9d5f7de65deb5d46bd 100644
---- a/src/client/qwaylanddatadevice.cpp
-+++ b/src/client/qwaylanddatadevice.cpp
-@@ -101,6 +101,9 @@ bool QWaylandDataDevice::startDrag(QMimeData *mimeData, Qt::DropActions supporte
- connect(m_dragSource.data(), &QWaylandDataSource::cancelled, this, &QWaylandDataDevice::dragSourceCancelled);
- connect(m_dragSource.data(), &QWaylandDataSource::dndResponseUpdated, this, [this](bool accepted, Qt::DropAction action) {
- auto drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag());
-+ if (!drag->currentDrag()) {
-+ return;
-+ }
- // in old versions drop action is not set, so we guess
- if (m_dragSource->version() < 3) {
- drag->setResponse(accepted);
diff --git a/debian/patches/7358255e45d9fa30cb213f1bb419fe8c46157a6c.diff b/debian/patches/7358255e45d9fa30cb213f1bb419fe8c46157a6c.diff
deleted file mode 100644
index d9100ce..0000000
--- a/debian/patches/7358255e45d9fa30cb213f1bb419fe8c46157a6c.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index e3070c9363a16b43f76befabe9c32ff71f6e2960..d4a499cce11e2d351ff82bb652d5c5af3ea24ce3 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -186,7 +186,7 @@ void QWaylandWindow::initWindow()
- }
- }
-
-- if (display()->viewporter() && !window()->flags().testFlag(Qt::BypassWindowManagerHint)) {
-+ if (display()->viewporter()) {
- mViewport.reset(new QWaylandViewport(display()->createViewport(this)));
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index d6f4ba4..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-22daca49b807fefba58113a06b86df4274e49f62.diff
-7358255e45d9fa30cb213f1bb419fe8c46157a6c.diff
+
More information about the Neon-commits
mailing list