diff --git a/dev-qt/qt6-tools/qt6_tools-6.7.0.recipe b/dev-qt/qt6-tools/qt6_tools-6.7.0.recipe index 616e64e81..5da2ccda6 100644 --- a/dev-qt/qt6-tools/qt6_tools-6.7.0.recipe +++ b/dev-qt/qt6-tools/qt6_tools-6.7.0.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2015-2024 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3 GNU FDL v1" -REVISION="1" +REVISION="2" QT_MIRROR_URI="https://qt-mirror.dannhauer.de/archive" SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qttools-everywhere-src-$portVersion.tar.xz" CHECKSUM_SHA256="c8da6b239e82fe1e23465cbf0936c0da5a334438d3fb433e19c503cbb1abee7b" @@ -42,13 +42,13 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix - lib:libLLVM_17$secondaryArchSuffix + lib:libLLVM$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix lib:libQt6QmlModels$secondaryArchSuffix lib:libQt6Quick$secondaryArchSuffix - lib:libQt6Qml$secondaryArchSuffix lib:libQt6Widgets$secondaryArchSuffix lib:libvulkan$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -68,17 +68,17 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libclang$secondaryArchSuffix >= 17 - devel:libclang_cpp$secondaryArchSuffix >= 17 - devel:libLLVM_17$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix - devel:libQt6Core$secondaryArchSuffix - devel:libQt6Gui$secondaryArchSuffix - devel:libQt6QmlModels$secondaryArchSuffix - devel:libQt6Quick$secondaryArchSuffix - devel:libQt6Qml$secondaryArchSuffix - devel:libQt6Widgets$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libclang$secondaryArchSuffix >= 18 + devel:libclang_cpp$secondaryArchSuffix >= 18 + devel:libLLVM_18$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix >= 3 + devel:libQt6Core$secondaryArchSuffix == $portVersion + devel:libQt6Gui$secondaryArchSuffix == $portVersion + devel:libQt6Qml$secondaryArchSuffix == $portVersion + devel:libQt6QmlModels$secondaryArchSuffix == $portVersion + devel:libQt6Quick$secondaryArchSuffix == $portVersion + devel:libQt6Widgets$secondaryArchSuffix == $portVersion + devel:libssl$secondaryArchSuffix >= 3 devel:libvulkan$secondaryArchSuffix devel:libz$secondaryArchSuffix " @@ -105,7 +105,7 @@ BUILD() local LLVM_VERION_MAJOR="`echo "$LLVM_VERSION" | cut -d. -f1`" local LLVM_VERION_MINOR="`echo "$LLVM_VERSION" | cut -d. -f2`" local LLVM_VERION_PATCH="`echo "$LLVM_VERSION" | cut -d. -f3`" - + sed \ -e "s|@CLANG_VERSION_MAJOR@|$LLVM_VERION_MAJOR|" \ -e "s|@CLANG_VERSION_MINOR@|$LLVM_VERION_MINOR|" \ @@ -172,8 +172,8 @@ INSTALL() done mkdir -p $libDir/Qt6/lib - cp -f `finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/libclang.so.17 $libDir/Qt6/lib - cp -f `finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/libclang-cpp.so.17 $libDir/Qt6/lib + cp -f `finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/libclang.so.18.1 $libDir/Qt6/lib + cp -f `finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/libclang-cpp.so.18.1 $libDir/Qt6/lib strip -s $libDir/Qt6/lib/libclang* cd $libDir