summaryrefslogtreecommitdiff
path: root/devel/qt6-tools/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/qt6-tools/files')
-rw-r--r--devel/qt6-tools/files/patch-.cmake.conf19
-rw-r--r--devel/qt6-tools/files/patch-configure.cmake22
2 files changed, 36 insertions, 5 deletions
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