Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: x11/qt6: force to use llvm19
To:
Rafael Sadowski <rafael@sizeofvoid.org>
Cc:
ports@openbsd.org
Date:
Sun, 14 Dec 2025 09:45:15 +0000

Download raw body.

Thread 
On 2025/12/13 15:32, Rafael Sadowski wrote:
> diff -u -p -r1.29 Makefile
> --- qttools/Makefile	13 Dec 2025 06:39:53 -0000	1.29
> +++ qttools/Makefile	13 Dec 2025 14:27:32 -0000
> @@ -1,7 +1,7 @@
>  QT6NAME =	QtTools
>  COMMENT =	Qt6 development tools
>  PKGSPEC =	qt6-qttools-${QT6_PKGSPEC}
> -REVISION =	0
> +REVISION =	1
>  
>  SHARED_LIBS +=  Qt6Designer             3.1 # 6.7
>  SHARED_LIBS +=  Qt6DesignerComponents   2.0 # 6.7
> @@ -21,7 +21,7 @@ WANTLIB += llvm${MODCLANG_VERSION}/lib/c
>  MODQT6_DEPS =	No
>  
>  MODULES +=			lang/clang

maybe add a quick comment here pointing out the patch?

# see patch-src_qdoc_cmake_QDocConfiguration_cmake
> -MODCLANG_VERSION =		21
> +MODCLANG_VERSION =		19
>  MODCLANG_COMPILER_LINKS =	Yes
>  MODCLANG_BUILDDEP =		No
>  MODCLANG_RUNDEP =		No
> Index: qttools/patches/patch-src_qdoc_cmake_QDocConfiguration_cmake
> ===================================================================
> RCS file: qttools/patches/patch-src_qdoc_cmake_QDocConfiguration_cmake
> diff -N qttools/patches/patch-src_qdoc_cmake_QDocConfiguration_cmake
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ qttools/patches/patch-src_qdoc_cmake_QDocConfiguration_cmake	13 Dec 2025 14:27:32 -0000
> @@ -0,0 +1,11 @@
> +Index: src/qdoc/cmake/QDocConfiguration.cmake
> +--- src/qdoc/cmake/QDocConfiguration.cmake.orig
> ++++ src/qdoc/cmake/QDocConfiguration.cmake
> +@@ -8,6 +8,6 @@ set(QDOC_MINIMUM_CLANG_VERSION "17")
> + 
> + # List of explicitly supported Clang versions for QDoc
> + set(QDOC_SUPPORTED_CLANG_VERSIONS
> +-    "21.1" "20.1" "19.1" "18.1" "17.0.6"
> ++    "19.1" "18.1" "17.0.6"
> + )
> + 
>