diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-10-06 21:48:53 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-08 20:02:46 +0000 |
| commit | db2fd6c263adbaed7eb2c6b3edf46c16e60b1703 (patch) | |
| tree | a2e88b348dc349d758ccbea05af74060b2bd96b5 | |
| parent | 6b5122ef14cb8c5ba5a9f790d824e92667e88783 (diff) | |
qtwayland: Fix build with clang/libc++
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch | 30 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 4 |
2 files changed, 33 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch new file mode 100644 index 00000000..1f15ea0d --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch @@ -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 + diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index cd55b43b..05f8b088 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -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 \ |