mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-06-21 08:52:35 +02:00
qtwayland: Fix build with clang/libc++
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
30
recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch
Normal file
30
recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From ccd576151ecf174dbfbb854dbcbfe55a5f723124 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 6 Oct 2019 21:44:38 -0700
|
||||
Subject: [PATCH] tst_seatv4: Include <array>
|
||||
|
||||
build fails with libc++ otherwise
|
||||
|
||||
tests/auto/client/seatv4/tst_seatv4.cpp:330:43: error: implicit instantiation of undefined template 'std::__1::array<const char *, 4>'
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
tests/auto/client/seatv4/tst_seatv4.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp
|
||||
index 7dc2e727..3ddbb971 100644
|
||||
--- a/tests/auto/client/seatv4/tst_seatv4.cpp
|
||||
+++ b/tests/auto/client/seatv4/tst_seatv4.cpp
|
||||
@@ -36,7 +36,7 @@
|
||||
#include <QtWaylandClient/private/qwaylanddisplay_p.h>
|
||||
#include <QtWaylandClient/private/qwaylandintegration_p.h>
|
||||
#endif
|
||||
-
|
||||
+#include <array>
|
||||
using namespace MockCompositor;
|
||||
|
||||
// wl_seat version 5 was introduced in wayland 1.10, and although that's pretty old,
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -13,7 +13,9 @@ LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
|
||||
"
|
||||
|
||||
SRC_URI += "file://0001-Fix-use-of-private-dependency.patch"
|
||||
SRC_URI += "file://0001-Fix-use-of-private-dependency.patch \
|
||||
file://0001-tst_seatv4-Include-array.patch \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ?= " \
|
||||
wayland-client \
|
||||
|
||||
Reference in New Issue
Block a user