qtwayland: disable local patch that breaks version 5.15.7 22/28722/2
authorDenys Dmytriyenko <denys@konsulko.com>
Thu, 27 Apr 2023 17:53:41 +0000 (17:53 +0000)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Fri, 28 Apr 2023 08:51:46 +0000 (08:51 +0000)
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>
recipes-qt/qt/qtwayland_agldemo.inc

index fc02d57..111e2ac 100644 (file)
@@ -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 \
     "
-