From cab2b78a1e0a41f872b4d1293b5a0e03174dfa4c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 4 Feb 2020 18:48:09 +0200 Subject: [PATCH] Update revisions and patches --- ...Add-additional-include-path-for-DRM.patch} | 22 ++-- ...qtbase-don-t-use-neon-flags-on-arm64.patch | 26 ----- ...base-use-syncqt.pl-from-QT_HOST_PATH.patch | 31 ----- recipes-qt/qt6/qtbase_git.bb | 12 +- ...ct-default-install-dir-for-qml-files.patch | 107 +++++++++++++++++- recipes-qt/qt6/qtdeclarative_git.bb | 2 +- recipes-qt/qt6/qtremoteobjects_git.bb | 5 + .../{qtserialbus.bb => qtserialbus_git.bb} | 0 .../{qtserialport.bb => qtserialport_git.bb} | 0 .../qt6/{qtspeech.bb => qtspeech_git.bb} | 0 recipes-qt/qt6/{qtsvg.bb => qtsvg_git.bb} | 0 recipes-qt/qt6/{qttools.bb => qttools_git.bb} | 2 + ...ttranslations.bb => qttranslations_git.bb} | 0 .../qt6/{qtwayland.bb => qtwayland_git.bb} | 2 + .../{qtwebchannel.bb => qtwebchannel_git.bb} | 0 .../{qtwebsockets.bb => qtwebsockets_git.bb} | 0 .../{qtx11extras.bb => qtx11extras_git.bb} | 0 17 files changed, 129 insertions(+), 80 deletions(-) rename recipes-qt/qt6/qtbase/{0003-Add-additional-include-path-for-DRM.patch => 0001-Add-additional-include-path-for-DRM.patch} (63%) delete mode 100644 recipes-qt/qt6/qtbase/0001-qtbase-don-t-use-neon-flags-on-arm64.patch delete mode 100644 recipes-qt/qt6/qtbase/0002-qtbase-use-syncqt.pl-from-QT_HOST_PATH.patch rename recipes-qt/qt6/{qtserialbus.bb => qtserialbus_git.bb} (100%) rename recipes-qt/qt6/{qtserialport.bb => qtserialport_git.bb} (100%) rename recipes-qt/qt6/{qtspeech.bb => qtspeech_git.bb} (100%) rename recipes-qt/qt6/{qtsvg.bb => qtsvg_git.bb} (100%) rename recipes-qt/qt6/{qttools.bb => qttools_git.bb} (96%) rename recipes-qt/qt6/{qttranslations.bb => qttranslations_git.bb} (100%) rename recipes-qt/qt6/{qtwayland.bb => qtwayland_git.bb} (97%) rename recipes-qt/qt6/{qtwebchannel.bb => qtwebchannel_git.bb} (100%) rename recipes-qt/qt6/{qtwebsockets.bb => qtwebsockets_git.bb} (100%) rename recipes-qt/qt6/{qtx11extras.bb => qtx11extras_git.bb} (100%) diff --git a/recipes-qt/qt6/qtbase/0003-Add-additional-include-path-for-DRM.patch b/recipes-qt/qt6/qtbase/0001-Add-additional-include-path-for-DRM.patch similarity index 63% rename from recipes-qt/qt6/qtbase/0003-Add-additional-include-path-for-DRM.patch rename to recipes-qt/qt6/qtbase/0001-Add-additional-include-path-for-DRM.patch index 2202fd3..fc21ab7 100644 --- a/recipes-qt/qt6/qtbase/0003-Add-additional-include-path-for-DRM.patch +++ b/recipes-qt/qt6/qtbase/0001-Add-additional-include-path-for-DRM.patch @@ -1,7 +1,7 @@ -From dc8d5028d50534e2339ea3fd371a0bd7d89cc1f9 Mon Sep 17 00:00:00 2001 +From 452dd3af319d06c09a79b9eedec3bd414243a41e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 23 Jan 2020 15:56:43 +0200 -Subject: [PATCH 3/4] Add additional include path for DRM +Subject: [PATCH] Add additional include path for DRM Tegra has drm.h header in include/drm instead of include/libdrm @@ -10,22 +10,26 @@ cmake file searches only for xf86drm.h. Change-Id: If1e979c7d5aec520b18eed5b3fcbb5ac2e15cc62 --- - cmake/3rdparty/kwin/FindLibdrm.cmake | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + cmake/3rdparty/kwin/FindLibdrm.cmake | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/3rdparty/kwin/FindLibdrm.cmake b/cmake/3rdparty/kwin/FindLibdrm.cmake -index 9936e07eee..112a2ae358 100644 +index 9936e07eee..10822e693a 100644 --- a/cmake/3rdparty/kwin/FindLibdrm.cmake +++ b/cmake/3rdparty/kwin/FindLibdrm.cmake -@@ -104,6 +104,7 @@ if(NOT WIN32) - INTERFACE_COMPILE_OPTIONS "${Libdrm_DEFINITIONS}" +@@ -105,13 +105,19 @@ if(NOT WIN32) INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}" INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/libdrm" -+ INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/drm" ) ++ if(EXISTS "${Libdrm_INCLUDE_DIR}/drm") ++ set_property(TARGET Libdrm::Libdrm APPEND PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/drm" ++ ) ++ endif() ++ endif() -@@ -111,7 +112,7 @@ if(NOT WIN32) + mark_as_advanced(Libdrm_LIBRARY Libdrm_INCLUDE_DIR) # compatibility variables set(Libdrm_LIBRARIES ${Libdrm_LIBRARY}) diff --git a/recipes-qt/qt6/qtbase/0001-qtbase-don-t-use-neon-flags-on-arm64.patch b/recipes-qt/qt6/qtbase/0001-qtbase-don-t-use-neon-flags-on-arm64.patch deleted file mode 100644 index 8010cec..0000000 --- a/recipes-qt/qt6/qtbase/0001-qtbase-don-t-use-neon-flags-on-arm64.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f064668e6f0fb64ba3623b962046c015ab01d578 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 21 Jan 2020 11:30:00 +0200 -Subject: [PATCH 1/4] qtbase: don't use neon flags on arm64 - -NEON is mandatatory for aarch64 and compiler does't unrecognize --mfpu=neon command line option. - -Change-Id: I36e9c40e3fd3604d4895da0526152e90b2165770 ---- - cmake/QtCompilerOptimization.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/QtCompilerOptimization.cmake b/cmake/QtCompilerOptimization.cmake -index f1ebafc009..1f50044a6f 100644 ---- a/cmake/QtCompilerOptimization.cmake -+++ b/cmake/QtCompilerOptimization.cmake -@@ -62,7 +62,7 @@ if(GCC OR CLANG) - set(QT_CFLAGS_AVX512VBMI "-mavx512vbmi") - set(QT_CFLAGS_AESNI "-maes") - set(QT_CFLAGS_SHANI "-msha") -- if(NOT APPLE_UIKIT) -+ if(NOT APPLE_UIKIT AND NOT QT_64BIT) - set(QT_CFLAGS_NEON "-mfpu=neon") - endif() - set(QT_CFLAGS_MIPS_DSP "-mdsp") diff --git a/recipes-qt/qt6/qtbase/0002-qtbase-use-syncqt.pl-from-QT_HOST_PATH.patch b/recipes-qt/qt6/qtbase/0002-qtbase-use-syncqt.pl-from-QT_HOST_PATH.patch deleted file mode 100644 index f952e15..0000000 --- a/recipes-qt/qt6/qtbase/0002-qtbase-use-syncqt.pl-from-QT_HOST_PATH.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d675fd3aba34d4870fa565c94a2208659f818f35 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 21 Jan 2020 12:45:38 +0200 -Subject: [PATCH 2/4] qtbase: use syncqt.pl from QT_HOST_PATH - -Use syncqt.pl from QT_HOST_PATH if that is given, since qtbase -sources might not be available and CMAKE_INSTALL_PREFIX doesn't -check for sysroot. - -Change-Id: I165b17a5a02fd4dbb2340bf69a641b8aaab8fabd ---- - cmake/QtBuild.cmake | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake -index 738f38fbd1..d7014c3ed0 100644 ---- a/cmake/QtBuild.cmake -+++ b/cmake/QtBuild.cmake -@@ -777,6 +777,12 @@ function(qt_ensure_sync_qt) - qt_path_join(syncqt_install_dir ${QT_INSTALL_DIR} ${INSTALL_LIBEXECDIR}) - qt_copy_or_install(PROGRAMS "${SYNCQT_FROM_SOURCE}" - DESTINATION "${syncqt_install_dir}") -+ elseif(QT_HOST_PATH) -+ get_filename_component(syncqt_absolute_path -+ "${QT_HOST_PATH}/${INSTALL_LIBEXECDIR}/syncqt.pl" -+ ABSOLUTE) -+ set(QT_SYNCQT "${syncqt_absolute_path}" CACHE FILEPATH "syncqt script") -+ message(STATUS "Using host syncqt found at: ${QT_SYNCQT}") - else() - get_filename_component(syncqt_absolute_path - "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}/syncqt.pl" diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 4eb887d..67926df 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ + file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \ " inherit qt6-cmake @@ -14,9 +14,7 @@ include recipes-qt/qt6/qt6.inc include recipes-qt/qt6/qt6-git.inc SRC_URI += "\ - file://0001-qtbase-don-t-use-neon-flags-on-arm64.patch \ - file://0002-qtbase-use-syncqt.pl-from-QT_HOST_PATH.patch \ - file://0003-Add-additional-include-path-for-DRM.patch \ + file://0001-Add-additional-include-path-for-DRM.patch \ " DEPENDS = "\ @@ -38,7 +36,7 @@ PACKAGECONFIG_class-target ?= "\ " PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', \ - bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', '', d), d)}" + bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d), d)}" PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon', '', d)}" PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite openssl', '', d)}" @@ -62,7 +60,7 @@ PACKAGECONFIG[icu] = "-DFEATURE_icu=ON,-DFEATURE_icu=OFF,icu" PACKAGECONFIG[widgets] = "-DFEATURE_widgets=ON,-DFEATURE_widgets=OFF" PACKAGECONFIG[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb libxkbcommon xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil libxext" PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus" -PACKAGECONFIG[openssl] = "-DFEATURE_openssl${OPENSSL_LINKING_MODE}=ON,-DFEATURE_openssl=OFF,openssl,libssl" +PACKAGECONFIG[openssl] = "-DFEATURE_openssl_${OPENSSL_LINKING_MODE}=ON,-DFEATURE_openssl=OFF,openssl,libssl" PACKAGECONFIG[sql-sqlite] = "-DFEATURE_sql_sqlite=ON,-DFEATURE_sql_sqlite=OFF,sqlite3" PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF,at-spi2-atk" @@ -87,4 +85,4 @@ FILES_${PN}-tools += "\ BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "b29cb7889ac5b3a7b4b515971f462f65b7db7ec4" +SRCREV = "0f8039140c9e32cb1643eabd4539c53f0e5c1482" diff --git a/recipes-qt/qt6/qtdeclarative/0001-Use-correct-default-install-dir-for-qml-files.patch b/recipes-qt/qt6/qtdeclarative/0001-Use-correct-default-install-dir-for-qml-files.patch index c0d05d5..044f0dd 100644 --- a/recipes-qt/qt6/qtdeclarative/0001-Use-correct-default-install-dir-for-qml-files.patch +++ b/recipes-qt/qt6/qtdeclarative/0001-Use-correct-default-install-dir-for-qml-files.patch @@ -1,18 +1,61 @@ -From 5a8210389e7adb1c985e4c4a29d0a52c7b6ecb38 Mon Sep 17 00:00:00 2001 +From c663f443a671e683c119a4c03bcc7133abc676da Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 24 Jan 2020 09:34:19 +0200 -Subject: [PATCH] Use correct default install dir for qml files +Subject: [PATCH 1/2] Use correct default install dir for qml files Change-Id: I26b89d0e172465de3df36ffb0b2ea92975e99a2a --- - src/qml/Qt6QmlMacros.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/particles/CMakeLists.txt | 2 +- + src/qml/CMakeLists.txt | 2 +- + src/qml/Qt6QmlMacros.cmake | 6 +++--- + src/qmlmodels/CMakeLists.txt | 2 +- + src/qmlworkerscript/CMakeLists.txt | 2 +- + src/quick/CMakeLists.txt | 2 +- + src/quickshapes/CMakeLists.txt | 2 +- + 7 files changed, 9 insertions(+), 9 deletions(-) +diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt +index f6deceb5ae..36d77753cf 100644 +--- a/src/particles/CMakeLists.txt ++++ b/src/particles/CMakeLists.txt +@@ -134,7 +134,7 @@ set_target_properties(QuickParticles PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_URI QtQuick.Particles +- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Particles" ++ QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Particles" + ) + + qt6_qml_type_registration(QuickParticles) +diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt +index b61850f610..3720093e04 100644 +--- a/src/qml/CMakeLists.txt ++++ b/src/qml/CMakeLists.txt +@@ -618,7 +618,7 @@ set_target_properties(Qml PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_URI QtQml +- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml" ++ QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" + ) + + qt6_qml_type_registration(Qml) diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake -index 71e6b2230c..cc01b54106 100644 +index a3778512e1..bb8339affe 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake -@@ -156,7 +156,7 @@ function(qt6_add_qml_module target) +@@ -28,8 +28,8 @@ + # right location. (OPTIONAL) + # + # INSTALL_LOCATION: Intended installation directory for this module. If no +-# value is supplied, the default installation path will be ${Qt6_DIR}/qml. +-# (OPTIONAL). ++# value is supplied, the default installation path will be ++# ${INSTALL_QMLDIR}/qml. (OPTIONAL). + # + # DO_NOT_INSTALL_METADATA: When present, will not install the supporting files. + # +@@ -157,7 +157,7 @@ function(qt6_add_qml_module target) endif() if (NOT arg_INSTALL_LOCATION) @@ -21,3 +64,55 @@ index 71e6b2230c..cc01b54106 100644 endif() set_target_properties(${target} +diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt +index 7247812a29..75315ed00a 100644 +--- a/src/qmlmodels/CMakeLists.txt ++++ b/src/qmlmodels/CMakeLists.txt +@@ -69,7 +69,7 @@ set_target_properties(QmlModels PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_URI QtQml.Models +- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/Models" ++ QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models" + ) + + qt6_qml_type_registration(QmlModels) +diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt +index c7f7b60c7d..96b25be57e 100644 +--- a/src/qmlworkerscript/CMakeLists.txt ++++ b/src/qmlworkerscript/CMakeLists.txt +@@ -105,7 +105,7 @@ set_target_properties(QmlWorkerScript PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_URI QtQml.WorkerScript +- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript" ++ QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" + ) + + qt6_qml_type_registration(QmlWorkerScript) +diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt +index e1e8669886..3a6c07bee0 100644 +--- a/src/quick/CMakeLists.txt ++++ b/src/quick/CMakeLists.txt +@@ -603,7 +603,7 @@ set_target_properties(Quick PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_URI QtQuick +- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick" ++ QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick" + ) + + qt6_qml_type_registration(Quick) +diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt +index cba1695d3b..a6ee71aac0 100644 +--- a/src/quickshapes/CMakeLists.txt ++++ b/src/quickshapes/CMakeLists.txt +@@ -77,7 +77,7 @@ set_target_properties(QuickShapes PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.15 + QT_QML_MODULE_URI QtQuick.Shapes +- QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Shapes" ++ QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes" + ) + + qt6_qml_type_registration(QuickShapes) diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index 40b0b1f..1cb2e3e 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -20,4 +20,4 @@ DEPENDS += "qtbase qtdeclarative-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "b106d86c433706928b0b0c206a0d9f831681e1bf" +SRCREV = "49dbef650e2eedf178e310ac78eaba95f400584e" diff --git a/recipes-qt/qt6/qtremoteobjects_git.bb b/recipes-qt/qt6/qtremoteobjects_git.bb index cd03fa0..ec4dc3c 100644 --- a/recipes-qt/qt6/qtremoteobjects_git.bb +++ b/recipes-qt/qt6/qtremoteobjects_git.bb @@ -13,6 +13,9 @@ include recipes-qt/qt6/qt6.inc SRC_URI += "\ file://0001-Add-alarl-target-only-if-building-repc.patch \ + file://0001-Fix-the-build-with-current-qtbase-dev.patch \ + file://0001-Fix-Qt6-build.patch \ + file://0001-Replace-endl-with-Qt-endl.patch \ " DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" @@ -20,3 +23,5 @@ DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" BBCLASSEXTEND += "native nativesdk" SRCREV = "3707937ca78d21a21aecd0e671821dd4759cf385" + +PNBLACKLIST[qtremoteobjects] = "broken" diff --git a/recipes-qt/qt6/qtserialbus.bb b/recipes-qt/qt6/qtserialbus_git.bb similarity index 100% rename from recipes-qt/qt6/qtserialbus.bb rename to recipes-qt/qt6/qtserialbus_git.bb diff --git a/recipes-qt/qt6/qtserialport.bb b/recipes-qt/qt6/qtserialport_git.bb similarity index 100% rename from recipes-qt/qt6/qtserialport.bb rename to recipes-qt/qt6/qtserialport_git.bb diff --git a/recipes-qt/qt6/qtspeech.bb b/recipes-qt/qt6/qtspeech_git.bb similarity index 100% rename from recipes-qt/qt6/qtspeech.bb rename to recipes-qt/qt6/qtspeech_git.bb diff --git a/recipes-qt/qt6/qtsvg.bb b/recipes-qt/qt6/qtsvg_git.bb similarity index 100% rename from recipes-qt/qt6/qtsvg.bb rename to recipes-qt/qt6/qtsvg_git.bb diff --git a/recipes-qt/qt6/qttools.bb b/recipes-qt/qt6/qttools_git.bb similarity index 96% rename from recipes-qt/qt6/qttools.bb rename to recipes-qt/qt6/qttools_git.bb index 85e6d7f..85f34b9 100644 --- a/recipes-qt/qt6/qttools.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -21,3 +21,5 @@ SRC_URI += "\ BBCLASSEXTEND =+ "native nativesdk" SRCREV = "4c0ba237eabf66e028459e86620c448c4e21760a" + +PNBLACKLIST[qttools] = "broken" diff --git a/recipes-qt/qt6/qttranslations.bb b/recipes-qt/qt6/qttranslations_git.bb similarity index 100% rename from recipes-qt/qt6/qttranslations.bb rename to recipes-qt/qt6/qttranslations_git.bb diff --git a/recipes-qt/qt6/qtwayland.bb b/recipes-qt/qt6/qtwayland_git.bb similarity index 97% rename from recipes-qt/qt6/qtwayland.bb rename to recipes-qt/qt6/qtwayland_git.bb index 62ae385..419d76a 100644 --- a/recipes-qt/qt6/qtwayland.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -38,3 +38,5 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native" BBCLASSEXTEND =+ "native nativesdk" SRCREV = "12058b161e5f0d6f76523dc831acc8bdbc027fec" + +PNBLACKLIST[qtwayland] = "broken" diff --git a/recipes-qt/qt6/qtwebchannel.bb b/recipes-qt/qt6/qtwebchannel_git.bb similarity index 100% rename from recipes-qt/qt6/qtwebchannel.bb rename to recipes-qt/qt6/qtwebchannel_git.bb diff --git a/recipes-qt/qt6/qtwebsockets.bb b/recipes-qt/qt6/qtwebsockets_git.bb similarity index 100% rename from recipes-qt/qt6/qtwebsockets.bb rename to recipes-qt/qt6/qtwebsockets_git.bb diff --git a/recipes-qt/qt6/qtx11extras.bb b/recipes-qt/qt6/qtx11extras_git.bb similarity index 100% rename from recipes-qt/qt6/qtx11extras.bb rename to recipes-qt/qt6/qtx11extras_git.bb