From 3d60f9a4047979587624ad97776530cc807ef21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 26 Jan 2019 00:00:15 +0100 Subject: qtwayland: workaround upstream bug: install missing headers manually MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-qt/qt5/qtwayland_git.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 28dd2be8..f85fe356 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -44,3 +44,20 @@ BBCLASSEXTEND =+ "native nativesdk" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +# Since version 5.11.2 some private headers are not installed. Work around +# until fixed upstream. See https://bugreports.qt.io/browse/QTBUG-71340 for +# further details +do_install_append() { + if [ -d "${B}/src/client" ]; then + upstream_pv=`echo "${PV}" | sed 's:+git.*::g'` + for header in `find ${B}/src/client -name '*wayland-*.h'`; do + header_base=`basename $header` + dest="${D}${includedir}/QtWaylandClient/$upstream_pv/QtWaylandClient/private/$header_base" + if [ ! -e "$dest" ]; then + echo "Manual install: $header_base to $dest" + install -m 644 "$header" "$dest" + fi + done + fi +} -- cgit v1.2.3