From ddf42811329bd7fd08ebbecd8e1533d584122fcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 2 Nov 2022 18:23:55 +0100
Subject: [PATCH] qt6-declarative: update to 6.4.0.

---
 common/shlibs                                 |  1 +
 .../patches/qml-blacklist-more.patch          | 48 -------------------
 srcpkgs/qt6-declarative/template              |  6 +--
 3 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch

diff --git a/common/shlibs b/common/shlibs
index 095513f7a48..15943b84337 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2046,6 +2046,7 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickLayouts.so.6 qt6-declarative-6.1.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6QmlCompiler.so.6 qt6-declarative-6.4.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
deleted file mode 100644
index 2d2629bf9df..00000000000
--- a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
-+++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
-@@ -6,5 +6,6 @@
- 
- # QTBUG-95750
- [RangeSlider::test_overlappingHandles]
- b2qt
- qnx
-+linux
---- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
-+++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
-@@ -6,5 +6,6 @@
- 
- # QTBUG-95750
- [RangeSlider::test_overlappingHandles]
- b2qt
- qnx
-+linux
---- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
-+++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
-@@ -6,5 +6,6 @@
- 
- # QTBUG-95750
- [RangeSlider::test_overlappingHandles]
- b2qt
- qnx
-+linux
---- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
-+++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
-@@ -6,8 +6,9 @@
- 
- # QTBUG-95750
- [RangeSlider::test_overlappingHandles]
- b2qt
- qnx
-+linux
- 
- # QTBUG-101704
- [ToolTip::test_attachedSizeBug]
---- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
-+++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
-@@ -6,5 +6,6 @@
- 
- # QTBUG-95750
- [RangeSlider::test_overlappingHandles]
- b2qt
- qnx
-+linux
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index 8a190dfc35b..6b2652f0837 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.1
+version=6.4.0
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -12,11 +12,11 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
-checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
+checksum=3434e72fccfa0c929c326790723d05c155f5067746b1ab05cfd7a9ba632c4383
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_FORCE_BUILD_TOOLS=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi