summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@konsulko.com>2023-04-27 17:53:41 +0000
committerScott Murray <scott.murray@konsulko.com>2023-05-07 15:02:37 +0000
commit2b2d99ee385b2a17f8ccdf07c7353c6149d2d8f8 (patch)
tree332e414ec99c36d518ed9a7e4244f5246f0bdcb2
parent0df051c31b1c8687441d06e66750804c115db0bd (diff)
qtwayland: disable local patch that breaks version 5.15.7
Latest meta-qt5 brings qtwayland version 5.15.7 and this causes our local patch for client/qwaylandintegration to break the build, as the method it uses no longer exists, it appears: | .../tmp/work/aarch64-agl-linux/qtwayland/5.15.7+gitAUTOINC+533fff12f7-r0/git/src/client/qwaylandintegration.cpp: In member function 'void QtWaylandClient::QWaylandIntegration::reconfigureInputContext()': | .../tmp/work/aarch64-agl-linux/qtwayland/5.15.7+gitAUTOINC+533fff12f7-r0/git/src/client/qwaylandintegration.cpp:482:19: error: 'class QtWaylandClient::QWaylandDisplay' has no member named 'mUsingInputContextFromCompositor' | 482 | if (mDisplay->mUsingInputContextFromCompositor) | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Disable local patch for now with the plan to re-evaluate it per SPEC-4770 Bug-AGL: SPEC-4768 Change-Id: I27894536d49392589c58a3c46e4b1e015c7324fb Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> (cherry picked from commit 7baf8fb6dc8ed74332b7b587efae6097a4470237)
-rw-r--r--recipes-qt/qt/qtwayland_agldemo.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-qt/qt/qtwayland_agldemo.inc b/recipes-qt/qt/qtwayland_agldemo.inc
index fc02d571a..111e2acd9 100644
--- a/recipes-qt/qt/qtwayland_agldemo.inc
+++ b/recipes-qt/qt/qtwayland_agldemo.inc
@@ -11,9 +11,10 @@ FILESEXTRAPATHS:append := ":${THISDIR}/qtwayland"
# file://0001-protocol-update-3rd-party-ivi-application-protocol.patch \
# file://0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch \
#
+# This patch breaks the build with qtwayland 5.15.7 (SPEC-4770)
+# file://0001-client-qwaylandintegration-Do-not-attempt-to-use-the.patch \
+#
SRC_URI:append = "\
- file://0001-client-qwaylandintegration-Do-not-attempt-to-use-the.patch \
file://0001-qwaylandwindow-Short-circuit-isExposed.patch \
"
-