From 6fecfc46f597303f599e123f8df0eb8c52335dfc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 5 Nov 2021 19:01:48 +1000
Subject: [PATCH] qt6_base: fix paths for static libs

* fix FDL license naming
* update qt6-haikuplugins revision
* cleanup spaces
---
 dev-qt/qt6-base/licenses/{FDL => GNU FDL v1} |  0
 dev-qt/qt6-base/qt6_base-6.2.0.recipe        | 16 ++++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename dev-qt/qt6-base/licenses/{FDL => GNU FDL v1} (100%)

diff --git a/dev-qt/qt6-base/licenses/FDL b/dev-qt/qt6-base/licenses/GNU FDL v1
similarity index 100%
rename from dev-qt/qt6-base/licenses/FDL
rename to dev-qt/qt6-base/licenses/GNU FDL v1
diff --git a/dev-qt/qt6-base/qt6_base-6.2.0.recipe b/dev-qt/qt6-base/qt6_base-6.2.0.recipe
index 48d76dc78..eb4dd222c 100644
--- a/dev-qt/qt6-base/qt6_base-6.2.0.recipe
+++ b/dev-qt/qt6-base/qt6_base-6.2.0.recipe
@@ -6,13 +6,13 @@ servers."
 HOMEPAGE="https://qt.io/"
 COPYRIGHT="2015-2021 The Qt Company Ltd."
 LICENSE="GNU LGPL v3
-	GNU GPL v3	
-	FDL"
-REVISION="2"
+	GNU GPL v3
+	GNU FDL v1"
+REVISION="3"
 SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtbase-everywhere-src-$portVersion.tar.xz"
 CHECKSUM_SHA256="fdfff0716d093bcb6bcd53746ce1d3c9701a6bf3326d47813866d43949b47769"
 SOURCE_DIR="qtbase-everywhere-src-$portVersion"
-srcGitRev2="31711ded19261c7d98d48c4cebfdd70a40bd9212"
+srcGitRev2="5511f776f7235b5137badbb3c1acde2b8477f875"
 SOURCE_URI_2="https://github.com/threedeyes/qt6-haikuplugins/archive/$srcGitRev2.tar.gz"
 CHECKSUM_SHA256_2="c1e0042b96c393f696addf731ff2fa9fa3e93dc81bdcc98fae2a5a260364ca01"
 SOURCE_DIR_2="qt6-haikuplugins-$srcGitRev2"
@@ -39,8 +39,8 @@ PROVIDES="
 	lib:libQt6Widgets$secondaryArchSuffix = $portVersion compat >= 6
 	lib:libQt6Xml$secondaryArchSuffix = $portVersion compat >= 6
 	"
-REQUIRES="	
-	haiku$secondaryArchSuffix	
+REQUIRES="
+	haiku$secondaryArchSuffix
 	haiku_svg_icon_theme
 	lib:libcrypto$secondaryArchSuffix
 	lib:libdouble_conversion$secondaryArchSuffix
@@ -182,9 +182,9 @@ INSTALL()
 	done
 
 	# fix paths for static libs
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developLibDir, \
+	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
 		$libDir/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developLibDir, \
+	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
 		$libDir/cmake/Qt6DeviceDiscoverySupportPrivate/Qt6DeviceDiscoverySupportPrivateTargets-release.cmake
 
 	mkdir -p $binDir