From 00fcc3a423d5f5f553906a9a9fbf84a1eccd73cd Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Wed, 10 Mar 2021 16:28:50 +0200
Subject: [PATCH] wayland: Adjust kwin to SeatInterface changes

---
 autotests/integration/globalshortcuts_test.cpp | 1 +
 autotests/integration/lockscreen.cpp           | 1 +
 src/input.cpp                                  | 1 +
 src/inputmethod.cpp                            | 1 +
 src/keyboard_repeat.cpp                        | 1 +
 src/pointer_input.cpp                          | 1 +
 src/wayland_server.cpp                         | 1 -
 src/xkb.cpp                                    | 1 +
 8 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/autotests/integration/globalshortcuts_test.cpp b/autotests/integration/globalshortcuts_test.cpp
index f750a9b12e..dd9765d508 100644
--- a/autotests/integration/globalshortcuts_test.cpp
+++ b/autotests/integration/globalshortcuts_test.cpp
@@ -18,6 +18,7 @@
 #include "workspace.h"
 
 #include <KWayland/Client/surface.h>
+#include <KWaylandServer/keyboard_interface.h>
 #include <KWaylandServer/seat_interface.h>
 
 #include <KGlobalAccel>
diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp
index 3d6f4a97d7..67f66a6822 100644
--- a/autotests/integration/lockscreen.cpp
+++ b/autotests/integration/lockscreen.cpp
@@ -27,6 +27,7 @@
 #include <KWayland/Client/shm_pool.h>
 #include <KWayland/Client/surface.h>
 #include <KWayland/Client/touch.h>
+#include <KWaylandServer/keyboard_interface.h>
 #include <KWaylandServer/seat_interface.h>
 
 //screenlocker
diff --git a/src/input.cpp b/src/input.cpp
index 1ed9fa1274..3fec471cb9 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -46,6 +46,7 @@
 #include <KWaylandServer/buffer_interface.h>
 #include <KWaylandServer/surface_interface.h>
 #include <KWaylandServer/tablet_v2_interface.h>
+#include <KWaylandServer/keyboard_interface.h>
 #include <decorations/decoratedclient.h>
 
 //screenlocker
diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp
index 88d5473388..c13c90a2be 100644
--- a/src/inputmethod.cpp
+++ b/src/inputmethod.cpp
@@ -19,6 +19,7 @@
 #include "deleted.h"
 
 #include <KWaylandServer/display.h>
+#include <KWaylandServer/keyboard_interface.h>
 #include <KWaylandServer/seat_interface.h>
 #include <KWaylandServer/textinput_v3_interface.h>
 #include <KWaylandServer/surface_interface.h>
diff --git a/src/keyboard_repeat.cpp b/src/keyboard_repeat.cpp
index 0851265e5c..c8a6e3e85d 100644
--- a/src/keyboard_repeat.cpp
+++ b/src/keyboard_repeat.cpp
@@ -11,6 +11,7 @@
 #include "input_event.h"
 #include "wayland_server.h"
 
+#include <KWaylandServer/keyboard_interface.h>
 #include <KWaylandServer/seat_interface.h>
 
 #include <QTimer>
diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp
index cc59172534..ca781ac023 100644
--- a/src/pointer_input.cpp
+++ b/src/pointer_input.cpp
@@ -25,6 +25,7 @@
 #include <KWaylandServer/buffer_interface.h>
 #include <KWaylandServer/datadevice_interface.h>
 #include <KWaylandServer/display.h>
+#include <KWaylandServer/pointer_interface.h>
 #include <KWaylandServer/pointerconstraints_v1_interface.h>
 #include <KWaylandServer/seat_interface.h>
 #include <KWaylandServer/surface_interface.h>
diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
index e93d51911c..564e7da8f5 100644
--- a/src/wayland_server.cpp
+++ b/src/wayland_server.cpp
@@ -402,7 +402,6 @@ bool WaylandServer::init(InitializationFlags flags)
     new ViewporterInterface(m_display, m_display);
     m_display->createShm();
     m_seat = new SeatInterface(m_display, m_display);
-    m_seat->create();
     new PointerGesturesV1Interface(m_display, m_display);
     new PointerConstraintsV1Interface(m_display, m_display);
     m_dataDeviceManager = new DataDeviceManagerInterface(m_display, m_display);
diff --git a/src/xkb.cpp b/src/xkb.cpp
index 77b3626faa..31421d8e2b 100644
--- a/src/xkb.cpp
+++ b/src/xkb.cpp
@@ -12,6 +12,7 @@
 // frameworks
 #include <KConfigGroup>
 // KWayland
+#include <KWaylandServer/keyboard_interface.h>
 #include <KWaylandServer/seat_interface.h>
 // Qt
 #include <QTemporaryFile>