Re: [Buildroot] [PATCH 2025.02.x 5/5] package/qt5: bump packages to latest 5.15 kde submodule version

[Quentin Schulz via buildroot <buildroot@buildroot.org>]

Hi all,

On 3/24/26 12:01 PM, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
> 
> 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,
> 
> 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 commit c53455ea4ffa
> ("package/qt5/qt5webengine-chromium: bump version after qtwebengine
> bump").
> 
> I am unsure whether qt5webengine-chromium-catapult also requires an
> update.
> 

Note that I made a mistake in v1 of the series for master that I 
necessarily made when backporting for 2025.02, see...

[...]

> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index 3ad2bdfc04..0e375e83fe 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -QT5BASE_VERSION = 2b9835f5c9bcfe3105b60a8dd33c1db7d8611378
> +QT5BASE_VERSION = bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8
>   QT5BASE_SITE = $(QT5_SITE)/qtbase
>   QT5BASE_SITE_METHOD = git
>   QT5BASE_CPE_ID_VENDOR = qt

... there should be a change to QT5BASE_CPE_ID_VERSION here too. See v2 
here: 
https://lore.kernel.org/buildroot/20260327-qt5-5-15-18-v2-5-4c98e853266a@cherry.de/.

I already didn't like much sending a backport series for 2025.02 before 
the series for master was merged so I will refrain from posting a v2 for 
the backport, but if the series for master gets merged, this one here 
only needs

-QT5BASE_CPE_ID_VERSION = 5.15.14
+QT5BASE_CPE_ID_VERSION = 5.15.18

If you want to modify when applying without going through a v2. 
Otherwise, lemme know I'll take care of the backport whenever possible.

Cheers,
Quentin
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot