qt5-qttools: restore patches to not accidentally detect qtwebkit

[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 Dec 19 20:09:40 2017 +1300
Changeset:	b3eade0d3ba763a7e34b761d37c827a55ae02e17

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: restore patches to not accidentally detect qtwebkit

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

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 346825d38e..5d44cd9198 100644
--- a/qt5-qttools/distinfo
+++ b/qt5-qttools/distinfo
@@ -4,3 +4,5 @@ SHA1 (qttools-everywhere-src-5.10.0.tar.xz) = 0225b74589ca577260d4b4282e7ed15d0e
 RMD160 (qttools-everywhere-src-5.10.0.tar.xz) = 3becf8ae2a7e27255a8043fa3768d1f2c6b698e2
 SHA512 (qttools-everywhere-src-5.10.0.tar.xz) = 3a4a540d5e070bf46bcb922912bf9ec556761526104970bc76b84898de26de20dd836f02e9c5c58e73f6d12156555c6984716d54fe19361c1b6f247ee162ca06
 Size (qttools-everywhere-src-5.10.0.tar.xz) = 9822240 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