[Bug 272422] [exp-run] Qt6: Update Qt6 to 6.5.1

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272422

--- Comment #11 from Robert Clausecker <fuz at FreeBSD.org> ---
(In reply to Jason E. Hale from comment #10)

This build fix also fixed one of the issues in the armv7 build.  The other
issue is that the aforementioned change botched a patch and removed a file from
the build I had previously added to it to make cpuid detection work.  The patch
I'm planning to commit is just this:

---
a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni
+++
b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni.orig      
2023-03-28 19:45:02 UTC
+--- src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni.orig      
2023-09-07 16:02:00 UTC
 +++ src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni
-@@ -78,6 +78,7 @@ crypto_sources = [
+@@ -78,10 +78,12 @@ crypto_sources = [
    "src/crypto/cpu_aarch64_apple.c",
    "src/crypto/cpu_aarch64_fuchsia.c",
    "src/crypto/cpu_aarch64_linux.c",
@@ -8,7 +8,12 @@
    "src/crypto/cpu_aarch64_win.c",
    "src/crypto/cpu_arm.c",
    "src/crypto/cpu_arm_linux.c",
-@@ -184,6 +185,7 @@ crypto_sources = [
+   "src/crypto/cpu_arm_linux.h",
++  "src/crypto/cpu_arm_freebsd.c",
+   "src/crypto/cpu_intel.c",
+   "src/crypto/cpu_ppc64le.c",
+   "src/crypto/crypto.c",
+@@ -184,6 +186,7 @@ crypto_sources = [
    "src/crypto/rand_extra/deterministic.c",
    "src/crypto/rand_extra/forkunsafe.c",
    "src/crypto/rand_extra/fuchsia.c",

This patch hooks "cpu_arm_freebsd.c" provided by another patch back into the
build.  The file has already been upstreamed into boringssl, but it looks like
qt6-webengine does not use a version of boringssl new enough to have that
patch.

-- 
You are receiving this mail because:
You are on the CC list for the bug.