diff --git a/dev-qt/qt6-tools/qt6_tools-6.5.0.recipe b/dev-qt/qt6-tools/qt6_tools-6.6.0.recipe similarity index 91% rename from dev-qt/qt6-tools/qt6_tools-6.5.0.recipe rename to dev-qt/qt6-tools/qt6_tools-6.6.0.recipe index 27cddbdcc..7b9f59186 100644 --- a/dev-qt/qt6-tools/qt6_tools-6.5.0.recipe +++ b/dev-qt/qt6-tools/qt6_tools-6.6.0.recipe @@ -8,7 +8,7 @@ LICENSE="GNU LGPL v2.1 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="49c33d96b0a44988be954269b8ce3d1a495b439726e03a6be7c0d50a686369c4" +CHECKSUM_SHA256="4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99" SOURCE_DIR="qttools-everywhere-src-$portVersion" ADDITIONAL_FILES=" Assistant.rdef.in @@ -40,10 +40,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libclang$secondaryArchSuffix - lib:libclang_cpp$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix - lib:libLLVM_12$secondaryArchSuffix + lib:libLLVM_17$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix @@ -69,9 +67,9 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libclang$secondaryArchSuffix >= 12 - devel:libclang_cpp$secondaryArchSuffix >= 12 - devel:libLLVM_12$secondaryArchSuffix + devel:libclang$secondaryArchSuffix >= 17 + devel:libclang_cpp$secondaryArchSuffix >= 17 + devel:libLLVM_17$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix devel:libQt6Gui$secondaryArchSuffix @@ -128,6 +126,8 @@ BUILD() INSTALL() { + local LLVM_INSTALL_DIR=$(llvm-config --prefix) + ninja -C build install prepareInstalledDevelLibs \ @@ -172,6 +172,11 @@ INSTALL() mimeset -f $libDir/Qt6/$j done + mkdir -p $libDir/Qt6/lib + cp -f $LLVM_INSTALL_DIR/$relativeDevelopLibDir/libclang.so.17 $libDir/Qt6/lib + cp -f $LLVM_INSTALL_DIR/$relativeDevelopLibDir/libclang-cpp.so.17 $libDir/Qt6/lib + strip -s $libDir/Qt6/lib/libclang* + cd $libDir for i in lib*.so.6.*;do ln -fs $i $(echo $i | cut -f1,2 -d.)