qt6-qtttools: use litehtml from pkgsrc instead of bundled copy

[Niclas Rosenvik <nros%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Tue Oct 5 15:57:50 2021 +0000
Changeset:	47915ad09d2724c428bfbac02c69efc5a2984981

Modified Files:
	qt6-qttools/Makefile
	qt6-qttools/distinfo
Added Files:
	qt6-qttools/patches/patch-src_assistant_CMakeLists.txt

Log Message:
qt6-qtttools: use litehtml from pkgsrc instead of bundled copy

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=47915ad09d2724c428bfbac02c69efc5a2984981

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

diffstat:
 qt6-qttools/Makefile                                   |  2 +-
 qt6-qttools/distinfo                                   |  1 +
 qt6-qttools/patches/patch-src_assistant_CMakeLists.txt | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diffs:
diff --git a/qt6-qttools/Makefile b/qt6-qttools/Makefile
index 74621f5ced..8186aeb234 100644
--- a/qt6-qttools/Makefile
+++ b/qt6-qttools/Makefile
@@ -9,7 +9,7 @@ LICENSE=	gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
 .include "../../wip/qt6-qtbase/Makefile.common"
 
 .include "../../lang/clang/buildlink3.mk"
-#.include "../../wip/litehtml/buildlink3.mk"
+.include "../../wip/litehtml/buildlink3.mk"
 .include "../../wip/qt6-qtbase/buildlink3.mk"
 .include "../../wip/qt6-qtdeclarative/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qttools/distinfo b/qt6-qttools/distinfo
index 87ebecb0bf..e60559f08a 100644
--- a/qt6-qttools/distinfo
+++ b/qt6-qttools/distinfo
@@ -4,4 +4,5 @@ SHA1 (qttools-everywhere-src-6.2.0.tar.xz) = 16181adfb9b34c3e1a562e075466df98c36
 RMD160 (qttools-everywhere-src-6.2.0.tar.xz) = 12c85ab68564322f354b419bf0616cee76990806
 SHA512 (qttools-everywhere-src-6.2.0.tar.xz) = 93998976db391ddd955ebd0fc368826b2419966c1369e466ec91aba27057063770e88e6fb6df22b8d4ca52b7789dea5e709e2c863411c177fbc044ae566b24c6
 Size (qttools-everywhere-src-6.2.0.tar.xz) = 8665784 bytes
+SHA1 (patch-src_assistant_CMakeLists.txt) = 41e1a4eb77337f52f2b6b37a01d3217c83a29bc8
 SHA1 (patch-src_linguist_lupdate_CMakeLists.txt) = d70ea348c3ba7f64bcc245de9445becefecf3a9c
diff --git a/qt6-qttools/patches/patch-src_assistant_CMakeLists.txt b/qt6-qttools/patches/patch-src_assistant_CMakeLists.txt
new file mode 100644
index 0000000000..15c186e460
--- /dev/null
+++ b/qt6-qttools/patches/patch-src_assistant_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+* fix so that external litehtml can be used
+
+--- src/assistant/CMakeLists.txt.orig	2021-10-05 15:16:58.762053733 +0000
++++ src/assistant/CMakeLists.txt
+@@ -31,10 +31,7 @@ endif()
+ add_subdirectory(qlitehtml/src EXCLUDE_FROM_ALL)
+ if(TARGET qlitehtml)
+     qt_autogen_tools_initial_setup(qlitehtml)
+-    qt_internal_set_exceptions_flags(litehtml OFF)
+-    qt_disable_warnings(litehtml)
+     qt_disable_warnings(qlitehtml)
+-    qt_disable_warnings(gumbo)
+     qt_handle_multi_config_output_dirs(qlitehtml)
+     set_target_properties(qlitehtml PROPERTIES
+         RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"