From 591fac6a0d58a9b4a12af5e1ee9ff91231701cce Mon Sep 17 00:00:00 2001
From: Ionen Wolkens <ionen@gentoo.org>
Date: Wed, 4 Dec 2024 04:25:26 -0500
Subject: dev-qt/qtwebengine: do xnnpack build workaround for arm64 (qt6)

Closes: https://bugs.gentoo.org/945843
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
---
 .../files/qtwebengine-6.8.1-aarch64-xnnpack.patch      | 18 ++++++++++++++++++
 dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild            |  1 +
 dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild         |  1 +
 3 files changed, 20 insertions(+)
 create mode 100644 dev-qt/qtwebengine/files/qtwebengine-6.8.1-aarch64-xnnpack.patch

(limited to 'dev-qt/qtwebengine')

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-aarch64-xnnpack.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-aarch64-xnnpack.patch
new file mode 100644
index 000000000000..033934a2dc5b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-aarch64-xnnpack.patch
@@ -0,0 +1,18 @@
+Patch status: *seems* fixed in Qt 6.9+
+
+Temporary (lame) workaround for [1] given backporting[2] (which
+is believed to be the fix) does not seem trivial. A better fix
+is welcome if have one and can test it, but otherwise this can
+likely be removed in Qt 6.9.0.
+
+[1] https://bugs.gentoo.org/945843
+[2] https://github.com/google/XNNPACK/pull/1789
+--- a/src/3rdparty/chromium/third_party/xnnpack/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/xnnpack/BUILD.gn
+@@ -27,4 +27,5 @@
+ 
++  cflags = [ "-Wno-error=incompatible-pointer-types" ]
+   if (is_clang || !is_win) {
+-    cflags = [
++    cflags += [
+       "-Wno-unused-function",
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild
index fb3569f4ffa9..2bdf65bdc2e4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild
@@ -109,6 +109,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.8.1-QTBUG-131156.patch
+	"${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch
 )
 
 python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index fe2e1400e79f..854bf4948352 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -108,6 +108,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
+	"${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch
 )
 
 python_check_deps() {
-- 
cgit v1.2.3