commit: 420f0bf6d378be855b38792f8af459f07b65bcd2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Dec 14 00:17:45 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Dec 14 00:22:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420f0bf6
dev-qt/qtquick3d: update assimp6 patch in live Unfortunately not fixed, it only added extra line wrapping that make the patch files. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch | 15 +++++++++++++++ dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild | 2 +- dev-qt/qtquick3d/qtquick3d-6.9999.ebuild | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch b/dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch new file mode 100644 index 000000000000..fb2ec7180157 --- /dev/null +++ b/dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch @@ -0,0 +1,15 @@ +Seems that the '5' enforces the major version and it refuses to find +system's assimp-6.0.2 (which is perfectly usable given Qt 6.9.2 bundles +that version without it). + +We don't package older ones, so drop the check as a quick workaround. + +https://bugreports.qt.io/browse/QTBUG-137996 +--- a/src/plugins/assetimporters/configure.cmake ++++ b/src/plugins/assetimporters/configure.cmake +@@ -16 +16 @@ +-qt_find_package(WrapQuick3DAssimp 5.1.6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp ++qt_find_package(WrapQuick3DAssimp PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp +@@ -43 +43 @@ +- PACKAGES PACKAGE WrapQuick3DAssimp 5.1.6) ++ PACKAGES PACKAGE WrapQuick3DAssimp) diff --git a/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild index 0ae502e79761..d9574f2c9091 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild @@ -42,7 +42,7 @@ CMAKE_SKIP_TESTS=( PATCHES=( "${FILESDIR}"/${PN}-6.6.2-gcc14.patch "${FILESDIR}"/${PN}-6.6.2-x32abi.patch - "${FILESDIR}"/${PN}-6.9.2-assimp6.patch + "${FILESDIR}"/${PN}-6.11.0-assimp6.patch ) src_configure() { diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild index 0ae502e79761..d9574f2c9091 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild @@ -42,7 +42,7 @@ CMAKE_SKIP_TESTS=( PATCHES=( "${FILESDIR}"/${PN}-6.6.2-gcc14.patch "${FILESDIR}"/${PN}-6.6.2-x32abi.patch - "${FILESDIR}"/${PN}-6.9.2-assimp6.patch + "${FILESDIR}"/${PN}-6.11.0-assimp6.patch ) src_configure() {
