Qt6.9 cleanups (#12620)

2026-03-19 01:46:00 +01:00 · 2025-07-29 09:11:08 +02:00
parent 47e3b2fbcd
commit f4af4156d5
28 changed files with 449 additions and 351 deletions
--- a/dev-qt/qt6-3d/qt6_3d-6.9.0.recipe
+++ b/dev-qt/qt6-3d/qt6_3d-6.9.0.recipe
@@ -17,21 +17,24 @@ SOURCE_DIR="qt3d-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_3d$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DAnimation$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DCore$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DExtras$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DInput$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DLogic$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DQuick$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DQuickAnimation$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DQuickExtras$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DQuickInput$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DQuickRender$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DQuickScene2D$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DQuickScene3D$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt63DRender$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt63DAnimation$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DCore$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DExtras$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DInput$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DLogic$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DQuick$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DQuickAnimation$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DQuickExtras$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DQuickInput$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DQuickRender$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DQuickScene2D$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DQuickScene3D$secondaryArchSuffix = $libVersionCompat
+	lib:libQt63DRender$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -49,19 +52,19 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_3d${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt63DAnimation$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DCore$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DExtras$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DInput$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DLogic$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DQuick$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DQuickAnimation$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DQuickExtras$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DQuickInput$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DQuickRender$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DQuickScene2D$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DQuickScene3D$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt63DRender$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt63DAnimation$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DCore$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DExtras$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DInput$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DLogic$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DQuick$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DQuickAnimation$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DQuickExtras$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DQuickInput$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DQuickRender$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DQuickScene2D$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DQuickScene3D$secondaryArchSuffix = $libVersionCompat
+	devel:libQt63DRender$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_3d$secondaryArchSuffix == $portVersion base
@@ -70,15 +73,16 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
+	devel:libQt6Multimedia$secondaryArchSuffix == $portVersion
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
 	devel:libQt6ShaderTools$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-5compat/qt6_5compat-6.9.0.recipe
+++ b/dev-qt/qt6-5compat/qt6_5compat-6.9.0.recipe
@@ -17,9 +17,12 @@ SOURCE_DIR="qt5compat-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_5compat$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Core5Compat$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Core5Compat$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -40,7 +43,7 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_5compat${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Core5Compat$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Core5Compat$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_5compat$secondaryArchSuffix == $portVersion base
@@ -50,7 +53,7 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libicuuc$secondaryArchSuffix >= 74
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
@@ -59,7 +62,7 @@ BUILD_REQUIRES="
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
 	devel:libQt6ShaderTools$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-base/qt6_base-6.9.0.recipe
+++ b/dev-qt/qt6-base/qt6_base-6.9.0.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2015-2025 The Qt Company Ltd."
 LICENSE="GNU LGPL v3
 	GNU GPL v3
 	GNU FDL v1"
-REVISION="2"
+REVISION="1"
 QT_MIRROR_URI="https://qt-mirror.dannhauer.de/archive"
 SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qtbase-everywhere-src-$portVersion.tar.xz"
 CHECKSUM_SHA256="c1800c2ea835801af04a05d4a32321d79a93954ee3ae2172bbeacf13d1f0598c"
@@ -27,21 +27,24 @@ PATCHES_2="qt6_base-$portVersion-source2.patchset"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_base$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Concurrent$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Core$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6DBus$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6EglFSDeviceIntegration$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Gui$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Network$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6OpenGL$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6OpenGLWidgets$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6PrintSupport$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Sql$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Test$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Widgets$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Xml$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Concurrent$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Core$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6DBus$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6EglFSDeviceIntegration$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Gui$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Network$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6OpenGL$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6OpenGLWidgets$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6PrintSupport$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Sql$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Test$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Widgets$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Xml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -70,26 +73,25 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_base${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Concurrent$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Core$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6DBus$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6DeviceDiscoverySupport$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6EdidSupport$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6EglFSDeviceIntegration$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6ExampleIcons$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6ExamplesAssetDownloader$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6FBSupport$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Gui$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Network$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6OpenGL$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6OpenGLWidgets$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6PrintSupport$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Sql$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Test$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Widgets$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Xml$secondaryArchSuffix = $portVersion compat >= 6
 	cmd:qmake6$secondaryArchSuffix = $portVersion compat >= 6
 	cmd:qtpaths6$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Concurrent$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Core$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6DBus$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6DeviceDiscoverySupport$secondaryArchSuffix
+	devel:libQt6EglFSDeviceIntegration$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6ExampleIcons$secondaryArchSuffix
+	devel:libQt6ExamplesAssetDownloader$secondaryArchSuffix
+	devel:libQt6FBSupport$secondaryArchSuffix
+	devel:libQt6Gui$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Network$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6OpenGL$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6OpenGLWidgets$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6PrintSupport$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Sql$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Test$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Widgets$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Xml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	haiku${secondaryArchSuffix}_devel
@@ -103,7 +105,7 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libbrotlidec$secondaryArchSuffix
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libdouble_conversion$secondaryArchSuffix >= 3
 	devel:libegl$secondaryArchSuffix
 	devel:libfontconfig$secondaryArchSuffix
@@ -117,7 +119,7 @@ BUILD_REQUIRES="
 	devel:libpcre2_16$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libvulkan$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -163,6 +165,7 @@ BUILD()
 		-DINSTALL_MKSPECSDIR=$dataDir/Qt6/mkspecs \
 		-DINSTALL_EXAMPLESDIR=$developDir/sources/Qt6 \
 		-DINSTALL_QMLDIR=$dataDir/Qt6/qml \
+		-DINSTALL_SYSCONFDIR=$settingsDir/xdg \
 		-DINSTALL_TRANSLATIONSDIR=$dataDir/Qt6/translations \
 		-DQT_QMAKE_TARGET_MKSPEC=haiku-g++ \
 		-DQT_FEATURE_openssl_linked=ON \
@@ -216,9 +219,9 @@ INSTALL()
 	fixPkgconfig
 	sed -i "s|includedir=.*|includedir=$includeDir/Qt6|" \
 		$developLibDir/pkgconfig/*.pc
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6DeviceDiscoverySupportPrivate/Qt6DeviceDiscoverySupportPrivateTargets-release.cmake
 	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir/libQt6ExampleIcons.a,\${_IMPORT_PREFIX}/$relativeDevelopLibDir/libQt6ExampleIcons.a," \
 		$libDir/cmake/Qt6ExampleIconsPrivate/Qt6ExampleIconsPrivateTargets-release.cmake
--- a/dev-qt/qt6-charts/qt6_charts-6.9.0.recipe
+++ b/dev-qt/qt6-charts/qt6_charts-6.9.0.recipe
@@ -17,10 +17,13 @@ SOURCE_DIR="qtcharts-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_charts$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Charts$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6ChartsQml$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Charts$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6ChartsQml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -28,17 +31,18 @@ REQUIRES="
 	lib:libGL$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6OpenGL$secondaryArchSuffix
 	lib:libQt6Qml$secondaryArchSuffix
-	lib:libQt6QmlModels$secondaryArchSuffix
 	lib:libQt6Quick$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"

 PROVIDES_devel="
 	qt6_charts${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Charts$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6ChartsQml$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Charts$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6ChartsQml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_charts$secondaryArchSuffix == $portVersion base
--- a/dev-qt/qt6-connectivity/qt6_connectivity-6.9.0.recipe
+++ b/dev-qt/qt6-connectivity/qt6_connectivity-6.9.0.recipe
@@ -17,10 +17,13 @@ SOURCE_DIR="qtconnectivity-everywhere-src-$portVersion$QtBeta"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_connectivity$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Bluetooth$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Nfc$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Bluetooth$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Nfc$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -37,8 +40,8 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_connectivity${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Bluetooth$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Nfc$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Bluetooth$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Nfc$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_connectivity$secondaryArchSuffix == $portVersion base
@@ -47,14 +50,14 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-datavis3d/qt6_datavis3d-6.9.0.recipe
+++ b/dev-qt/qt6-datavis3d/qt6_datavis3d-6.9.0.recipe
@@ -18,30 +18,33 @@ PATCHES="qt6_datavis3d-$portVersion.patchset"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_datavis3d$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6DataVisualization$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6DataVisualizationQml$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6DataVisualization$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6DataVisualizationQml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libcrypto$secondaryArchSuffix
+#	lib:libcrypto$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Qml$secondaryArchSuffix
 	lib:libQt6QmlModels$secondaryArchSuffix
 	lib:libQt6Quick$secondaryArchSuffix
-	lib:libQt6QuickTimeline$secondaryArchSuffix
-	lib:libQt6ShaderTools$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
+#	lib:libQt6QuickTimeline$secondaryArchSuffix
+#	lib:libQt6ShaderTools$secondaryArchSuffix
+#	lib:libssl$secondaryArchSuffix
+#	lib:libz$secondaryArchSuffix
 	"

 PROVIDES_devel="
 	qt6_datavis3d${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6DataVisualization$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6DataVisualizationQml$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6DataVisualization$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6DataVisualizationQml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_datavis3d$secondaryArchSuffix == $portVersion base
@@ -50,7 +53,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+#	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
@@ -58,10 +61,10 @@ BUILD_REQUIRES="
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
-	devel:libQt6QuickTimeline$secondaryArchSuffix == $portVersion
-	devel:libQt6ShaderTools$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
-	devel:libz$secondaryArchSuffix
+#	devel:libQt6QuickTimeline$secondaryArchSuffix == $portVersion
+#	devel:libQt6ShaderTools$secondaryArchSuffix == $portVersion
+#	devel:libssl$secondaryArchSuffix
+#	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
--- a/dev-qt/qt6-declarative/qt6_declarative-6.9.0.recipe
+++ b/dev-qt/qt6-declarative/qt6_declarative-6.9.0.recipe
@@ -18,48 +18,58 @@ PATCHES="qt6_declarative-$portVersion.patchset"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_declarative$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6LabsAnimation$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6LabsFolderListModel$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6LabsPlatform$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6LabsQmlModels$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6LabsSettings$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6LabsSharedImage$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6LabsWavefrontMesh$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Qml$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QmlCompiler$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QmlCore$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QmlLocalStorage$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QmlMeta$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QmlModels$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QmlNetwork$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QmlWorkerScript$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QmlXmlListModel$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2Basic$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2BasicStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2FluentWinUI3StyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2Fusion$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2FusionStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2Imagine$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2ImagineStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2Impl$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2Material$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2MaterialStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2Universal$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickControls2UniversalStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickDialogs2$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickDialogs2QuickImpl$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickDialogs2Utils$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickEffects$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickLayouts$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickParticles$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickShapes$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickTemplates2$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickTest$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickWidgets$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qml6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qmleasing6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qmlls6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qmlpreview6$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qmlscene6$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6LabsAnimation$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6LabsFolderListModel$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6LabsPlatform$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6LabsQmlModels$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6LabsSettings$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6LabsSharedImage$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6LabsWavefrontMesh$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Qml$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QmlCompiler$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QmlCore$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QmlLocalStorage$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QmlMeta$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QmlModels$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QmlNetwork$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QmlWorkerScript$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QmlXmlListModel$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2Basic$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2BasicStyleImpl$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2FluentWinUI3StyleImpl$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2Fusion$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2FusionStyleImpl$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2Imagine$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2ImagineStyleImpl$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2Impl$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2Material$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2MaterialStyleImpl$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2Universal$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickControls2UniversalStyleImpl$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickDialogs2$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickDialogs2QuickImpl$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickDialogs2Utils$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickEffects$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickLayouts$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickParticles$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickShapes$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickTemplates2$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickTest$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickVectorImage$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickVectorImageGenerator$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickWidgets$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -69,64 +79,67 @@ REQUIRES="
 	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Network$secondaryArchSuffix
 	lib:libQt6OpenGL$secondaryArchSuffix
-	lib:libQt6Widgets$secondaryArchSuffix
+	lib:libQt6Svg$secondaryArchSuffix
 	lib:libQt6Test$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libvulkan$secondaryArchSuffix
 	"

 PROVIDES_devel="
 	qt6_declarative${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6LabsAnimation$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6LabsFolderListModel$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6LabsPlatform$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6LabsQmlModels$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6LabsSettings$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6LabsSharedImage$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6LabsWavefrontMesh$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6PacketProtocol$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Qml$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlAssetDownloader$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlBuiltins$secondaryArchSuffix
-	devel:libQt6QmlCompiler$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlCore$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlDebug$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlDom$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6LabsAnimation$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6LabsFolderListModel$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6LabsPlatform$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6LabsQmlModels$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6LabsSettings$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6LabsSharedImage$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6LabsWavefrontMesh$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6PacketProtocol$secondaryArchSuffix
+	devel:libQt6Qml$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QmlAssetDownloader$secondaryArchSuffix
+	devel:libQt6QmlCompiler$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QmlCore$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QmlDebug$secondaryArchSuffix
+	devel:libQt6QmlDom$secondaryArchSuffix
 	devel:libQt6QmlFormat$secondaryArchSuffix
-	devel:libQt6QmlLocalStorage$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlMeta$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlModels$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlNetwork$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlTypeRegistrar$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlToolingSettings$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlWorkerScript$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QmlXmlListModel$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2Basic$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2BasicStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2FluentWinUI3StyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2Fusion$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2FusionStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2Imagine$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2ImagineStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2Impl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2Material$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2MaterialStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2Universal$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControls2UniversalStyleImpl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickControlsTestUtils$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickDialogs2$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickDialogs2QuickImpl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickDialogs2Utils$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickEffects$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickLayouts$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickParticles$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickShapes$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickTemplates2$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickTest$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickTestUtils$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickWidgets$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6QmlLocalStorage$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QmlLS$secondaryArchSuffix
+	devel:libQt6QmlMeta$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QmlModels$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QmlNetwork$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QmlToolingSettings$secondaryArchSuffix
+	devel:libQt6QmlTypeRegistrar$secondaryArchSuffix
+	devel:libQt6QmlWorkerScript$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QmlXmlListModel$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2Basic$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2BasicStyleImpl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2FluentWinUI3StyleImpl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2Fusion$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2FusionStyleImpl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2Imagine$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2ImagineStyleImpl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2Impl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2Material$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2MaterialStyleImpl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2Universal$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControls2UniversalStyleImpl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickControlsTestUtils$secondaryArchSuffix
+	devel:libQt6QuickDialogs2$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickDialogs2QuickImpl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickDialogs2Utils$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickEffects$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickLayouts$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickParticles$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickShapes$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickTemplates2$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickTest$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickTestUtils$secondaryArchSuffix
+	devel:libQt6QuickVectorImage$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickVectorImageGenerator$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickWidgets$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_declarative$secondaryArchSuffix == $portVersion base
@@ -135,15 +148,18 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
+	devel:libQt6JsonRpc$secondaryArchSuffix
+	devel:libQt6LanguageServer$secondaryArchSuffix
 	devel:libQt6Network$secondaryArchSuffix == $portVersion
 	devel:libQt6OpenGL$secondaryArchSuffix == $portVersion
 	devel:libQt6ShaderTools$secondaryArchSuffix == $portVersion
+	devel:libQt6Svg$secondaryArchSuffix == $portVersion
 	devel:libQt6Widgets$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libvulkan$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -192,12 +208,18 @@ INSTALL()
 		libQt6PacketProtocol \
 		libQt6Qml \
 		libQt6QmlAssetDownloader \
+		libQt6QmlCompiler \
 		libQt6QmlCore \
+		libQt6QmlDebug \
+		libQt6QmlDom \
 		libQt6QmlFormat \
 		libQt6QmlLocalStorage \
+		libQt6QmlLS \
 		libQt6QmlMeta \
 		libQt6QmlModels \
 		libQt6QmlNetwork \
+		libQt6QmlToolingSettings \
+		libQt6QmlTypeRegistrar \
 		libQt6QmlWorkerScript \
 		libQt6QmlXmlListModel \
 		libQt6Quick \
@@ -218,44 +240,53 @@ INSTALL()
 		libQt6QuickDialogs2 \
 		libQt6QuickDialogs2QuickImpl \
 		libQt6QuickDialogs2Utils \
+		libQt6QuickEffects \
 		libQt6QuickLayouts \
 		libQt6QuickParticles \
 		libQt6QuickShapes \
 		libQt6QuickTemplates2 \
-		libQt6QuickTestUtils \
 		libQt6QuickTest \
-		libQt6QuickWidgets \
-		libQt6QmlCompiler \
-		libQt6QmlDebug \
-		libQt6QmlDom \
-		libQt6QmlTypeRegistrar \
-		libQt6QmlToolingSettings
+		libQt6QuickTestUtils \
+		libQt6QuickVectorImage \
+		libQt6QuickVectorImageGenerator \
+		libQt6QuickWidgets

 	# fix pkgconfig & cmake files
 	fixPkgconfig
 	sed -i "s|includedir=.*|includedir=$includeDir/Qt6|" \
 		$developLibDir/pkgconfig/*.pc
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6PacketProtocolPrivate/Qt6PacketProtocolPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6QmlAssetDownloader/Qt6QmlAssetDownloaderTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6QmlDebugPrivate/Qt6QmlDebugPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6QmlDomPrivate/Qt6QmlDomPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
+		$libDir/cmake/Qt6QmlFormatPrivate/Qt6QmlFormatPrivateTargets-release.cmake
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
+		$libDir/cmake/Qt6QmlLSPrivate/Qt6QmlLSPrivateTargets-release.cmake
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6QmlTypeRegistrarPrivate/Qt6QmlTypeRegistrarPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6QuickControlsTestUtilsPrivate/Qt6QuickControlsTestUtilsPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6QuickParticlesPrivate/Qt6QuickParticlesPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6QuickShapesPrivate/Qt6QuickShapesPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateTargets-release.cmake

+	binFiles="qml qmleasing qmlls qmlpreview qmlscene"
+	suffix="6"
+	mkdir -p $binDir
+	for f in $binFiles; do
+		ln -s $libDir/Qt6/$f $binDir/$f$suffix
+	done
+
 	cd $libDir
 	for i in lib*.so.6.*;do
 		ln -fs $i $(echo $i | cut -f1,2 -d.)
--- a/dev-qt/qt6-doc/qt6_doc-6.9.1.recipe
+++ b/dev-qt/qt6-doc/qt6_doc-6.9.1.recipe
@@ -10,25 +10,17 @@ LICENSE="GNU LGPL v2.1
 	GNU FDL v1"
 REVISION="1"
 SOURCE_URI="https://archlinux.thaller.ws/extra/os/x86_64/qt6-doc-${portVersion}-1-any.pkg.tar.zst#noarchive"
-CHECKSUM_SHA256="52c2ea39d7112b7f1109e8625ecbd997abe582c1ae74ed62da0b7b97625fcb36"
+CHECKSUM_SHA256="44cd23e231d7d730c60c08f20a6ba055dbf7d44c733d9c42ee3f963c8ac42c9b"
 SOURCE_DIR="qt6-doc-$portVersion"

-ARCHITECTURES="?all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="?any"

 DISABLE_SOURCE_PACKAGE="yes"

 PROVIDES="
-	qt6_doc$secondaryArchSuffix = $portVersion compat >= 6
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	qt6_tools$secondaryArchSuffix
+	qt6_doc = $portVersion compat >= 6
 	"

-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
 BUILD_PREREQUIRES="
 	cmd:tar
 	cmd:unzstd
--- a/dev-qt/qt6-examples/qt6_examples-6.9.1.recipe
+++ b/dev-qt/qt6-examples/qt6_examples-6.9.1.recipe
@@ -10,24 +10,16 @@ LICENSE="GNU LGPL v2.1
 	GNU FDL v1"
 REVISION="1"
 SOURCE_URI="https://archlinux.thaller.ws/extra/os/x86_64/qt6-examples-${portVersion}-1-any.pkg.tar.zst#noarchive"
-CHECKSUM_SHA256="8264a65de947a7e366bae708c238c621574d2242b34d4e256260e0895cce80ec"
+CHECKSUM_SHA256="c813c333c88c536ae04c0686cf53318338d2b5fdb36f53e326b04466edf1f2c8"

-ARCHITECTURES="?all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="?any"

 DISABLE_SOURCE_PACKAGE="yes"

 PROVIDES="
-	qt6_examples$secondaryArchSuffix = $portVersion compat >= 6
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	qt6_tools$secondaryArchSuffix
+	qt6_examples = $portVersion compat >= 6
 	"

-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
 BUILD_PREREQUIRES="
 	cmd:tar
 	cmd:unzstd
--- a/dev-qt/qt6-imageformats/qt6_imageformats-6.9.0.recipe
+++ b/dev-qt/qt6-imageformats/qt6_imageformats-6.9.0.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2015-2025 The Qt Company Ltd."
 LICENSE="GNU LGPL v2.1
 	GNU LGPL v3
 	GNU FDL v1"
-REVISION="2"
+REVISION="1"
 QT_MIRROR_URI="https://qt-mirror.dannhauer.de/archive"
 SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qtimageformats-everywhere-src-$portVersion.tar.xz"
 CHECKSUM_SHA256="2047c6242a57bf97cf40079fa9f91752c137cd9ae84760faa9a2e5e8a440606f"
@@ -83,6 +83,8 @@ BUILD()
 	cmake -B build -S $sourceDir -G Ninja \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_FLAGS=-fPIC \
+		-DFEATURE_system_tiff=ON \
+		-DFEATURE_system_webp=ON \
 		-DQT_GENERATE_SBOM=ON \
 		-Wno-dev

--- a/dev-qt/qt6-languageserver/qt6_languageserver-6.9.0.recipe
+++ b/dev-qt/qt6-languageserver/qt6_languageserver-6.9.0.recipe
@@ -57,9 +57,9 @@ INSTALL()
 {
 	ninja -C build install

-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6JsonRpcPrivate/Qt6JsonRpcPrivateTargets-release.cmake
-	sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
 		$libDir/cmake/Qt6LanguageServerPrivate/Qt6LanguageServerPrivateTargets-release.cmake

 	prepareInstalledDevelLibs \
--- a/dev-qt/qt6-location/qt6_location-6.9.0.recipe
+++ b/dev-qt/qt6-location/qt6_location-6.9.0.recipe
@@ -17,9 +17,12 @@ SOURCE_DIR="qtlocation-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_location$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Location$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Location$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -37,7 +40,7 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_location${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Location$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Location$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_location$secondaryArchSuffix == $portVersion base
@@ -46,13 +49,13 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Positioning$secondaryArchSuffix == $portVersion
 	devel:libQt6PositioningQuick$secondaryArchSuffix == $portVersion
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-lottie/qt6_lottie-6.9.0.recipe
+++ b/dev-qt/qt6-lottie/qt6_lottie-6.9.0.recipe
@@ -17,9 +17,12 @@ SOURCE_DIR="qtlottie-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_lottie$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Bodymovin$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Bodymovin$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -36,7 +39,7 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_lottie${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Bodymovin$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Bodymovin$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_lottie$secondaryArchSuffix == $portVersion base
@@ -45,14 +48,14 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-multimedia/qt6_multimedia-6.9.0.recipe
+++ b/dev-qt/qt6-multimedia/qt6_multimedia-6.9.0.recipe
@@ -18,12 +18,16 @@ PATCHES="qt6_multimedia-$portVersion.patchset"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_multimedia$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Multimedia$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6MultimediaQuick$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6MultimediaWidgets$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6SpatialAudio$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Multimedia$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6MultimediaQuick$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6MultimediaWidgets$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DSpatialAudio$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6SpatialAudio$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -36,6 +40,9 @@ REQUIRES="
 	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Qml$secondaryArchSuffix
 	lib:libQt6Quick$secondaryArchSuffix
+	lib:libQt6Quick3D$secondaryArchSuffix
+	lib:libQt6Quick3DUtils$secondaryArchSuffix
+	lib:libQt6Quick3DRuntimeRender$secondaryArchSuffix
 	lib:libQt6QmlModels$secondaryArchSuffix
 	lib:libQt6ShaderTools$secondaryArchSuffix
 	lib:libQt6Svg$secondaryArchSuffix
@@ -45,13 +52,14 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_multimedia${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6BundledResonanceAudio$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6FFmpegMediaPluginImpl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Multimedia$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6MultimediaQuick$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6MultimediaTestLib$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6MultimediaWidgets$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6SpatialAudio$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6BundledResonanceAudio$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6FFmpegMediaPluginImpl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Multimedia$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6MultimediaQuick$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6MultimediaTestLib$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6MultimediaWidgets$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DSpatialAudio$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6SpatialAudio$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_multimedia$secondaryArchSuffix == $portVersion base
@@ -61,7 +69,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libavcodec$secondaryArchSuffix >= 60
 	devel:libgl$secondaryArchSuffix
 	devel:libopenal$secondaryArchSuffix
@@ -70,9 +78,10 @@ BUILD_REQUIRES="
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
+	devel:libQt6Quick3D$secondaryArchSuffix == $portVersion
 	devel:libQt6ShaderTools$secondaryArchSuffix == $portVersion
 	devel:libQt6Svg$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libvulkan$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
@@ -104,7 +113,7 @@ BUILD()
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_FLAGS=-fPIC \
 		-DFEATURE_linux_dmabuf=OFF \
-		-DQT_GENERATE_SBOM=OFF \
+		-DQT_GENERATE_SBOM=ON \
 		-Wno-dev

 	find -name cmake_install.cmake -exec sed -i "s|set(CMAKE_INSTALL_PREFIX.*|set(CMAKE_INSTALL_PREFIX \"$prefix\")|" {} \;
@@ -123,6 +132,7 @@ INSTALL()
 		libQt6MultimediaQuick \
 		libQt6MultimediaTestLib \
 		libQt6MultimediaWidgets \
+		libQt6Quick3DSpatialAudio \
 		libQt6SpatialAudio

 	# fix pkgconfig files
--- a/dev-qt/qt6-networkauth/qt6_networkauth-6.9.0.recipe
+++ b/dev-qt/qt6-networkauth/qt6_networkauth-6.9.0.recipe
@@ -17,22 +17,26 @@ SOURCE_DIR="qtnetworkauth-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_networkauth$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6NetworkAuth$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6NetworkAuth$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Network$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	"

 PROVIDES_devel="
 	qt6_networkauth${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6NetworkAuth$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6NetworkAuth$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_networkauth$secondaryArchSuffix == $portVersion base
@@ -41,10 +45,10 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Network$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
--- a/dev-qt/qt6-positioning/qt6_positioning-6.9.0.recipe
+++ b/dev-qt/qt6-positioning/qt6_positioning-6.9.0.recipe
@@ -17,10 +17,13 @@ SOURCE_DIR="qtpositioning-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_positioning$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Positioning$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6PositioningQuick$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Positioning$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6PositioningQuick$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -38,8 +41,8 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_positioning${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Positioning$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6PositioningQuick$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Positioning$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6PositioningQuick$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_positioning$secondaryArchSuffix == $portVersion base
@@ -48,7 +51,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
@@ -56,7 +59,8 @@ BUILD_REQUIRES="
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
 	devel:libQt6SerialPort$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libQt6Svg$secondaryArchSuffix == $portVersion
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-quick3d/qt6_quick3d-6.9.0.recipe
+++ b/dev-qt/qt6-quick3d/qt6_quick3d-6.9.0.recipe
@@ -17,20 +17,23 @@ SOURCE_DIR="qtquick3d-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_quick3d$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3D$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DAssetImport$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DAssetUtils$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DEffects$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DGlslParser$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DHelpers$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DHelpersImpl$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DIblBaker$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DParticleEffects$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DParticles$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DRuntimeRender$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DUtils$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Quick3D$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DAssetImport$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DAssetUtils$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DEffects$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DGlslParser$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DHelpers$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DHelpersImpl$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DIblBaker$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DParticleEffects$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DParticles$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DRuntimeRender$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DUtils$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -49,18 +52,18 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_quick3d${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Quick3D$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DAssetImport$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DAssetUtils$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DEffects$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DGlslParser$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DHelpers$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DHelpersImpl$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DIblBaker$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DParticleEffects$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DParticles$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DRuntimeRender$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DUtils$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Quick3D$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DAssetImport$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DAssetUtils$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DEffects$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DGlslParser$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DHelpers$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DHelpersImpl$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DIblBaker$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DParticleEffects$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DParticles$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DRuntimeRender$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DUtils$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_quick3d$secondaryArchSuffix == $portVersion base
@@ -69,7 +72,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
@@ -78,7 +81,7 @@ BUILD_REQUIRES="
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
 	devel:libQt6QuickTimeline$secondaryArchSuffix == $portVersion
 	devel:libQt6ShaderTools$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.9.0.recipe
+++ b/dev-qt/qt6-quick3dphysics/qt6_quick3dphysics-6.9.0.recipe
@@ -18,10 +18,13 @@ PATCHES="qt6_quick3dphysics-$portVersion.patchset"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_quick3dphysics$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DPhysics$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Quick3DPhysicsHelpers$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Quick3DPhysics$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Quick3DPhysicsHelpers$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -40,9 +43,9 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_quick3dphysics${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Quick3DPhysics$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Quick3DPhysicsHelpers$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6BundledPhysX$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Quick3DPhysics$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Quick3DPhysicsHelpers$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6BundledPhysX$secondaryArchSuffix
 	"
 REQUIRES_devel="
 	qt6_quick3dphysics$secondaryArchSuffix == $portVersion base
@@ -51,7 +54,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
@@ -61,7 +64,7 @@ BUILD_REQUIRES="
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick3D$secondaryArchSuffix == $portVersion
 	devel:libQt6ShaderTools$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -107,6 +110,8 @@ INSTALL()
 	fixPkgconfig
 	sed -i "s|includedir=.*|includedir=$includeDir/Qt6|" \
 		$developLibDir/pkgconfig/*.pc
+	sed -i "s,\${_IMPORT_PREFIX}/$relativeLibDir,\${_IMPORT_PREFIX}/$relativeDevelopLibDir," \
+		$libDir/cmake/Qt6BundledPhysX/Qt6BundledPhysXTargets-release.cmake

 	cd $libDir
 	for i in lib*.so.6.*;do
--- a/dev-qt/qt6-quicktimeline/qt6_quicktimeline-6.9.0.recipe
+++ b/dev-qt/qt6-quicktimeline/qt6_quicktimeline-6.9.0.recipe
@@ -17,10 +17,13 @@ SOURCE_DIR="qtquicktimeline-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_quicktimeline$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickTimeline$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6QuickTimelineBlendTrees$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6QuickTimeline$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6QuickTimelineBlendTrees$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -37,8 +40,8 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_quicktimeline${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6QuickTimeline$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6QuickTimelineBlendTrees$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6QuickTimeline$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6QuickTimelineBlendTrees$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_quicktimeline$secondaryArchSuffix == $portVersion base
@@ -47,14 +50,14 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-scxml/qt6_scxml-6.9.0.recipe
+++ b/dev-qt/qt6-scxml/qt6_scxml-6.9.0.recipe
@@ -17,12 +17,15 @@ SOURCE_DIR="qtscxml-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_scxml$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Scxml$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6ScxmlQml$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6StateMachine$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6StateMachineQml$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Scxml$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6ScxmlQml$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6StateMachine$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6StateMachineQml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -39,10 +42,10 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_scxml${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Scxml$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6ScxmlQml$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6StateMachine$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6StateMachineQml$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Scxml$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6ScxmlQml$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6StateMachine$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6StateMachineQml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_scxml$secondaryArchSuffix == $portVersion base
@@ -51,14 +54,14 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-sensors/qt6_sensors-6.9.0.recipe
+++ b/dev-qt/qt6-sensors/qt6_sensors-6.9.0.recipe
@@ -18,10 +18,13 @@ PATCHES="qt6_sensors-$portVersion.patchset"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_sensors$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Sensors$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6SensorsQuick$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Sensors$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6SensorsQuick$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -40,8 +43,8 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_sensors${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Sensors$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6SensorsQuick$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Sensors$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6SensorsQuick$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_sensors$secondaryArchSuffix == $portVersion base
@@ -50,7 +53,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
@@ -59,7 +62,7 @@ BUILD_REQUIRES="
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
 	devel:libQt6Svg$secondaryArchSuffix == $portVersion
 	devel:libQt6SvgWidgets$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-serialport/qt6_serialport-6.9.0.recipe
+++ b/dev-qt/qt6-serialport/qt6_serialport-6.9.0.recipe
@@ -18,9 +18,12 @@ PATCHES="qt6_serialport-$portVersion.patchset"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_serialport$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6SerialPort$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6SerialPort$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -30,7 +33,7 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_serialport${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6SerialPort$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6SerialPort$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_serialport$secondaryArchSuffix == $portVersion base
--- a/dev-qt/qt6-shadertools/qt6_shadertools-6.9.0.recipe
+++ b/dev-qt/qt6-shadertools/qt6_shadertools-6.9.0.recipe
@@ -16,10 +16,13 @@ SOURCE_DIR="qtshadertools-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_shadertools$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6ShaderTools$secondaryArchSuffix = $portVersion compat >= 6
-	cmd:qsb$secondaryArchSuffix = $portVersion compat >= 6
+	cmd:qsb6$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6ShaderTools$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -30,7 +33,7 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_shadertools${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6ShaderTools$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6ShaderTools$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_shadertools$secondaryArchSuffix == $portVersion base
@@ -74,10 +77,6 @@ BUILD()

 INSTALL()
 {
-#	needs work, finds the library but tries to install to /boot/system
-#	sed -i "s|$ENV{DESTDIR}/boot/system|{DESTDIR}$prefix|" \
-#		build/qt_sbom/*.cmake
-
 	ninja -C build install

 	prepareInstalledDevelLib \
@@ -89,7 +88,7 @@ INSTALL()
 		$developLibDir/pkgconfig/*.pc

 	mkdir -p $binDir
-	ln -s -t $binDir $libDir/Qt6/qsb
+	ln -s $libDir/Qt6/qsb $binDir/qsb6

 	cd $libDir
 	for i in lib*.so.6.*;do
--- a/dev-qt/qt6-speech/qt6_speech-6.9.0.recipe
+++ b/dev-qt/qt6-speech/qt6_speech-6.9.0.recipe
@@ -18,9 +18,12 @@ PATCHES="qt6_speech-$portVersion.patchset"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_speech$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6TextToSpeech$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6TextToSpeech$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -34,7 +37,7 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_speech${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6TextToSpeech$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6TextToSpeech$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_speech$secondaryArchSuffix == $portVersion base
--- a/dev-qt/qt6-svg/qt6_svg-6.9.0.recipe
+++ b/dev-qt/qt6-svg/qt6_svg-6.9.0.recipe
@@ -17,10 +17,13 @@ SOURCE_DIR="qtsvg-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_svg$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Svg$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6SvgWidgets$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Svg$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6SvgWidgets$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -36,8 +39,8 @@ SUPPLEMENTS="

 PROVIDES_devel="
 	qt6_svg${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Svg$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6SvgWidgets$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Svg$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6SvgWidgets$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_svg$secondaryArchSuffix == $portVersion base
--- a/dev-qt/qt6-tools/qt6_tools-6.9.0.recipe
+++ b/dev-qt/qt6-tools/qt6_tools-6.9.0.recipe
@@ -22,14 +22,13 @@ ADDITIONAL_FILES="
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 clangVer="20"

 PROVIDES="
 	qt6_tools$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6Designer$secondaryArchSuffix = $portVersion compat >= 6
-	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
@@ -40,6 +39,10 @@ PROVIDES="
 	cmd:qdoc6$secondaryArchSuffix = $portVersion compat >= 6
 	cmd:qtdiag6$secondaryArchSuffix = $portVersion compat >= 6
 	cmd:qtplugininfo6$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6Designer$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6DesignerComponents$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6Help$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6UiTools$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -59,10 +62,10 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_tools${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6Designer$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6DesignerComponents$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6Help$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6UiTools$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6Designer$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6DesignerComponents$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6Help$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6UiTools$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_tools$secondaryArchSuffix == $portVersion base
@@ -73,17 +76,20 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libclang$secondaryArchSuffix >= $clangVer
 	devel:libclang_cpp$secondaryArchSuffix >= $clangVer
+	devel:libcrypto$secondaryArchSuffix
 	devel:libLLVM_$clangVer$secondaryArchSuffix
-	devel:libcrypto$secondaryArchSuffix >= 3
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
+	devel:libQt6JsonRpc$secondaryArchSuffix
+	devel:libQt6LanguageServer$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
 	devel:libQt6Widgets$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libvulkan$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	devel:libzstd$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
--- a/dev-qt/qt6-webchannel/qt6_webchannel-6.9.0.recipe
+++ b/dev-qt/qt6-webchannel/qt6_webchannel-6.9.0.recipe
@@ -17,10 +17,13 @@ SOURCE_DIR="qtwebchannel-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_webchannel$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6WebChannel$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6WebChannelQuick$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6WebChannel$secondaryArchSuffix = $libVersionCompat
+	lib:libQt6WebChannelQuick$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -38,8 +41,8 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_webchannel${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6WebChannel$secondaryArchSuffix = $portVersion compat >= 6
-	devel:libQt6WebChannelQuick$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6WebChannel$secondaryArchSuffix = $libVersionCompat
+	devel:libQt6WebChannelQuick$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_webchannel$secondaryArchSuffix == $portVersion base
@@ -48,7 +51,7 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
@@ -56,7 +59,7 @@ BUILD_REQUIRES="
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
 	devel:libQt6WebSockets$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/dev-qt/qt6-websockets/qt6_websockets-6.9.0.recipe
+++ b/dev-qt/qt6-websockets/qt6_websockets-6.9.0.recipe
@@ -17,9 +17,12 @@ SOURCE_DIR="qtwebsockets-everywhere-src-$portVersion"
 ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qt6_websockets$secondaryArchSuffix = $portVersion compat >= 6
-	lib:libQt6WebSockets$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libQt6WebSockets$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -36,7 +39,7 @@ REQUIRES="

 PROVIDES_devel="
 	qt6_websockets${secondaryArchSuffix}_devel = $portVersion compat >= 6
-	devel:libQt6WebSockets$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libQt6WebSockets$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qt6_websockets$secondaryArchSuffix == $portVersion base
@@ -45,14 +48,14 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcrypto$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix == $portVersion
 	devel:libQt6Gui$secondaryArchSuffix == $portVersion
 	devel:libQt6Qml$secondaryArchSuffix == $portVersion
 	devel:libQt6QmlModels$secondaryArchSuffix == $portVersion
 	devel:libQt6Quick$secondaryArchSuffix == $portVersion
-	devel:libssl$secondaryArchSuffix >= 3
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -89,7 +92,7 @@ INSTALL()
 {
 	ninja -C build install

-	prepareInstalledDevelLibs \
+	prepareInstalledDevelLib \
 		libQt6WebSockets

 	# fix pkgconfig files