Tue Dec 19 13:01:37 2023 UTC ()
x11/qt5-qttools: really make llvm dependency go away with explicit switch

This adds the explicit switch to qmake to avoid pulling in llvm even from
the environment by accident. It only changes the result for people who
tried disabling the suggested llvm option but hat interference.


(thor)
diff -r1.95 -r1.96 pkgsrc/x11/qt5-qttools/Makefile
diff -r1.31 -r1.32 pkgsrc/x11/qt5-qttools/distinfo
diff -r0 -r1.1 pkgsrc/x11/qt5-qttools/patches/patch-src_qdoc_configure.json
cvs diff -r1.95 -r1.96 pkgsrc/x11/qt5-qttools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qttools/Makefile 2023/11/12 13:24:26 1.95
+++ pkgsrc/x11/qt5-qttools/Makefile 2023/12/19 13:01:37 1.96
@@ -1,37 +1,41 @@ @@ -1,37 +1,41 @@
1# $NetBSD: Makefile,v 1.95 2023/11/12 13:24:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.96 2023/12/19 13:01:37 thor Exp $
2 2
3DISTNAME= qttools-everywhere-opensource-src-${QTVERSION} 3DISTNAME= qttools-everywhere-opensource-src-${QTVERSION}
4PKGNAME= qt5-qttools-${QTVERSION} 4PKGNAME= qt5-qttools-${QTVERSION}
5PKGREVISION= 3 5PKGREVISION= 4
6COMMENT= Qt5 tools 6COMMENT= Qt5 tools
7 7
8DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 8DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
9 9
10MAKE_ENV+= QTDIR=${QTDIR} 10MAKE_ENV+= QTDIR=${QTDIR}
11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 11INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
12INSTALLATION_DIRS+= lib/pkgconfig 12INSTALLATION_DIRS+= lib/pkgconfig
13 13
14PKG_OPTIONS_VAR= PKG_OPTIONS.qt5-qttools 14PKG_OPTIONS_VAR= PKG_OPTIONS.qt5-qttools
15PKG_SUPPORTED_OPTIONS+= llvm 15PKG_SUPPORTED_OPTIONS+= llvm
16PKG_SUGGESTED_OPTIONS+= llvm 16PKG_SUGGESTED_OPTIONS+= llvm
17PLIST_VARS+= llvm 17PLIST_VARS+= llvm
18 18
19.include "../../mk/bsd.options.mk" 19.include "../../mk/bsd.options.mk"
20 20
 21QMAKE_ARGS+= --
21.if !empty(PKG_OPTIONS:Mllvm) 22.if !empty(PKG_OPTIONS:Mllvm)
22PLIST.llvm= yes 23PLIST.llvm= yes
23MAKE_ENV+= LLVM_INSTALL_DIR=${BUILDLINK_PREFIX.clang} 24MAKE_ENV+= LLVM_INSTALL_DIR=${BUILDLINK_PREFIX.clang}
24.include "../../lang/clang/buildlink3.mk" 25.include "../../lang/clang/buildlink3.mk"
 26QMAKE_ARGS+= -qdoc
 27.else
 28QMAKE_ARGS+= -no-qdoc
25.endif 29.endif
26 30
27.include "../../x11/qt5-qtbase/Makefile.common" 31.include "../../x11/qt5-qtbase/Makefile.common"
28 32
29QTPKGCONFIGPC= Qt5Designer.pc Qt5Help.pc Qt5UiTools.pc 33QTPKGCONFIGPC= Qt5Designer.pc Qt5Help.pc Qt5UiTools.pc
30 34
31post-install: 35post-install:
32.for i in ${QTPKGCONFIGPC} 36.for i in ${QTPKGCONFIGPC}
33 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 37 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
34 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 38 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
35.endfor 39.endfor
36 40
37.include "../../x11/qt5-qtbase/buildlink3.mk" 41.include "../../x11/qt5-qtbase/buildlink3.mk"
cvs diff -r1.31 -r1.32 pkgsrc/x11/qt5-qttools/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qttools/distinfo 2023/10/07 20:00:35 1.31
+++ pkgsrc/x11/qt5-qttools/distinfo 2023/12/19 13:01:37 1.32
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.31 2023/10/07 20:00:35 adam Exp $ 1$NetBSD: distinfo,v 1.32 2023/12/19 13:01:37 thor Exp $
2 2
3BLAKE2s (qttools-everywhere-opensource-src-5.15.11.tar.xz) = d43dfd615013c6990c58e6af592a866df5c75b833a0caee32a45961487d0da35 3BLAKE2s (qttools-everywhere-opensource-src-5.15.11.tar.xz) = d43dfd615013c6990c58e6af592a866df5c75b833a0caee32a45961487d0da35
4SHA512 (qttools-everywhere-opensource-src-5.15.11.tar.xz) = 7aa66964dfc4bd144ee828a5c278b3127c5b269c6fb0e5363e7d2377ba19165e04719636659cb30fee471de26740d3d8692068459e1764d9f84a7737f24c4884 4SHA512 (qttools-everywhere-opensource-src-5.15.11.tar.xz) = 7aa66964dfc4bd144ee828a5c278b3127c5b269c6fb0e5363e7d2377ba19165e04719636659cb30fee471de26740d3d8692068459e1764d9f84a7737f24c4884
5Size (qttools-everywhere-opensource-src-5.15.11.tar.xz) = 8898428 bytes 5Size (qttools-everywhere-opensource-src-5.15.11.tar.xz) = 8898428 bytes
6SHA1 (patch-src_assistant_assistant_assistant.pro) = 8d7cb7759d3b20780bc05097d5bd0d8be7d145cc 6SHA1 (patch-src_assistant_assistant_assistant.pro) = 8d7cb7759d3b20780bc05097d5bd0d8be7d145cc
7SHA1 (patch-src_designer_src_plugins_plugins.pro) = c82d154785e19ebfb3e191f08c8e7f9b07458d4a 7SHA1 (patch-src_designer_src_plugins_plugins.pro) = c82d154785e19ebfb3e191f08c8e7f9b07458d4a
 8SHA1 (patch-src_qdoc_configure.json) = 634ae441cc6eb57396261d5d7553afab2c8dad1a
File Added: pkgsrc/x11/qt5-qttools/patches/patch-src_qdoc_configure.json
$NetBSD: patch-src_qdoc_configure.json,v 1.1 2023/12/19 13:01:37 thor Exp $

Add config switch to disable llvm dependency. Seems to be that simple.

--- src/qdoc/configure.json.orig	2021-07-12 16:32:50.358821257 +0000
+++ src/qdoc/configure.json
@@ -1,5 +1,10 @@
 {
     "module": "qdoc",
+    "commandline": {
+        "options": {
+            "qdoc": "boolean"
+        }
+    },
     "tests": {
         "libclang": {
             "label": "libclang",