[neon/kde/kwin/Neon/unstable] debian/patches: remove patch that isn't used

Harald Sitter null at kde.org
Mon Mar 14 08:32:53 GMT 2022


Git commit 165c540f22fa3918b298438c66a00bdb65d0d4de by Harald Sitter.
Committed on 14/03/2022 at 08:29.
Pushed by sitter into branch 'Neon/unstable'.

remove patch that isn't used

Jon disabled this a while ago in the series only but patches that
are present but not in the series cause warnings. so throw away the patch

D  +0    -69   debian/patches/Ignore-cursor-weird-behaviour-under-a-containerized-xvfb.patch

https://invent.kde.org/neon/kde/kwin/commit/165c540f22fa3918b298438c66a00bdb65d0d4de

diff --git a/debian/patches/Ignore-cursor-weird-behaviour-under-a-containerized-xvfb.patch b/debian/patches/Ignore-cursor-weird-behaviour-under-a-containerized-xvfb.patch
deleted file mode 100644
index 8c298d6..0000000
--- a/debian/patches/Ignore-cursor-weird-behaviour-under-a-containerized-xvfb.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Tue, 26 Jun 2018 10:47:27 +0200
-Subject: Ignore cursor weird behaviour under a containerized xvfb
-
----
- autotests/integration/move_resize_window_test.cpp | 14 ++++++++++++--
- autotests/integration/xwayland_input_test.cpp     | 12 ++++++++----
- 2 files changed, 20 insertions(+), 6 deletions(-)
-
---- a/autotests/integration/move_resize_window_test.cpp
-+++ b/autotests/integration/move_resize_window_test.cpp
-@@ -654,8 +654,6 @@
-     QVERIFY(moveStartSpy.isValid());
-     QSignalSpy moveEndSpy(client, &Client::clientFinishUserMovedResized);
-     QVERIFY(moveEndSpy.isValid());
--    QSignalSpy moveStepSpy(client, &Client::clientStepUserMovedResized);
--    QVERIFY(moveStepSpy.isValid());
-     QVERIFY(!workspace()->moveResizeClient());
- 
-     // use NETRootInfo to trigger a move request
-@@ -667,8 +665,20 @@
-     QCOMPARE(workspace()->moveResizeClient(), client);
-     QVERIFY(client->isMove());
-     QCOMPARE(client->geometryRestore(), origGeo);
-+
-+    // It seems that running in a containter under xvfb, the "emulated" cursor
-+    // doesn't behave as we expected.
-+    // This line is not normally needed, but the cursor position is 1, 1 under
-+    // a containerized xvfb.
-+    // Force the cursor position so the other tests can still be used.
-+    Cursor::setPos(origGeo.center());
-     QCOMPARE(Cursor::pos(), origGeo.center());
- 
-+    // Initializing the spy with the others capture 2 extra moving events (not
-+    // counting the ones added by setPos) (again, only in a containerized
-+    // xvfb)
-+    QSignalSpy moveStepSpy(client, &Client::clientStepUserMovedResized);
-+    QVERIFY(moveStepSpy.isValid());
-     // let's move a step
-     Cursor::setPos(Cursor::pos() + QPoint(10, 10));
-     QCOMPARE(moveStepSpy.count(), 1);
---- a/autotests/integration/xwayland_input_test.cpp
-+++ b/autotests/integration/xwayland_input_test.cpp
-@@ -139,10 +139,6 @@
-         QSKIP("XWayland 1.18 required");
-     }
-     X11EventReaderHelper eventReader(c.data());
--    QSignalSpy enteredSpy(&eventReader, &X11EventReaderHelper::entered);
--    QVERIFY(enteredSpy.isValid());
--    QSignalSpy leftSpy(&eventReader, &X11EventReaderHelper::left);
--    QVERIFY(leftSpy.isValid());
-     // atom for the screenedge show hide functionality
-     Xcb::Atom atom(QByteArrayLiteral("_KDE_NET_WM_SCREEN_EDGE_SHOW"), false, c.data());
- 
-@@ -171,6 +167,14 @@
-     QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
-     QVERIFY(windowCreatedSpy.isValid());
-     QVERIFY(windowCreatedSpy.wait());
-+
-+    // Running the tests in a container with xvfb the entered spy gets filled on
-+    // windowCreatedSpy.wait.
-+    QSignalSpy enteredSpy(&eventReader, &X11EventReaderHelper::entered);
-+    QVERIFY(enteredSpy.isValid());
-+    QSignalSpy leftSpy(&eventReader, &X11EventReaderHelper::left);
-+    QVERIFY(leftSpy.isValid());
-+
-     Client *client = windowCreatedSpy.last().first().value<Client*>();
-     QVERIFY(client);
-     QVERIFY(client->isDecorated());



More information about the Neon-commits mailing list