diff options
Diffstat (limited to 'devel/qt6-tools')
| -rw-r--r-- | devel/qt6-tools/Makefile | 16 | ||||
| -rw-r--r-- | devel/qt6-tools/distinfo | 6 | ||||
| -rw-r--r-- | devel/qt6-tools/files/patch-.cmake.conf | 19 | ||||
| -rw-r--r-- | devel/qt6-tools/files/patch-configure.cmake | 22 | ||||
| -rw-r--r-- | devel/qt6-tools/pkg-plist | 26 |
5 files changed, 77 insertions, 12 deletions
diff --git a/devel/qt6-tools/Makefile b/devel/qt6-tools/Makefile index f698e7729c97..63b3deb3d8df 100644 --- a/devel/qt6-tools/Makefile +++ b/devel/qt6-tools/Makefile @@ -10,14 +10,22 @@ BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \ libzstd.so:archivers/zstd -USES= cmake compiler:c++17-lang gl llvm:min=17,lib,noexport python:build \ - qt-dist:6 +USES= cmake compiler:c++17-lang gl llvm:min=17,max=20,lib,noexport \ + python:build qt-dist:6 USE_GL= opengl USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_QT= base declarative sqldriver-sqlite:run -CMAKE_ARGS+= -DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \ - -DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm" +# QDOC_USER_CLANG_VERSION is an unofficial CMake variable intended to override +# the list of supported LLVM versions, i.e., QDOC_SUPPORTED_CLANG_VERSIONS in +# .cmake.conf with the chosen version of LLVM. We must be careful here and adjust +# llvm min/max in USES to align with the versions of LLVM that future releases +# support. LLVM_VERSION only provides the major version, but at least the minor +# version must also be passed, hence the use of "black magic" to determine this +# value, which does not respect relative paths. +CMAKE_ARGS= -DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \ + -DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm" \ + -DQDOC_USER_CLANG_VERSION:STRING="`${MAKE} -C ${PORTSDIR}/devel/llvm${LLVM_VERSION} -VDISTVERSION:R`" post-install: # Install symlinks for user-facing tools diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo index 4f4bffa3c67c..f68da1180fac 100644 --- a/devel/qt6-tools/distinfo +++ b/devel/qt6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027817 -SHA256 (KDE/Qt/6.8.3/qttools-everywhere-src-6.8.3.tar.xz) = 02a4e219248b94f1333df843d25763f35251c1074cdc4fb5bda67d340f8c8b3a -SIZE (KDE/Qt/6.8.3/qttools-everywhere-src-6.8.3.tar.xz) = 10301984 +TIMESTAMP = 1749162793 +SHA256 (KDE/Qt/6.9.1/qttools-everywhere-src-6.9.1.tar.xz) = 90c4a562f4ccfd043fd99f34c600853e0b5ba9babc6ec616c0f306f2ce3f4b4c +SIZE (KDE/Qt/6.9.1/qttools-everywhere-src-6.9.1.tar.xz) = 10339096 diff --git a/devel/qt6-tools/files/patch-.cmake.conf b/devel/qt6-tools/files/patch-.cmake.conf new file mode 100644 index 000000000000..ec629a036b7e --- /dev/null +++ b/devel/qt6-tools/files/patch-.cmake.conf @@ -0,0 +1,19 @@ +Supply the version of LLVM we are intending to use via QDOC_USER_CLANG_VERSION, +a made-up CMake varible derived from LLVM_VERSION in the port Makefile, instead +of iterating through potential candidates. This avoids mismatches during the +configure stage when a user has a version of LLVM installed greater than what is +set in DEFAULT_VERSIONS. + +PR: 287430 + +--- .cmake.conf.orig 2025-05-29 00:19:42 UTC ++++ .cmake.conf +@@ -3,7 +3,7 @@ set(QDOC_SUPPORTED_CLANG_VERSIONS + set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") + set(QDOC_MINIMUM_CLANG_VERSION "17") + set(QDOC_SUPPORTED_CLANG_VERSIONS +- "20.1" "19.1" "18.1" "17.0" ++ ${QDOC_USER_CLANG_VERSION} + ) + list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") + list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff --git a/devel/qt6-tools/files/patch-configure.cmake b/devel/qt6-tools/files/patch-configure.cmake index 3fcd6e398037..e5d15fe0e715 100644 --- a/devel/qt6-tools/files/patch-configure.cmake +++ b/devel/qt6-tools/files/patch-configure.cmake @@ -15,13 +15,25 @@ Call Stack (most recent call first): Regressed by: https://code.qt.io/cgit/qt/qttools.git/commit/?h=6.6.0&id=ff5c080c2eb9267c43da6fafe953bf50076443c4 ---- configure.cmake.orig 2023-09-11 09:43:37 UTC +--- configure.cmake.orig 2025-02-19 09:54:25 UTC +++ configure.cmake -@@ -7,6 +7,7 @@ - - #### Libraries +@@ -1,6 +1,11 @@ + # Copyright (C) 2022 The Qt Company Ltd. + # SPDX-License-Identifier: BSD-3-Clause ++#### Libraries ++ +qt_find_package(WrapZSTD 1.3 PROVIDED_TARGETS WrapZSTD::WrapZSTD MODULE_NAME designer) ++ ++ + #### Tests + qt_find_package(WrapLibClang 8 PROVIDED_TARGETS WrapLibClang::WrapLibClang) +@@ -8,7 +13,6 @@ endif() + if(TARGET WrapLibClang::WrapLibClang) + set(TEST_libclang "ON" CACHE BOOL "Required libclang version found." FORCE) + endif() +- - #### Tests + + #### Features diff --git a/devel/qt6-tools/pkg-plist b/devel/qt6-tools/pkg-plist index b43594698111..07be5f73c227 100644 --- a/devel/qt6-tools/pkg-plist +++ b/devel/qt6-tools/pkg-plist @@ -228,6 +228,8 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtHelp/qhelpsearchresult.h %%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h %%QT_INCDIR%%/QtHelp/qthelpversion.h +%%QT_INCDIR%%/QtHelp/ui_qfilternamedialog.h +%%QT_INCDIR%%/QtHelp/ui_qhelpfiltersettingswidget.h %%QT_INCDIR%%/QtQDocCatch/QtQDocCatchDepends %%QT_INCDIR%%/QtQDocCatch/catch/catch.hpp %%QT_INCDIR%%/QtQDocCatchConversions/QtQDocCatchConversionsDepends @@ -297,6 +299,14 @@ lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateTargets-%%CMA lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateTargets.cmake lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateVersionlessAliasTargets.cmake lib/cmake/Qt6DesignerComponentsPrivate/Qt6DesignerComponentsPrivateVersionlessTargets.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateConfig.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateConfigVersion.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateConfigVersionImpl.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateDependencies.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateTargets.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6DesignerPrivate/Qt6DesignerPrivateVersionlessTargets.cmake lib/cmake/Qt6Help/Qt6HelpAdditionalTargetInfo.cmake lib/cmake/Qt6Help/Qt6HelpConfig.cmake lib/cmake/Qt6Help/Qt6HelpConfigVersion.cmake @@ -307,6 +317,14 @@ lib/cmake/Qt6Help/Qt6HelpTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Help/Qt6HelpTargets.cmake lib/cmake/Qt6Help/Qt6HelpVersionlessAliasTargets.cmake lib/cmake/Qt6Help/Qt6HelpVersionlessTargets.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateConfig.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateConfigVersion.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateConfigVersionImpl.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateDependencies.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateTargets.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6HelpPrivate/Qt6HelpPrivateVersionlessTargets.cmake lib/cmake/Qt6Linguist/Qt6LinguistAdditionalTargetInfo.cmake lib/cmake/Qt6Linguist/Qt6LinguistConfig.cmake lib/cmake/Qt6Linguist/Qt6LinguistConfigVersion.cmake @@ -379,6 +397,14 @@ lib/cmake/Qt6UiTools/Qt6UiToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6UiTools/Qt6UiToolsTargets.cmake lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessAliasTargets.cmake lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateConfig.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateConfigVersion.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateDependencies.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateTargets.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6UiToolsPrivate/Qt6UiToolsPrivateVersionlessTargets.cmake %%QT_BINDIR%%/assistant %%QT_BINDIR%%/designer %%QT_BINDIR%%/lconvert |