diff --git a/QtWebEngine_6.8_skip_xnnpack.patch b/QtWebEngine_6.8_skip_xnnpack.patch new file mode 100644 index 0000000..d0939e4 --- /dev/null +++ b/QtWebEngine_6.8_skip_xnnpack.patch @@ -0,0 +1,19 @@ +Don't use xnnpack on ARM with QtWebEngine 6.8.0 + +Bug ref: https://bugreports.qt.io/browse/QTBUG-129985 + +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index fe4f2c3f1..729d4d3e9 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -544,6 +544,10 @@ foreach(arch ${archs}) + ) + endif() + endif() ++ if(cpu MATCHES "arm.*") ++ # https://bugreports.qt.io/browse/QTBUG-129985 ++ list(APPEND gnArgArg build_webnn_with_xnnpack=false) ++ endif() + unset(cpu) + endif() + diff --git a/qt6-webengine.changes b/qt6-webengine.changes index 1db7073..302c7c5 100644 --- a/qt6-webengine.changes +++ b/qt6-webengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 13 16:56:37 UTC 2024 - Christophe Marin + +- Add patch to avoid a build failure on ARM (QTBUG-129985): + * QtWebEngine_6.8_skip_xnnpack.patch + ------------------------------------------------------------------- Tue Oct 8 09:29:57 UTC 2024 - Christophe Marin diff --git a/qt6-webengine.spec b/qt6-webengine.spec index d2c0d87..861441f 100644 --- a/qt6-webengine.spec +++ b/qt6-webengine.spec @@ -54,6 +54,7 @@ Source99: qt6-webengine-rpmlintrc # Patches 0-100 are upstream patches # # Patches 100-200 are openSUSE and/or non-upstream(able) patches # Patch100: rtc-dont-use-h264.patch +Patch101: QtWebEngine_6.8_skip_xnnpack.patch # # Chromium/blink don't support PowerPC and zSystems and build fails on # 32 bits archs (https://bugreports.qt.io/browse/QTBUG-102143)