From ac97f4e906f8d050a2c393ea1ae63ba9addf8a33 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sun, 7 Jan 2018 16:20:02 +0100
Subject: [PATCH] Various dependency fixes

Something starts to show up on screen now at least :)
---
 recipes-plasma/kwin.inc                        | 13 ++++++++++++-
 recipes-plasma/kwin/0001-compile-fix.patch     | 13 -------------
 recipes-plasma/kwin/0002-rpi-compile-fix.patch | 13 +++++++++++++
 recipes-plasma/plasma-integration.inc          |  2 ++
 recipes-plasma/plasma-workspace.inc            |  8 +++++++-
 5 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 recipes-plasma/kwin/0002-rpi-compile-fix.patch

diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc
index 49772e7..e615c9e 100644
--- a/recipes-plasma/kwin.inc
+++ b/recipes-plasma/kwin.inc
@@ -34,12 +34,17 @@ DEPENDS = " \
     xcb-util-cursor \
     fontconfig \
     libepoxy \
+    libinput \
 "
 
 SRC_URI = " \
-    git://anongit.kde.org/${PN};nobranch=1 \
+    git://anongit.kde.org/${BPN};nobranch=1 \
     file://0001-compile-fix.patch \
 "
+SRC_URI_append_raspberrypi += " \
+    file://0002-rpi-compile-fix.patch \
+"
+
 S = "${WORKDIR}/git"
 
 inherit cmake_qt5 gettext python3native
@@ -80,3 +85,9 @@ FILES_${PN}-dev = " \
     ${datadir}/dbus-1/interfaces/*.xml \
     ${includedir}/*.h \
 "
+
+RDEPENDS_${PN} += " \
+    qtvirtualkeyboard-qmlplugins \
+    qtwayland-plugins \
+    xserver-xorg-xwayland \
+"
diff --git a/recipes-plasma/kwin/0001-compile-fix.patch b/recipes-plasma/kwin/0001-compile-fix.patch
index ab94d39..e391a82 100644
--- a/recipes-plasma/kwin/0001-compile-fix.patch
+++ b/recipes-plasma/kwin/0001-compile-fix.patch
@@ -10,19 +10,6 @@ index a77261a54..6404ba006 100644
  #include <QCursor>
  #include <QPainter>
  #include <QQmlContext>
-diff --git a/plugins/platforms/x11/common/eglonxbackend.cpp b/plugins/platforms/x11/common/eglonxbackend.cpp
-index 1990fc49b..ac3376bfa 100644
---- a/plugins/platforms/x11/common/eglonxbackend.cpp
-+++ b/plugins/platforms/x11/common/eglonxbackend.cpp
-@@ -272,7 +272,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window)
-         //       cannot be an xcb_window_t.
-         surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr);
-     } else {
--        surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr);
-+        surface = eglCreateWindowSurface(eglDisplay(), config(), (void *) &window, nullptr);
-     }
- 
-     return surface;
 diff --git a/plugins/platforms/x11/standalone/x11_platform.h b/plugins/platforms/x11/standalone/x11_platform.h
 index 07d79b889..c8b3078af 100644
 --- a/plugins/platforms/x11/standalone/x11_platform.h
diff --git a/recipes-plasma/kwin/0002-rpi-compile-fix.patch b/recipes-plasma/kwin/0002-rpi-compile-fix.patch
new file mode 100644
index 0000000..479a85d
--- /dev/null
+++ b/recipes-plasma/kwin/0002-rpi-compile-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/platforms/x11/common/eglonxbackend.cpp b/plugins/platforms/x11/common/eglonxbackend.cpp
+index 1990fc49b..ac3376bfa 100644
+--- a/plugins/platforms/x11/common/eglonxbackend.cpp
++++ b/plugins/platforms/x11/common/eglonxbackend.cpp
+@@ -272,7 +272,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window)
+         //       cannot be an xcb_window_t.
+         surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr);
+     } else {
+-        surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr);
++        surface = eglCreateWindowSurface(eglDisplay(), config(), (void *) &window, nullptr);
+     }
+
+     return surface;
diff --git a/recipes-plasma/plasma-integration.inc b/recipes-plasma/plasma-integration.inc
index 6aff682..fbac4f3 100644
--- a/recipes-plasma/plasma-integration.inc
+++ b/recipes-plasma/plasma-integration.inc
@@ -35,3 +35,5 @@ FILES_${PN} += " \
     ${libdir}/plugins/platformthemes/KDEPlasmaPlatformTheme.so \
     ${datadir}/kconf_update/* \
 "
+
+RDEPENDS_${PN} += "perl"
diff --git a/recipes-plasma/plasma-workspace.inc b/recipes-plasma/plasma-workspace.inc
index bff1580..d70e436 100644
--- a/recipes-plasma/plasma-workspace.inc
+++ b/recipes-plasma/plasma-workspace.inc
@@ -41,7 +41,7 @@ DEPENDS = " \
 "
 
 SRC_URI = " \
-    git://anongit.kde.org/${PN};nobranch=1 \
+    git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
@@ -102,3 +102,9 @@ FILES_${PN}-dev = " \
     ${datadir}/kdevappwizard/templates/* \
     ${datadir}/dbus-1/interfaces/*.xml \
 "
+
+RDEPENDS_${PN} += " \
+    kinit \
+    xprop \
+    xset \
+"