mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-25 11:30:37 -09:00
9e52961485
Bump qt5 packages to latest submodule versions from https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 qtbase repo is a few commits after a tag named v5.15.18-lts-lgpl so assume it's now 5.15.18. qt5base patches are updated to make them apply silently and cleanly. For qt5webengine-chromium: - 0001-Add-python3-build-support.patc is removed as commit 68302c9ea158 ("Enable building with Python 3") contains similar changes, - 0004-Migrate-presubmit-to-python3.patch is only partially kept as commit 68302c9ea158 ("Enable building with Python 3") contains similar changes, - 0006-Fix-build-in-Python-3.11-invalid-mode-rU.patch is only partially kept as commit 68302c9ea158 ("Enable building with Python 3") contains similar changes, - 0007-Replace-imp.load_source-with-importlib-equivalent.patch is removed as commit 68302c9ea158 ("Enable building with Python 3") contains similar changes, - 0010-Fix-building-with-system-libxml2.patch is removed as commit c98d28f2f0f2 ("Fix building with system libxml2") contains similar changes, - 0012-Include-cstdint-for-uintptr_t-uint8_t-etc.patch is renamed 0009-Include-cstdint-for-uintptr_t-uint8_t-etc.patch and contains more file patching to make qt5webengine build again, Also make sure that the patches that have an upstream reference use the proper Upstream: tag, so we can remove them from checkpackageignore. For qt5webengine: - 0002-Add-python3-build-support.patch is removed as commit 2294cc4ed5fd ("Add option to chose python version for building 5.15 WebEngine") contains similar changes. It now supports both Python2 and Python3 and defaults to Python2 if found first. This can be overridden with -webengine-python-version python3 in QT5WEBENGINE_CONF_OPTS but this was unnecessary in my tests as Python3 was properly selected from $(HOST_DIR)/bin/. qt5webengine-chromium is updated with qt5webengine following the logic stated in Buildroot commitc53455ea4f("package/qt5/qt5webengine-chromium: bump version after qtwebengine bump"). I am unsure whether qt5webengine-chromium-catapult also requires an update. (cherry picked from commitff4243147d) [qt5webengine-chromium/0011-Shorted-printed-cmd-when-long-commands-fail.patch doesn't exist in 2025.02.x, file renaming not done] [qt5webengine-chromium/0012-Include-cstdint-for-uintptr_t-uint8_t-etc.patch is named 0011-Include-cstdint-for-uintptr_t-uint8_t-etc.patch in 2025.02.x, adapt renaming] Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> [Arnout: fix Upstream: tags] Signed-off-by: Arnout Vandecappelle <arnout@rnout.be> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> Signed-off-by: Thomas Perale <thomas.perale@mind.be>