Various dependency fixes

Something starts to show up on screen now at least :)
This commit is contained in:
Volker Krause
2018-01-07 16:20:02 +01:00
parent 568d7f3be5
commit ac97f4e906
5 changed files with 34 additions and 15 deletions

View File

@@ -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 \
"

View File

@@ -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

View File

@@ -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;

View File

@@ -35,3 +35,5 @@ FILES_${PN} += " \
${libdir}/plugins/platformthemes/KDEPlasmaPlatformTheme.so \
${datadir}/kconf_update/* \
"
RDEPENDS_${PN} += "perl"

View File

@@ -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 \
"