mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
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@gentoo.org>
This commit is contained in:
parent
c13a3c43d0
commit
420f0bf6d3
15
dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch
Normal file
15
dev-qt/qtquick3d/files/qtquick3d-6.11.0-assimp6.patch
Normal file
@ -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)
|
||||||
@ -42,7 +42,7 @@ CMAKE_SKIP_TESTS=(
|
|||||||
PATCHES=(
|
PATCHES=(
|
||||||
"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
|
"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
|
||||||
"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
|
"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
|
||||||
"${FILESDIR}"/${PN}-6.9.2-assimp6.patch
|
"${FILESDIR}"/${PN}-6.11.0-assimp6.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
|
|||||||
@ -42,7 +42,7 @@ CMAKE_SKIP_TESTS=(
|
|||||||
PATCHES=(
|
PATCHES=(
|
||||||
"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
|
"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
|
||||||
"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
|
"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
|
||||||
"${FILESDIR}"/${PN}-6.9.2-assimp6.patch
|
"${FILESDIR}"/${PN}-6.11.0-assimp6.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user