From a41cd9eded4bd661a71c86a2d6080094f8a77069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 18 Aug 2019 16:13:36 +0200 Subject: qtwayland: remove workaround for missing private headers (QTBUG-71340) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwayland_git.bb | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'recipes-qt/qt5/qtwayland_git.bb') diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index cfcfad8e..8a6f38f6 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -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 -} -- cgit v1.2.3 From 725c87da81a5bfb6e838f7fb53f14bb2c06cf81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 18 Aug 2019 16:22:26 +0200 Subject: qtwayland: do not reference private modules in cmake Qt5WaylandClient MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The files referenced are not installed causing trouble in projects using Qt5WaylandClientConfig.cmake: | CMake Error at /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/liri-shell/0.9.0+gitAUTOINC+42bd7f4610-r0/recipe-sysroot/usr/lib/cmake/Qt5WaylandClient/Qt5WaylandClientConfig.cmake:110 (find_package): | Could not find a package configuration file provided by | "Qt5LinuxAccessibilitySupport" (requested version 5.13.0) with any of the | following names: | | Qt5LinuxAccessibilitySupportConfig.cmake | qt5linuxaccessibilitysupport-config.cmake Fixes: QTBUG-76042 [1] Upstream-Status: Applied [2] [1] https://bugreports.qt.io/browse/QTBUG-76042 [2] https://code.qt.io/cgit/qt/qtwayland.git/commit/?id=f4636b934f90b2a07b09f1925a86440cf1944d08 Signed-off-by: Andreas Müller --- recipes-qt/qt5/qtwayland_git.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'recipes-qt/qt5/qtwayland_git.bb') diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8a6f38f6..cd55b43b 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " +SRC_URI += "file://0001-Fix-use-of-private-dependency.patch" + PACKAGECONFIG ?= " \ wayland-client \ wayland-server \ -- cgit v1.2.3 From 0be6a24a4623f52b8b92fa77f0f1c3faf4169d27 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 14 Oct 2019 09:40:17 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.13.2 branch. Task-number: QTBUG-78897 Change-Id: Ib95b6d901569c2a5ae64b66926fa27d79251c18a Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtwayland_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtwayland_git.bb') diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 949a28a6..0bb90c5f 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 = "1ed0782e93dafb0a3d5ef3a02c9c3999825817ee" +SRCREV = "615aa208d131ab99e967725504fcb16fdda4ea83" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3