From 5cec0ac99ec095ea284e19444270429874887e0f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 5 Nov 2021 22:21:53 +1000
Subject: [PATCH] qt6_tools: add symlinks for user-facing tools

* fix FDL license naming
---
 dev-qt/qt6-tools/licenses/{FDL => GNU FDL v1} |  0
 dev-qt/qt6-tools/qt6_tools-6.2.0.recipe       | 21 +++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 rename dev-qt/qt6-tools/licenses/{FDL => GNU FDL v1} (100%)

diff --git a/dev-qt/qt6-tools/licenses/FDL b/dev-qt/qt6-tools/licenses/GNU FDL v1
similarity index 100%
rename from dev-qt/qt6-tools/licenses/FDL
rename to dev-qt/qt6-tools/licenses/GNU FDL v1
diff --git a/dev-qt/qt6-tools/qt6_tools-6.2.0.recipe b/dev-qt/qt6-tools/qt6_tools-6.2.0.recipe
index 4b71c6c6d..158fdce39 100644
--- a/dev-qt/qt6-tools/qt6_tools-6.2.0.recipe
+++ b/dev-qt/qt6-tools/qt6_tools-6.2.0.recipe
@@ -5,8 +5,8 @@ HOMEPAGE="https://qt.io/"
 COPYRIGHT="2015-2021 The Qt Company Ltd."
 LICENSE="GNU LGPL v2.1
 	GNU LGPL v3
-	FDL"
-REVISION="1"
+	GNU FDL v1"
+REVISION="2"
 SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qttools-everywhere-src-$portVersion.tar.xz"
 CHECKSUM_SHA256="a903d005f8ab39545aed88a13b04f13ddbbe073da7007203a91fb8b42b890057"
 SOURCE_DIR="qttools-everywhere-src-$portVersion"
@@ -27,7 +27,16 @@ PROVIDES="
 	lib:libQt6DesignerComponents$secondaryArchSuffix = $portVersion compat >= 6
 	lib:libQt6Help$secondaryArchSuffix = $portVersion compat >= 6
 	lib:libQt6UiTools$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:assistant6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:designer6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:linguist6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:pixeltool6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qdbus6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qdbusviewer6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qdistancefieldgenerator6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qdoc6$secondaryArchSuffix = $portVersion compat >= 6
 	cmd:qtdiag6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qtplugininfo6$secondaryArchSuffix = $portVersion compat >= 6
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -105,7 +114,8 @@ BUILD()
 
 	cmake -B build -S $sourceDir -G Ninja \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_CXX_FLAGS=-fPIC
+		-DCMAKE_CXX_FLAGS=-fPIC \
+		-DINSTALL_PUBLICBINDIR=$binDir
 
 	find -name cmake_install.cmake -exec sed -i "s|set(CMAKE_INSTALL_PREFIX.*|set(CMAKE_INSTALL_PREFIX \"$prefix\")|" {} \;
 
@@ -127,7 +137,10 @@ INSTALL()
 		$binDir \
 		$dataDir/deskbar/menu/Applications/Qt
 
-	ln -s -t $binDir $libDir/Qt6/qtdiag6
+	# install symlinks for user-facing tools
+	while read _line; do
+		ln -s $_line
+	done < $sourceDir/build/user_facing_tool_links.txt
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"