CVS commit: pkgsrc/x11/qt5-qttools

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Tue Dec 19 13:01:37 UTC 2023

Modified Files:
        pkgsrc/x11/qt5-qttools: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qttools/patches: patch-src_qdoc_configure.json

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/x11/qt5-qttools/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/qt5-qttools/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qttools/patches/patch-src_qdoc_configure.json

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qttools/Makefile
diff -u pkgsrc/x11/qt5-qttools/Makefile:1.95 pkgsrc/x11/qt5-qttools/Makefile:1.96
--- pkgsrc/x11/qt5-qttools/Makefile:1.95        Sun Nov 12 13:24:26 2023
+++ pkgsrc/x11/qt5-qttools/Makefile     Tue Dec 19 13:01:37 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2023/11/12 13:24:26 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2023/12/19 13:01:37 thor Exp $
 
 DISTNAME=      qttools-everywhere-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qttools-${QTVERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Qt5 tools
 
 DEPENDS+=              xdg-utils-[0-9]*:../../misc/xdg-utils
@@ -18,10 +18,14 @@ PLIST_VARS+=                llvm
 
 .include "../../mk/bsd.options.mk"
 
+QMAKE_ARGS+= --
 .if !empty(PKG_OPTIONS:Mllvm)
 PLIST.llvm=            yes
 MAKE_ENV+=             LLVM_INSTALL_DIR=${BUILDLINK_PREFIX.clang}
 .include "../../lang/clang/buildlink3.mk"
+QMAKE_ARGS+=   -qdoc
+.else
+QMAKE_ARGS+=   -no-qdoc
 .endif
 
 .include "../../x11/qt5-qtbase/Makefile.common"

Index: pkgsrc/x11/qt5-qttools/distinfo
diff -u pkgsrc/x11/qt5-qttools/distinfo:1.31 pkgsrc/x11/qt5-qttools/distinfo:1.32
--- pkgsrc/x11/qt5-qttools/distinfo:1.31        Sat Oct  7 20:00:35 2023
+++ pkgsrc/x11/qt5-qttools/distinfo     Tue Dec 19 13:01:37 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.31 2023/10/07 20:00:35 adam Exp $
+$NetBSD: distinfo,v 1.32 2023/12/19 13:01:37 thor Exp $
 
 BLAKE2s (qttools-everywhere-opensource-src-5.15.11.tar.xz) = d43dfd615013c6990c58e6af592a866df5c75b833a0caee32a45961487d0da35
 SHA512 (qttools-everywhere-opensource-src-5.15.11.tar.xz) = 7aa66964dfc4bd144ee828a5c278b3127c5b269c6fb0e5363e7d2377ba19165e04719636659cb30fee471de26740d3d8692068459e1764d9f84a7737f24c4884
 Size (qttools-everywhere-opensource-src-5.15.11.tar.xz) = 8898428 bytes
 SHA1 (patch-src_assistant_assistant_assistant.pro) = 8d7cb7759d3b20780bc05097d5bd0d8be7d145cc
 SHA1 (patch-src_designer_src_plugins_plugins.pro) = c82d154785e19ebfb3e191f08c8e7f9b07458d4a
+SHA1 (patch-src_qdoc_configure.json) = 634ae441cc6eb57396261d5d7553afab2c8dad1a

Added files:

Index: pkgsrc/x11/qt5-qttools/patches/patch-src_qdoc_configure.json
diff -u /dev/null pkgsrc/x11/qt5-qttools/patches/patch-src_qdoc_configure.json:1.1
--- /dev/null   Tue Dec 19 13:01:37 2023
+++ pkgsrc/x11/qt5-qttools/patches/patch-src_qdoc_configure.json        Tue Dec 19 13:01:37 2023
@@ -0,0 +1,17 @@
+$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",