gentoo auto-resync : 05:12:2024 - 02:07:17

8 files changed, 329 insertions, 5 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 1b01250e38d7..e72c9da5663b 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 4ff68196a094..5467be7a83cf 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -4,6 +4,9 @@ AUX qt-creator-14.0.1-clang19.patch 1046 BLAKE2B 2d1fefe8c48d448d51ca5c25e5f91cc
 AUX qt-creator-14.0.2-qt681.patch 6003 BLAKE2B 2243b5779a6948308367430528b183c4981f634481cd161b1c2ea45980c0b81ee409e8705965bc6ebbe91e6779f7c67cc6674ddc381c0c83c0829ae18d1ca621 SHA512 973bf5df6ad1e781ad6b44eef2c988ece636e7b57554f8ef4ecb43f6577c824c8e0669ae89cc6e4ebdcafdf592e235841844d4cbe3b350f8b463a41e5b3c66cd
 AUX qt-creator-15.0.0-musl-no-execinfo.patch 1313 BLAKE2B acbc23f4e943f1d5942b8f91e75acefb24d8d396a37d15965892ef6da60891c92824628d1e719762273c5fce6752812b6d50a18b4536484c8e20cd9d5100ea62 SHA512 644c7f8337a8a7c66fbcea9f2d097ba508eea9b7a3550bcf4b3dfc267c14d5c2b9d517c0ff092aa101fd902b98af44133ac81f1ba1a5fdbe1251dda45677447d
 DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 491b00aa9900b45e8e0dea33d4a7c99f543cf3b526931121b87d51828292b1e7e422e890c69cb904a2d5ca3c20de5fa60d87a889c0036a9624c1825b63efe57f SHA512 45b7c1aef062f59446b162006f22fcba17a99f02008624ab332ae5109a31ec55caa3548f7b61a4feb04793fa049b2a67c4a3c37aa3d3e2f3eced31bd11a48ab2
+DIST qt-creator-opensource-src-15.0.0-vendor.tar.xz 509332 BLAKE2B 7c417a0fc14eb3b8e27aec73afa362cea43008107a68290c8fc17631fb06d24f89d7454e191a68ba199bd349142b3f1ae1ddbdff0af6bc69b6d53f61227236c0 SHA512 52fb8b585f8821919550622710b76ab7376668c8cae76ea9880d34b281f052972b3c08192ce8e994f51d86de33c247d27bf3252194dd17c1a7b37e8d5e68d42d
+DIST qt-creator-opensource-src-15.0.0.tar.xz 53254544 BLAKE2B bf295974a904c182f37321a8e7e06704906d9db34f3c96d3e7b1ac2aad2807c106f271e480e9ef7c72f98413fd6faca3c6d9e47d47b62736ce88f4722857be05 SHA512 0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279
 EBUILD qt-creator-14.0.2.ebuild 7753 BLAKE2B 59bda93c6f931b37f782d6fce8abbd4d7bb22c71300a9121a52cdaf69141e624d04ff4dcc99b62137ca02944e9a96ac0326e257039e00d8030b19381f23e3d75 SHA512 5aebad9c4b6b87380db5ceca2cac143ddda085b5da007f313244c808f9b33b5c536ad8f92eebbbfe7c18a57398d666312277a660f481a1896c301e5c46dd0e89
-EBUILD qt-creator-9999.ebuild 8286 BLAKE2B 8e006b482d2e74621adf1e7cae1ae6e2ccb2c4a09678a69dce01f32849c5704c6997633db3eca5299b85729b2ee06ae2774da2aac69051e63002a1f28ca313e3 SHA512 f85cd2344eee23fd07d9f496567f68654112921490b9fc5dac914dc74f63992fcfb84e36862d212638f0355f043d55a029becab55bf1ee3d996844c0ee9bb535
+EBUILD qt-creator-15.0.0.ebuild 8441 BLAKE2B 62b3389e675f251952f6d04b75861ae8ef8b6b607ca80e19bdbb94c1d317e7e7d000bea0ec35a0a6ce7c8ace59b7f1edffd77471e1f5e049074f90e287dbfa67 SHA512 b81ee65f55e4b923b51a32fc7515340e86f2c6d88104ad13b4f83d5ac4acbe73619d2bf4dd379589f5fb6f3f38c42e7e2b19b639ef74500deb8aa20d00ab4d05
+EBUILD qt-creator-9999.ebuild 8441 BLAKE2B 62b3389e675f251952f6d04b75861ae8ef8b6b607ca80e19bdbb94c1d317e7e7d000bea0ec35a0a6ce7c8ace59b7f1edffd77471e1f5e049074f90e287dbfa67 SHA512 b81ee65f55e4b923b51a32fc7515340e86f2c6d88104ad13b4f83d5ac4acbe73619d2bf4dd379589f5fb6f3f38c42e7e2b19b639ef74500deb8aa20d00ab4d05
 MISC metadata.xml 1273 BLAKE2B 3c4e41b9422bad858fae48bdc9814c7e259dcea2d1da6c383a54f809152d77f72438e05115463866bea7f87a9d79301ba65bbaa7e0fd3d2255b5fdfcc58a9a78 SHA512 a830e418863904943cd33deb4f09fbd98557502ccd37137d891957ee1883fe80b9a8091cdcb0d93c4d74c343ffdae9721ecc56414d0b2b9c7b79984687f07cf1
diff --git a/dev-qt/qt-creator/qt-creator-15.0.0.ebuild b/dev-qt/qt-creator/qt-creator-15.0.0.ebuild
new file mode 100644
index 000000000000..02b286a21404
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-15.0.0.ebuild
@@ -0,0 +1,297 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..19} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="
+		https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz
+		https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz
+	"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+LICENSE+=" BSD MIT" # go
+SLOT="0"
+IUSE="
+	+clang designer doc +help keyring plugin-dev qmldesigner
+	serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.5.4:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	dev-cpp/yaml-cpp:=
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtcharts-${QT_PV}
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+# intentionally skipping := on go (unlike go-module.eclass) given not
+# worth a massive rebuild every time for the minor go usage
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-lang/go-1.21.7
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		cd -- "${S}"/src/libs/gocmdbridge/server || die
+		edo go mod vendor
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+
+	# avoid stripping for Go, use sed to avoid rebases as may be there forever
+	sed -i 's/-s -w //' src/libs/gocmdbridge/server/CMakeLists.txt || die
+
+	if use plugin-dev; then #928423
+		# cmake --install --component integrates poorly with the cmake
+		# eclass and the install targets are otherwise missing, so strip
+		# out EXCLUDE_FROM_ALL until figure out a better solution
+		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
+			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+	fi
+}
+
+src_configure() {
+	go-env_set_compile_environment
+	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
+
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DBUILD_DOCS_BY_DEFAULT=$(usex doc)
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# sticking to bundled for now until it switches to KF6's
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+		-DBUILD_PLUGIN_APPSTATISTICSMONITOR=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		# meant to be in sync with qtbase[journald], but think(?) not worth
+		# handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
+		-Djournald=no
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+
+		# for bundled qtkeychain (no switch to unbundle right now)
+		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
+		-DLIBSECRET_SUPPORT=$(usex keyring)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-build/cmake)
+- MesonProjectManager (dev-build/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-debug/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- AppStatisticsMonitor (USE=tracing)
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e4e0e8391798..02b286a21404 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -26,7 +26,7 @@ else
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
 	SRC_URI="
 		https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz
-		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
+		https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz
 	"
 	S=${WORKDIR}/${QTC_P}
 	KEYWORDS="~amd64"
@@ -112,7 +112,7 @@ pkg_setup() {
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
-		cd "${S}/src/libs/gocmdbridge/server" || die
+		cd -- "${S}"/src/libs/gocmdbridge/server || die
 		edo go mod vendor
 	else
 		default
@@ -126,6 +126,9 @@ src_prepare() {
 	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
 		-i cmake/QtCreatorAPIInternal.cmake || die
 
+	# avoid stripping for Go, use sed to avoid rebases as may be there forever
+	sed -i 's/-s -w //' src/libs/gocmdbridge/server/CMakeLists.txt || die
+
 	if use plugin-dev; then #928423
 		# cmake --install --component integrates poorly with the cmake
 		# eclass and the install targets are otherwise missing, so strip
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3788fc1a9463..83b39df684b1 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -9,6 +9,7 @@ AUX qtwebengine-6.7.2-musl-cstdint.patch 463 BLAKE2B ebc2d97974e960d295a6f5d908b
 AUX qtwebengine-6.7.3-missing-gn-deps-blink.patch 1677 BLAKE2B 6081d8e60712e50b6cd043ed4db645727f38676d91ec3b05e2bcf9acf790273a95e9f67adda7bda573cc73b331b0b565a6b485f91c1a34bbb20b1c4814ce16de SHA512 5e059420feaba3fa3fdf9ac1aabfc655550e4a47f2416d009a5e79643052511f14fe9758dde42026932e1f10976cea2f5d9129c807011eae5efe1d823253a0cc
 AUX qtwebengine-6.7.3-missing-gn-deps.patch 1379 BLAKE2B db39a7c9d374c905d35516fe2f5ee7026d99959215442996d517257431f59a4be4e43041378775c75fa7499fd2bd917e1deb6d8373d5f2cf5b93a9ff7636f767 SHA512 9638e515c294b32362eab9047e6cb926e535a3ee684f9dfac6cf2f7e8a24aa7825265ad768d91ec0a27f34266aef7443b59cc3256a8d0ee527ff8a60b44a735c
 AUX qtwebengine-6.8.1-QTBUG-131156.patch 7291 BLAKE2B 90993c2406631001e1f75f32da495e9d6c91a81d92e30b3902da45a08fe18b36cdddaf7763d58cdd48ea9f25566da3d107807e71bd47c5422e54c9fcbf07cd72 SHA512 0f9d2e14fa2abfe73fa691d91ad57fe833a9b70627d737c49f6928111a4d0a1d294a2a38620b1368b3fad6a347eff408a521fbc2cf4ff317ebf5a63b62c1efb6
+AUX qtwebengine-6.8.1-aarch64-xnnpack.patch 629 BLAKE2B 2809c1e159252c3131c318cd31fd6d7875a41ca477ffcc82b832838eeb0b89ed15baea25f95c894369b73fd41c7cfea0fcc880b5fc097b8e987b718300fb7d3b SHA512 b1e3330a2e6e8b352cf83b8c2e9b469772638d331b78c9f690208044a72a1bbefc5b3114affc5a512a8c0839ece197322a8382da8e8c3be18042a9c394034c31
 DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
 DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2a603a28881d9cf97f339d951217f3837d614ebb58aff9b0963220be04cc9a17869b6021a6d7687848bd8ccd1c8c49115a5e6944be84b SHA512 50e0bc7b4236859b4419f2f8eaf37e47c1994c30ca3bf584dd2f4996b5f8ba7cd31c8aae48c28f0fcd39c144490f5e451c7ecf5d340e7b10fa2e37666ef21100
@@ -22,7 +23,7 @@ EBUILD qtwebengine-5.15.14_p20240510.ebuild 7881 BLAKE2B aa91baabae24be838cfe8f2
 EBUILD qtwebengine-5.15.16_p20241115.ebuild 7881 BLAKE2B bf0e536936ff8e3995edf6812f3bb4a250b2cb26a9f1e78eb3cb80d46e95896a0fef41c65f81748fa04bc727aea3f417aaf99172428dc165b6858149692ee461 SHA512 cc7d6e29900e2909b460b4e1645e45452a002e4b143cfb831a798f9aaa7a7dc5e96b232e9726c18cfd46015c7c88a26be011358877f6d9e64792afef561af90d
 EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 6f20f921189366edc8f501ee0e1d3811fb1e57dfa75b2ff4ac80a50028e6394068415f65ae1bfb84dd9ae7d08a546fdb13050a4c42035dbe0ce6baa1c753534f SHA512 2292f3a7e9b24cdb312b6e9c725d8ad1ed33ee160038bd15d8fac568e53473ef18fe3f4f8bf484009221521325933b7e568b90546a157d10c74faa119c6bf44d
 EBUILD qtwebengine-6.7.3.ebuild 9979 BLAKE2B 17fb965f42ceba78dea107944b68141281c164dd4a86d06cbe8f8a62281af044b84d9e249944aa9f0995610010a97ec55b152fda255545f48440be9852fa01c3 SHA512 b08934fba065e79143b804511e871eb32359290b8156343ebc27e019e65c36a4e6eeb1699f57b5b96980a5c52591e11386113913b900fddbb22a53357fccdf62
-EBUILD qtwebengine-6.8.1.ebuild 10073 BLAKE2B 4f575bc45bcf329e7a6f51c12e0fab8c01b2003ff6056545cd39ec3c89a13fcf5628c27b6a570c8a425eee69448218e9f7cb25c1cc1f01078319c9900dc137ee SHA512 a11eb0e9dae2b19d4987689a4b6c48392ef10b5281bf689797b0888707f90ba2639a9f5da200b93154aa7a0c494af57bb8275f778dddfcf344f3c4bb1183a2bc
-EBUILD qtwebengine-6.8.9999.ebuild 10027 BLAKE2B 0902b768824ccf3415c82a48672cf4d504531153c6cf8675f362d11eb4e06df6cd404f5dde2e3d693126d2df09f0c0f74929cc288fbcb75c3cdce244f2e527ee SHA512 a684514d47c6174aa3c457afc5e949d212b8f0ec9fda46e12c2830baceae5180303783c94430fd37d4c17f8d214dec4a70a4aa1f6b7a200a8bc5975d6bc6fa32
+EBUILD qtwebengine-6.8.1.ebuild 10122 BLAKE2B 5f915c0d9180d80008fcf1fc65edab42a25c18e9820387899584c04f5e4a4f15f006e9dd7e768d65abe3434daf532bbad1ceca4ecd45777a562ecb373cd761a5 SHA512 8ee62e39276b49ede884c74e9ee7b6578a303b3197413d01df9b64b86271544b46ffd30f8f141b0ce46a176892bbbfd4d84c8f809400d86cc7c68d98579ab9bd
+EBUILD qtwebengine-6.8.9999.ebuild 10076 BLAKE2B 24b8842f56bb9a8c6bb9e815bffbdf9001574d65c4bb30e6f75534ad0bcad1365c34e4e6e6d708ad94bd9d54a47de1cd966337845f4c3304aed103f16e2c3657 SHA512 5849fe56d76450bfafc9771df135be779c5544ff5e885fdc244011eccaa7d4260f25cc724e3288c3d0d5a50b98a40271a037bb99d270f4ceea6bce26368fec5e
 EBUILD qtwebengine-6.9999.ebuild 10027 BLAKE2B 0902b768824ccf3415c82a48672cf4d504531153c6cf8675f362d11eb4e06df6cd404f5dde2e3d693126d2df09f0c0f74929cc288fbcb75c3cdce244f2e527ee SHA512 a684514d47c6174aa3c457afc5e949d212b8f0ec9fda46e12c2830baceae5180303783c94430fd37d4c17f8d214dec4a70a4aa1f6b7a200a8bc5975d6bc6fa32
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
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() {