From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: x11/qt6: force to use llvm19
To: ports@openbsd.org
Date: Sat, 13 Dec 2025 15:32:17 +0100

In my Qt6 update, I updated qttools from llvm19 to llvm21. Since
qttools always selected the highest version when it was installed,
that was the/my shortcut. Since pyside requires qttools, I have
also set it to 21 here.

With this diff, we can revert to llvm19.

Thanks to tb@ for raising the right question!

Rafael

Index: pyside6/shiboken/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/pyside6/shiboken/Makefile,v
diff -u -p -r1.11 Makefile
--- pyside6/shiboken/Makefile	9 Dec 2025 10:37:31 -0000	1.11
+++ pyside6/shiboken/Makefile	13 Dec 2025 14:27:32 -0000
@@ -1,5 +1,6 @@
 COMMENT =		Python binding generator for C++ libraries
 PKGNAME =		shiboken6-${VERSION}
+REVISION =		0
 
 SHARED_LIBS +=		shiboken6.abi3	2.0 # 0.0
 
@@ -8,7 +9,7 @@ WANTLIB += llvm${MODCLANG_VERSION}/lib/c
 
 MODULES +=		lang/clang \
 			lang/python
-MODCLANG_VERSION =	21
+MODCLANG_VERSION =	19
 
 BUILD_DEPENDS =		x11/qt6/qttools \
 			math/py-numpy
Index: qttools/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qttools/Makefile,v
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
-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"
+ )
+