From a49f0507aac02b817cd4bdc43ad0b9477f991cb1 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 1 Oct 2021 13:01:19 +0000
Subject: [PATCH] extra/qt6-3d to 6.2.0-1

---
 extra/qt6-3d/PKGBUILD | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/extra/qt6-3d/PKGBUILD b/extra/qt6-3d/PKGBUILD
index 5e7a9bcbe..a4e4b6a08 100644
--- a/extra/qt6-3d/PKGBUILD
+++ b/extra/qt6-3d/PKGBUILD
@@ -6,7 +6,7 @@
 #  - explicitly link v5/v6 with libatomic
 
 pkgname=qt6-3d
-_qtver=6.1.3
+_qtver=6.2.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(x86_64)
@@ -14,22 +14,16 @@ url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics'
 depends=(qt6-base)
-makedepends=(cmake qt6-declarative qt6-shadertools vulkan-headers) # assimp
+makedepends=(cmake ninja qt6-declarative qt6-shadertools) # assimp
 optdepends=('qt6-shadertools: RHI renderer' 'qt6-declarative: QML bindings')
 groups=(qt6)
 _pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
-        qt6-3d-gcc11.patch)
-sha256sums=('dd53b318052b435905ad3889e0904d852bd1e80884932a675c3f428974f2bbdf'
-            'b056d66a24956755c2aaddc4adddd71f5a945ff9795b0cbf9f43ab4d43b4f8f5')
-
-prepare() {
-  patch -d $_pkgfn -p1 < qt6-3d-gcc11.patch # Fix build with GCC 11
-}
+source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('304352ae74fc8e7fe50a822413d69094efb25f15a2323e083a2a53dc5a43a6c6')
 
 build() {
   [[ $CARCH == "arm" || $CARCH == "armv6h" ]] && echo "target_link_libraries(3DCore PRIVATE atomic)" >> ${_pkgfn}/src/core/CMakeLists.txt
-  cmake -B build -S $_pkgfn
+  cmake -B build -S $_pkgfn -G Ninja
   cmake --build build
 }