Merge latest upstream

classes/qmake5_base.bbclass

@@ -50,7 +50,7 @@ inherit qmake5_paths
 
 generate_target_qt_config_file() {
  qtconf="$1"
- cat > "${qtconf}" <<EOF
+ cat > "$qtconf" <<EOF
 [Paths]
 Prefix = ${OE_QMAKE_PATH_PREFIX}
 Headers = ${OE_QMAKE_PATH_HEADERS}
@@ -220,9 +220,9 @@ qmake5_base_fix_install() {
  rm -rf ${D}${STAGING_PATH}
  # remove empty dirs
  TMP=`dirname ${D}${STAGING_PATH}`
- while test ${TMP} != ${D}; do
- rmdir ${TMP}
- TMP=`dirname ${TMP}`;
+ while test $TMP != ${D}; do
+ rmdir $TMP
+ TMP=`dirname $TMP`;
  done
  fi
 }

compat/legacy/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend

@@ -0,0 +1 @@
+inherit nativesdk

compat/scarthgap/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend

@@ -0,0 +1 @@
+inherit_defer nativesdk

conf/layer.conf

@@ -29,7 +29,7 @@ LAYERVERSION_qt5-layer = "1"
 
 LAYERDEPENDS_qt5-layer = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_qt5-layer = "scarthgap"
+LAYERSERIES_COMPAT_qt5-layer = "dunfell gatesgarth hardknott honister kirkstone langdale mickledore nanbield scarthgap"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
@@ -39,3 +39,6 @@ QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io/${QT_GIT_PROJECT}"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
+
+# Compatibility handling to support pre-Scarthgap OE releases.
+BBFILES += "${LAYERDIR}/compat/${@'scarthgap' if 'scarthgap' in d.getVar('LAYERSERIES_CORENAMES').split() else 'legacy'}/*/*/*.bbappend"

recipes-python/pyqt5/python3-pyqt-builder-native_1.16.0.bb

@@ -0,0 +1,12 @@
+SUMMARY = "The PEP 517 compliant PyQt build system"
+HOMEPAGE = "https://pypi.org/project/PyQt-builder/"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://pyproject.toml;md5=62537c8c9cf72be020148e3adc658ce3;beginline=17;endline=17"
+
+SRC_URI[sha256sum] = "47bbd2cfa5430020108f9f40301e166cbea98b6ef3e53953350bdd4c6b31ab18"
+
+inherit pypi ${@'setuptools3' if (d.getVar('LAYERSERIES_CORENAMES') in ["dunfell"]) else 'python_setuptools_build_meta'} native
+
+PYPI_PACKAGE = "PyQt-builder"
+
+DEPENDS += "python3-setuptools-scm-native"

recipes-python/pyqt5/python3-pyqt5-sip_12.13.0.bb

@@ -0,0 +1,15 @@
+SUMMARY = "The sip module support for PyQt5"
+HOMEPAGE = "https://pypi.org/project/PyQt5-sip/"
+LICENSE = "SIP | GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9cd437778ebd1c056a76b4ded73b3a6d"
+
+SRC_URI[sha256sum] = "7f321daf84b9c9dbca61b80e1ef37bdaffc0e93312edae2cd7da25b953971d91"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "PyQt5_sip"
+
+# Fix build with gcc-14
+# http://errors.yoctoproject.org/Errors/Details/761512/
+# siplib.c:3900:20: error: assignment to 'sipSimpleWrapper *' {aka 'struct _sipSimpleWrapper *'} from incompatible pointer type 'PyObject *' {aka 'struct _object *'} [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"

recipes-python/pyqt5/python3-pyqt5_5.15.9.bb → recipes-python/pyqt5/python3-pyqt5_5.15.10.bb

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit pypi python3-dir python3native qmake5 qmake5_paths
 
-SRC_URI[sha256sum] = "dc41e8401a90dc3e2b692b411bd5492ab559ae27a27424eed4bd3915564ec4c0"
+SRC_URI[sha256sum] = "d46b7804b1b10a4ff91753f8113e5b5580d2b4462f3226288e2d84497334898a"
 PYPI_PACKAGE = "PyQt5"
 
 S = "${WORKDIR}/PyQt5-${PV}"
@@ -41,17 +41,16 @@ PYQT_MODULES = " \
 "
 
 do_configure:prepend() {
- local i
- local extra_args
+ extra_args=""
 
  cd ${S}
 
  for i in ${DISABLED_FEATURES}; do
- extra_args="${extra_args} --disabled-feature=${i}"
+ extra_args="$extra_args --disabled-feature=$i"
  done
 
  for i in ${PYQT_MODULES}; do
- extra_args="${extra_args} --enable=${i}"
+ extra_args="$extra_args --enable=$i"
  done
 
  sip-build \
@@ -67,7 +66,7 @@ do_configure:prepend() {
  --enable=Qt \
  --enable=QtCore \
  --no-dbus-python \
- ${extra_args}
+ $extra_args
 
  QMAKE_PROFILES=${B}/PyQt5.pro
 }
@@ -81,9 +80,9 @@ do_install:append() {
 }
 
 pyqt_fix_sources() {
- find ${PKGD}/usr/src/debug/${PN} -type f -exec sed -i "s,\(${B}\|${S}\),/usr/src/debug/${PN}/${PV},g" {} \;
+ find ${PKGD}${TARGET_DBGSRC_DIR} -type f -exec sed -i "s,\(${B}\|${S}\),${TARGET_DBGSRC_DIR},g" {} \;
 }
-PACKAGESPLITFUNCS += "pyqt_fix_sources"
+PACKAGESPLITFUNCS =+ "pyqt_fix_sources"
 
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${OE_QMAKE_PATH_PLUGINS}"
 RDEPENDS:${PN} = " \

recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb

@@ -4,7 +4,6 @@ SUMMARY = "Host packages for the Qt5 standalone SDK or external toolchain"
 LICENSE = "MIT"
 
 inherit packagegroup
-inherit_defer nativesdk
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 

recipes-qt/qt5/nativesdk-qtbase_git.bb

@@ -201,4 +201,4 @@ fakeroot do_generate_qt_environment_file() {
 do_generate_qt_environment_file[umask] = "022"
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "e4391422574aa9aa89fece74f16c07c609cbbae2"
+SRCREV = "4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a"

recipes-qt/qt5/ptest/run-ptest

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 for x in ` awk '{print $1}' tst_list `;do
- ./${x};
+ ./$x;
 done
 

recipes-qt/qt5/qt3d_git.bb

@@ -44,7 +44,7 @@ do_configure:prepend() {
  ${S}/src/quick3d/imports/input/importsinput.pro
 }
 
-SRCREV = "e1b1a0d2970fd384bd52c734a72536d8452ad070"
+SRCREV = "67bee4599a28e1cadc14ed9ea4adc7061e250b90"
 SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
 
 SRCREV_FORMAT = "qt3d_assimp"

recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] clangformat: Fix build with LLVM 13
 Change-Id: I5eaad17a6f240aa1e3f246492b69f093b4f59fee
 Reviewed-by: David Schulz <david.schulz@qt.io>
 
-Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=14eb5b382cabf90352634393c19bf87a4c15766a]
+Upstream-Status: Backport [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=14eb5b382cabf90352634393c19bf87a4c15766a]
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  src/plugins/clangformat/clangformatbaseindenter.cpp | 4 ++++

recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] clangformat: Fix build with LLVM 13
 Change-Id: Ia9db10696fd129c8b989ecc4c9ecbb7f1f10e68c
 Reviewed-by: David Schulz <david.schulz@qt.io>
 
-Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7]
+Upstream-Status: Backport [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7]
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  src/plugins/clangformat/clangformatutils.cpp | 4 ++++

recipes-qt/qt5/qt5-git.inc

@@ -14,4 +14,4 @@ CVE_PRODUCT:append = " qt"
 
 S = "${WORKDIR}/git"
 
-PV = "5.15.12+git${SRCPV}"
+PV = "5.15.13+git${SRCPV}"

recipes-qt/qt5/qt5-ptest.inc

@@ -19,8 +19,8 @@ fakeroot do_install_ptest() {
  t=${D}${PTEST_PATH}
  for var in ` find ${B}/tests/auto/ -name tst_*`; do
  if [ -z ` echo ${var##*/} | grep '\.'` ]; then
- echo ${var##*/} >> ${t}/tst_list
- install -m 0744  ${var} ${t}
+ echo ${var##*/} >> $t/tst_list
+ install -m 0744 $var $t
  fi
  done
 }

recipes-qt/qt5/qtbase-native_git.bb

@@ -146,4 +146,4 @@ do_install() {
  echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
 }
 
-SRCREV = "e4391422574aa9aa89fece74f16c07c609cbbae2"
+SRCREV = "4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a"

recipes-qt/qt5/qtbase/0001-CVE-2023-51714-qtbase-5.15.diff

@@ -22,6 +22,7 @@ Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 (cherry picked from commit 1d4788a39668fb2dc5912a8d9c4272dc40e99f92)
 (cherry picked from commit 87de75b5cc946d196decaa6aef4792a6cac0b6db)
 ---
+Upstream-Status: Backport [658607a34ead214fbacbc2cca44915655c318ea9]
 
 diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
 index 834214f..ab166a6 100644

recipes-qt/qt5/qtbase/0002-CVE-2023-51714-qtbase-5.15.diff

@@ -33,6 +33,7 @@ Reviewed-by: Marc Mutz <marc.mutz@qt.io>
 (cherry picked from commit 9ef4ca5ecfed771dab890856130e93ef5ceabef5)
 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
 ---
+Upstream-Status: Backport [ee5da1f2eaf8932aeca02ffea6e4c618585e29e3]
 
 diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
 index ab166a6..de91fc0 100644