diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-18 15:02:05 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-03 14:10:43 +0000 |
commit | 28d4bfdf74ba9d66ad749fc7208ca8dc147a3927 (patch) | |
tree | 0c1860045e9ca308bab1b30ab163bca0df4fcb2c /recipes-qt/qt5/qtwayland_git.bb | |
parent | 5a328383122c7d82b096b1b090a850e14d6fa311 (diff) |
Upgrade to 5.12.2
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwayland_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8f901ad7..a63c49cd 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1dc85b95ab0adc1e805d059e2c35c671ef790011" +SRCREV = "0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb" BBCLASSEXTEND =+ "native nativesdk" @@ -45,21 +45,3 @@ BBCLASSEXTEND =+ "native nativesdk" # http://errors.yoctoproject.org/Errors/Details/152641/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRC_URI += "file://0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch" - -# 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 -} |