svn commit: r496581 - head/devel/qtcreator

[Tobias C. Berner]

Author: tcberner
Date: Fri Mar 22 19:18:06 2019
New Revision: 496581
URL: https://svnweb.freebsd.org/changeset/ports/496581

Log:
  devel/qtcreator: make www/qt5-webengine optional
  
  PR:		235093
  Submitted by:	Piotr Kubaj <pkubaj at anongoth.pl>

Modified:
  head/devel/qtcreator/Makefile
  head/devel/qtcreator/pkg-plist

Modified: head/devel/qtcreator/Makefile
==============================================================================
--- head/devel/qtcreator/Makefile	Fri Mar 22 19:04:31 2019	(r496580)
+++ head/devel/qtcreator/Makefile	Fri Mar 22 19:18:06 2019	(r496581)
@@ -23,8 +23,11 @@ USE_GL=		gl
 USE_QT=		buildtools concurrent core declarative designer gui help \
 		linguist location network printsupport qdoc qmake \
 		quickcontrols script script serialport sql svg webchannel \
-		webengine widgets xml xmlpatterns
+		widgets xml xmlpatterns
 
+CXXFLAGS_powerpc=	-maltivec
+CXXFLAGS_powerpc64=	-maltivec
+
 # be paranoid and do not extract qbs (devel/qbs) copy from source tree
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/src/shared/qbs'
 # Set QBS_INSTALL_DIR for QBS plugin build and set config parameter to build
@@ -43,12 +46,19 @@ DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" 
 
 BROKEN_aarch64=		fails to build: invokes x86 asm
 
-OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFINE=		DOCS EXAMPLES QTWEBENGINE
+OPTIONS_SUB=		yes
 DOCS_DESC=		Install the Qt5 api documentation
 DOCS_USE=		QT=doc_run
 EXAMPLES_DESC=		Install the Qt5 example projects
 EXAMPLES_USE=		QT=examples_run
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFAULT=	DOCS EXAMPLES
+OPTIONS_DEFAULT_amd64=	QTWEBENGINE
+OPTIONS_DEFAULT_i386=	QTWEBENGINE
+
+QTWEBENGINE_DESC=	Add dependency on qt5-webengine
+QTWEBENGINE_USE=	qt=webengine
+QTWEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine
 
 ALL_TARGET=		all
 INSTALL_TARGET=		install

Modified: head/devel/qtcreator/pkg-plist
==============================================================================
--- head/devel/qtcreator/pkg-plist	Fri Mar 22 19:04:31 2019	(r496580)
+++ head/devel/qtcreator/pkg-plist	Fri Mar 22 19:18:06 2019	(r496581)
@@ -303,8 +303,8 @@ libexec/qtcreator/sdktool
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-utils-internal-shortstringlayout.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-utils-internal-stringdatalayout-members.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-utils-internal-stringdatalayout.html
-%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-utils-sizedarray-members.html
-%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-utils-sizedarray.html
+%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-utils-sizedarray-members.html
+%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer-utils-sizedarray.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-projectexplorer.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-qmljs-ast-sourcelocation-members.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/debugger-qmljs-ast-sourcelocation.html
@@ -733,8 +733,8 @@ libexec/qtcreator/sdktool
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-link.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-sizedarray-members.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-sizedarray.html
-%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-smallstringview-members.html
-%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-smallstringview.html
+%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-smallstringview-members.html
+%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-smallstringview.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-treemodel-members.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-treemodel.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/projectexplorer-utils-typedtreeitem-members.html
@@ -761,8 +761,8 @@ libexec/qtcreator/sdktool
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-plugindumper.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-propertyinfo-members.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-propertyinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmlerror-members.html
-%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmlerror.html
+%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmlerror-members.html
+%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmlerror.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-ast-sourcelocation-members.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-ast-sourcelocation.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/qmljs-qmljs-converttonumber-members.html
@@ -884,8 +884,8 @@ libexec/qtcreator/sdktool
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-scopedswap.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-sizedarray-members.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-sizedarray.html
-%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-smallstringview-members.html
-%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-smallstringview.html
+%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-smallstringview-members.html
+%%QTWEBENGINE%%%%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-smallstringview.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-treemodel-members.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-treemodel.html
 %%PORTDOCS%%%%DOCSDIR%%/qtcreator-dev/utils-typedtreeitem-members.html