t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-10-16 21:03:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtwayland: remove workaround for missing private headers (QTBUG-71340)

Browse Source 
* reading [1] again caused hope bug is fixed
* tested with buildhistory: no change at installed files detected
* recipies affected (lirios/meta-qt5-extra) are building fine (with the patch
  following)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller
2019-08-22 16:15:07 +00:00
committed by Martin Jansa
parent 53500ade77
commit a41cd9eded
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-qt/qt5/qtwayland_git.bb
-29
View File
@@ -44,32 +44,3 @@ 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
QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY ?= "1"
# First 6 characters before first + (e.g. 5.11.3-+git) or - (e.g. 5.11.3-2)
SHRT_VER ?= "${@d.getVar('PV').split('+')[0].split('-')[0]}"
do_install_append() {
if [ -d "${B}/src/client" -a "${QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY}" = "1" -a -d "${D}${includedir}/QtWaylandClient/${SHRT_VER}/QtWaylandClient/private/" ]; then
for header in `find ${B}/src/client -name '*wayland-*.h'`; do
header_base=`basename $header`
dest="${D}${includedir}/QtWaylandClient/${SHRT_VER}/QtWaylandClient/private/$header_base"
if [ ! -e "$dest" ]; then
echo "Manual install: $header_base to $dest"
install -m 644 "$header" "$dest"
fi
done
fi
if [ -d "${B}/src/compositor" -a "${QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY}" = "1" -a -d "${D}${includedir}/QtCompositor/${SHRT_VER}/QtCompositor/private/" ]; then
for header in `find ${B}/src/compositor -name '*wayland-*.h'`; do
header_base=`basename $header`
dest="${D}${includedir}/QtCompositor/${SHRT_VER}/QtCompositor/private/$header_base"
if [ ! -e "$dest" ]; then
echo "Manual install: $header_base to $dest"
install -m 644 "$header" "$dest"
fi
done
fi
}