From ec34c6fb990b58458e6f7c78e5e5112fa27bf772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 18 Feb 2023 09:40:06 +0700
Subject: [PATCH] qt6-quick3d: update to 6.4.2.

---
 srcpkgs/qt6-quick3d-tools    |  1 +
 srcpkgs/qt6-quick3d/template | 32 ++++++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/qt6-quick3d-tools

diff --git a/srcpkgs/qt6-quick3d-tools b/srcpkgs/qt6-quick3d-tools
new file mode 120000
index 00000000000..91ff6f03e47
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-tools
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 608fabb7556..e5ef91c9053 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,9 +1,9 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.4.0
+version=6.4.2
 revision=1
 build_style=cmake
-hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
+hostmakedepends="perl qt6-declarative-host-tools qt6-shadertools"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
  qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
@@ -11,10 +11,11 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=f10a1660d4d4103f0749f258eddce4d4878fa7bbbc5e610a900bef28adf017ec
+checksum=953d3b6ca6dc00563ceea33d51f25e22b1788ab5aa861941100f6a1b652926a7
 
+subpackages="qt6-quick3d-tools qt6-quick3d-devel"
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-quick3d-devel"
+	hostmakedepends+=" qt6-quick3d-tools"
 	configure_args="-DQT_FORCE_BUILD_TOOLS=true"
 fi
 
@@ -23,15 +24,34 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="Shader baking failed: Cannot resolve expression type."
 fi
 
+do_check() {
+	cd build
+	ctest -E tst_qquick3drotationdata
+}
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/tests
+	# Maybe new package for embree?
+	rm -rf ${DESTDIR}/usr/lib/libQt6BundledEmbree.a
+}
+
+qt6-quick3d-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - Tools"
+	pkg_install() {
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/cmake/*Tools"
+	}
+}
+
 qt6-quick3d-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	depends="qt6-quick3d-tools>=${version}_${revision} qt6-base-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/metatypes
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/qt6/bin
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"