qt5-qttools: Don't build webkit dependent parts even if webkit detected.

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Tue Aug 8 09:09:27 2017 +1200
Changeset:	94c0d437b3797cb121c8662d58b14a6ba9020d63

Modified Files:
	qt5-qttools/distinfo
Added Files:
	qt5-qttools/patches/patch-src_assistant_assistant_assistant.pro
	qt5-qttools/patches/patch-src_designer_src_plugins_plugins.pro

Log Message:
qt5-qttools: Don't build webkit dependent parts even if webkit detected.

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

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

diffstat:
 qt5-qttools/distinfo                                  |  2 ++
 .../patch-src_assistant_assistant_assistant.pro       | 19 +++++++++++++++++++
 .../patch-src_designer_src_plugins_plugins.pro        | 14 ++++++++++++++
 3 files changed, 35 insertions(+)

diffs:
diff --git a/qt5-qttools/distinfo b/qt5-qttools/distinfo
index f98b629d72..710df82d7d 100644
--- a/qt5-qttools/distinfo
+++ b/qt5-qttools/distinfo
@@ -4,3 +4,5 @@ SHA1 (qttools-opensource-src-5.9.1.tar.xz) = 56b9206e47b21614e8be6c96d033a7afbd2
 RMD160 (qttools-opensource-src-5.9.1.tar.xz) = ca550fa94039268c717df1b6ca4f61f7fb8c715b
 SHA512 (qttools-opensource-src-5.9.1.tar.xz) = 689d0d19b56c333862dc3270b72e83ad640c0b6462c37b13c5ad522338d2d7e105c88d47f506243b5fcf4d5813b63ce559049977e8d2c3e4fd1d7c5be9cd0a3f
 Size (qttools-opensource-src-5.9.1.tar.xz) = 9740532 bytes
+SHA1 (patch-src_assistant_assistant_assistant.pro) = 924ccf851fe96f6838bbfe906793839b8a869ac4
+SHA1 (patch-src_designer_src_plugins_plugins.pro) = c82d154785e19ebfb3e191f08c8e7f9b07458d4a
diff --git a/qt5-qttools/patches/patch-src_assistant_assistant_assistant.pro b/qt5-qttools/patches/patch-src_assistant_assistant_assistant.pro
new file mode 100644
index 0000000000..09f66071a2
--- /dev/null
+++ b/qt5-qttools/patches/patch-src_assistant_assistant_assistant.pro
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Don't build webkit dependent parts even if webkit detected.
+
+--- src/assistant/assistant/assistant.pro.orig	2017-06-23 12:03:39.000000000 +0000
++++ src/assistant/assistant/assistant.pro
+@@ -1,8 +1,8 @@
+-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
+-    BROWSER = qtwebkit
+-} else {
++#qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
++#    BROWSER = qtwebkit
++#} else {
+     BROWSER = qtextbrowser
+-}
++#}
+ 
+ QT += widgets network help sql help
+ qtHaveModule(printsupport): QT += printsupport
diff --git a/qt5-qttools/patches/patch-src_designer_src_plugins_plugins.pro b/qt5-qttools/patches/patch-src_designer_src_plugins_plugins.pro
new file mode 100644
index 0000000000..e76be4d7a3
--- /dev/null
+++ b/qt5-qttools/patches/patch-src_designer_src_plugins_plugins.pro
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Don't build webkit dependent parts even if webkit detected.
+
+--- src/designer/src/plugins/plugins.pro.orig	2017-06-23 12:03:39.000000000 +0000
++++ src/designer/src/plugins/plugins.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE = subdirs
+ 
+ # qtHaveModule(opengl): SUBDIRS += tools/view3d
+-qtHaveModule(webkitwidgets): SUBDIRS += qwebview
++#qtHaveModule(webkitwidgets): SUBDIRS += qwebview
+ win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
+ qtHaveModule(quickwidgets): SUBDIRS += qquickwidget