From 14d223dca22ca361bbc87d02929a6f2ca6db07e4 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 14 May 2023 14:24:05 +1000
Subject: [PATCH] qt6_tools: bump version

---
 .../patches/qt6_tools-6.4.0.patchset          | 22 ----------
 ...ls-6.4.0.recipe => qt6_tools-6.5.0.recipe} | 42 ++++++++++++-------
 2 files changed, 28 insertions(+), 36 deletions(-)
 delete mode 100644 dev-qt/qt6-tools/patches/qt6_tools-6.4.0.patchset
 rename dev-qt/qt6-tools/{qt6_tools-6.4.0.recipe => qt6_tools-6.5.0.recipe} (87%)

diff --git a/dev-qt/qt6-tools/patches/qt6_tools-6.4.0.patchset b/dev-qt/qt6-tools/patches/qt6_tools-6.4.0.patchset
deleted file mode 100644
index 75634f6fe..000000000
--- a/dev-qt/qt6-tools/patches/qt6_tools-6.4.0.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 4c0cfb3189358a7fd68b81242a8599516821f240 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 3 Oct 2022 23:14:11 +1000
-Subject: Fix typo
-
-
-diff --git a/src/linguist/lupdate/clangtoolastreader.cpp b/src/linguist/lupdate/clangtoolastreader.cpp
-index 2510212..a12c598 100644
---- a/src/linguist/lupdate/clangtoolastreader.cpp
-+++ b/src/linguist/lupdate/clangtoolastreader.cpp
-@@ -437,7 +437,7 @@ void LupdateVisitor::processIsolatedComments(const clang::FileID file)
-         tmp.emplace_back(commentInFile.second);
-     clang::ArrayRef<clang::RawComment *> rawComments = tmp;
- #else
--    Q_UNSED(file)
-+    Q_UNUSED(file)
-     clang::ArrayRef<clang::RawComment *> rawComments = m_context->getRawCommentList().getComments();
- #endif
- 
--- 
-2.36.1
-
diff --git a/dev-qt/qt6-tools/qt6_tools-6.4.0.recipe b/dev-qt/qt6-tools/qt6_tools-6.5.0.recipe
similarity index 87%
rename from dev-qt/qt6-tools/qt6_tools-6.4.0.recipe
rename to dev-qt/qt6-tools/qt6_tools-6.5.0.recipe
index 93c69df5e..27cddbdcc 100644
--- a/dev-qt/qt6-tools/qt6_tools-6.4.0.recipe
+++ b/dev-qt/qt6-tools/qt6_tools-6.5.0.recipe
@@ -2,15 +2,14 @@ SUMMARY="A cross-platform application and UI framework (Development Tools, QtHel
 DESCRIPTION="The QtTools modules contains some tools mostly useful for application development. \
 Included are Qt Designer (GUI design), QDbusViewer and more."
 HOMEPAGE="https://qt.io/"
-COPYRIGHT="2015-2022 The Qt Company Ltd."
+COPYRIGHT="2015-2023 The Qt Company Ltd."
 LICENSE="GNU LGPL v2.1
 	GNU LGPL v3
 	GNU FDL v1"
 REVISION="1"
 SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qttools-everywhere-src-$portVersion.tar.xz"
-CHECKSUM_SHA256="97f3d5f88c458be7a8f7b7b08efc06c4ebad39ca51669476b18bf9e4c11afba2"
+CHECKSUM_SHA256="49c33d96b0a44988be954269b8ce3d1a495b439726e03a6be7c0d50a686369c4"
 SOURCE_DIR="qttools-everywhere-src-$portVersion"
-PATCHES="qt6_tools-$portVersion.patchset"
 ADDITIONAL_FILES="
 	Assistant.rdef.in
 	Designer.rdef.in
@@ -43,7 +42,8 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libclang$secondaryArchSuffix
 	lib:libclang_cpp$secondaryArchSuffix
-	lib:libLLVM_9$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libLLVM_12$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
@@ -51,6 +51,8 @@ REQUIRES="
 	lib:libQt6Quick$secondaryArchSuffix
 	lib:libQt6Qml$secondaryArchSuffix
 	lib:libQt6Widgets$secondaryArchSuffix
+	lib:libvulkan$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -67,9 +69,9 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libclang$secondaryArchSuffix >= 9
-	devel:libclang_cpp$secondaryArchSuffix >= 9
-	devel:libLLVM_9$secondaryArchSuffix
+	devel:libclang$secondaryArchSuffix >= 12
+	devel:libclang_cpp$secondaryArchSuffix >= 12
+	devel:libLLVM_12$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Gui$secondaryArchSuffix
@@ -78,6 +80,7 @@ BUILD_REQUIRES="
 	devel:libQt6Qml$secondaryArchSuffix
 	devel:libQt6Widgets$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
+	devel:libvulkan$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -90,7 +93,7 @@ BUILD_PREREQUIRES="
 	cmd:ninja
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:python3.7
+	cmd:python3
 	cmd:sed
 	cmd:xargs
 	"
@@ -120,20 +123,25 @@ BUILD()
 
 	find -name cmake_install.cmake -exec sed -i "s|set(CMAKE_INSTALL_PREFIX.*|set(CMAKE_INSTALL_PREFIX \"$prefix\")|" {} \;
 
-	ninja -C build $jobArgs
+	ninja -v -C build $jobArgs
 }
 
 INSTALL()
 {
 	ninja -C build install
 
-	prepareInstalledDevelLibs libQt6Designer libQt6DesignerComponents libQt6Help libQt6UiTools
+	prepareInstalledDevelLibs \
+		libQt6Designer \
+		libQt6DesignerComponents \
+		libQt6Help \
+		libQt6UiTools
 
-	cd $libDir
-	for i in lib*.so.6.*;do
-		ln -fs $i $(echo $i | cut -f1,2 -d.)
-	done
+	# fix pkgconfig files
+	fixPkgconfig
+	sed -i "s|includedir=.*|includedir=$includeDir/Qt6|" \
+		$developLibDir/pkgconfig/*.pc
 
+	# add tools to Deskbar menu
 	mkdir -p \
 		$binDir \
 		$dataDir/deskbar/menu/Applications/Qt
@@ -143,6 +151,7 @@ INSTALL()
 		ln -s $_line
 	done < $sourceDir/build/user_facing_tool_links.txt
 
+	# add resources
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
@@ -163,6 +172,11 @@ INSTALL()
 		mimeset -f $libDir/Qt6/$j
 	done
 
+	cd $libDir
+	for i in lib*.so.6.*;do
+		ln -fs $i $(echo $i | cut -f1,2 -d.)
+	done
+
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake \