Re: [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

Hello Simon,

On Fri, 12 Jul 2024 10:48:25 +0200
Simon Ruepp via buildroot <buildroot@buildroot.org> wrote:

> From: "Simon Ruepp" <ruepp.simon@mailbox.org>
> 
> Bump qt5 packages to latest submodule versions from:
> https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15
> 
> Signed-off-by: Simon Ruepp <ruepp.simon@mailbox.org>

Thanks for your patch. However, I will apply a similar patch that we
have received earlier:

  https://patchwork.ozlabs.org/project/buildroot/patch/20240611141216.1211627-1-roy.kollen.svendsen@gmail.com/

Indeed, there are a number of things in your patch that do much more
than bumping, but the commit log is completely silent about those
changes.

> diff --git a/package/qt5/qt53d-assimp/Config.in b/package/qt5/qt53d-assimp/Config.in
> new file mode 100644
> index 0000000000..421e424f8d
> --- /dev/null
> +++ b/package/qt5/qt53d-assimp/Config.in
> @@ -0,0 +1,4 @@
> +# Not user-selectable, it is only needed to be copied
> +# into the qt53d source tree.
> +config QT53D_ASSIMP
> +	bool

Why is this new package needed? Is this related to the version bump?


> diff --git a/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch
> deleted file mode 100644
> index cc9726418e..0000000000
> --- a/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch
> +++ /dev/null
> @@ -1,1858 +0,0 @@
> -From bf94b834e9beb4e7bc25dbc4c61f5e2db39e7cdc Mon Sep 17 00:00:00 2001
> -From: James Hilliard <james.hilliard1@gmail.com>
> -Date: Fri, 4 Feb 2022 15:43:35 -0700
> -Subject: [PATCH] Add python3 build support
> -
> -Adapted from:
> -https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-chromium-python3.patch
> -
> -Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

Should be explained in the commit log why this patch gets removed.


> rename to package/qt5/qt5webengine/0001-Add-python3-build-support.patch
> diff --git a/package/qt5/qt5webengine/0002-Pass-cppflags-and-ldflags-to-build.patch b/package/qt5/qt5webengine/0002-Pass-cppflags-and-ldflags-to-build.patch
> new file mode 100644
> index 0000000000..4fd2105c66
> --- /dev/null
> +++ b/package/qt5/qt5webengine/0002-Pass-cppflags-and-ldflags-to-build.patch
> @@ -0,0 +1,55 @@
> +From d4ad0fb124c017bdabe72d3a5671bd26c6216470 Mon Sep 17 00:00:00 2001
> +From: Stefan Mayrhofer <stefan.mayrhofer@ginzinger.com>
> +Date: Tue, 23 Aug 2022 13:48:26 +0200
> +Subject: [PATCH 1/1] Pass cppflags and ldflags to build
> +
> +This patch forwards cppflags and ldflags to the build. This fixes the following compilation error:
> +
> +[18497/21900] CXX v8_snapshot/obj/v8/gen-regexp-special-case/gen-regexp-special-case.o
> +FAILED: v8_snapshot/obj/v8/gen-regexp-special-case/gen-regexp-special-case.o
> +/usr/bin/g++ -MMD -MF v8_snapshot/obj/v8/gen-regexp-special-case/gen-regexp-special-case.o.d -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DV8_TYPED_ARRAY_MAX_SIZE_IN_HEAP=64 -DENABLE_MINOR_MC -DV8_INTL_SUPPORT -DV8_CONCURRENT_MARKING -DV8_ENABLE_LAZY_SOURCE_POSITIONS -DV8_WIN64_UNWINDING_INFO -DV8_ENABLE_REGEXP_INTERPRETER_THREADED_DISPATCH -DV8_SNAPSHOT_COMPRESSION -DV8_COMPRESS_POINTERS -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_DEPRECATION_WARNINGS -DV8_REVERSE_JSARGS -DV8_TARGET_ARCH_ARM64 -DV8_HAVE_TARGET_OS -DV8_TARGET_OS_LINUX -DDISABLE_UNTRUSTED_CODE_MITIGATIONS -DV8_COMPRESS_POINTERS -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_DEPRECATION_WARNINGS -DV8_REVERSE_JSARGS -DUSING_SYSTEM_ICU=1 -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC -DUCHAR_TYPE=uint16_t -Iv8_snapshot/gen -I../../
 3rdparty/chromium -I../../3rdparty/chromium/v8 -I../../3rdparty/chromium/v8/include -Iv8_snapshot/gen/v8 -Iv8_snapshot/gen -Iv8_snapshot/gen -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -fno-omit-frame-pointer -g0 -fvisibility=hidden -Wno-strict-overflow -Wno-return-type -O3 -fno-ident -fdata-sections -ffunction-sections -I/usr/include -I/usr/include -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -c ../../3rdparty/chromium/v8/src/regexp/gen-regexp-spec
 ial-case.cc -o v8_snapshot/obj/v8/gen-regexp-special-case/gen-regexp-special-case.o
> +In file included from ../../3rdparty/chromium/v8/src/regexp/gen-regexp-special-case.cc:10:
> +../../3rdparty/chromium/v8/src/regexp/special-case.h:12:10: fatal error: unicode/uchar.h: No such file or directory
> +   12 | #include "unicode/uchar.h"
> +      |          ^~~~~~~~~~~~~~~~~
> +compilation terminated.
> +
> +For the v8 build, extra_cppflags was not passed through.
> +v8 and host build both were also missing extra_ldflags. These are needed to find libraries in the buildroot directory.
> +

This patch needs your Signed-off-by line, as well as an Upstream: tag
(please run "make check-package" before sending patches, it will warn
you about those coding style issues).

Also, could you explain in the commit log why it's needed?

I suggest you wait for the patch from Roy to be applied, and then
rebase your changes on top of it, if that's fine with you?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot