From owner-svn-ports-head@freebsd.org Fri Dec 29 22:13:00 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9198AEB3153; Fri, 29 Dec 2017 22:13:00 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6955A7DF74; Fri, 29 Dec 2017 22:13:00 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBTMCxd9052245; Fri, 29 Dec 2017 22:12:59 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBTMCxaU052242; Fri, 29 Dec 2017 22:12:59 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201712292212.vBTMCxaU052242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 29 Dec 2017 22:12:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457546 - in head/devel/qt5-designer: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/devel/qt5-designer: . files X-SVN-Commit-Revision: 457546 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Dec 2017 22:13:00 -0000 Author: tcberner Date: Fri Dec 29 22:12:59 2017 New Revision: 457546 URL: https://svnweb.freebsd.org/changeset/ports/457546 Log: Make webkit optional in qt5-designer This shrinks the dependencies of qtcreator and Co down to only one WebView engine. If the QtWebKit-based WebView widget is needed, toggle WEBKIT on. Reviewed by: rakuco Differential Revision: https://reviews.freebsd.org/D13641 Added: head/devel/qt5-designer/files/patch-src_designer_src_plugins_plugins.pro (contents, props changed) Modified: head/devel/qt5-designer/Makefile head/devel/qt5-designer/pkg-plist Modified: head/devel/qt5-designer/Makefile ============================================================================== --- head/devel/qt5-designer/Makefile Fri Dec 29 22:07:45 2017 (r457545) +++ head/devel/qt5-designer/Makefile Fri Dec 29 22:12:59 2017 (r457546) @@ -2,6 +2,7 @@ PORTNAME= designer DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -9,7 +10,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical user interface designer USE_QT5= assistant_run core gui network printsupport quick uiplugin \ - webkit widgets xml buildtools_build + widgets xml buildtools_build QT_DIST= tools USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} @@ -21,6 +22,12 @@ DESKTOP_ENTRIES="Qt 5 Designer" "" \ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} + +OPTIONS_DEFINE= WEBKIT +OPTIONS_SUB= yes +WEBKIT_DESC= Build WebKit-based WebView widget +WEBKIT_QMAKE_ON= CONFIG+=use_webkit +WEBKIT_USE= QT5=webkit post-patch: # uiplugin is built in x11-toolkits/qt5-uiplugin. Added: head/devel/qt5-designer/files/patch-src_designer_src_plugins_plugins.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-designer/files/patch-src_designer_src_plugins_plugins.pro Fri Dec 29 22:12:59 2017 (r457546) @@ -0,0 +1,16 @@ +Make QtWebKit an optional dependency of devel/qt5-designer. +Otherwise ports like devel/qtcreator will depend on both +qt5-webengine (directly) and qt5-webkit (via designer). + +--- src/designer/src/plugins/plugins.pro.orig 2016-11-03 08:31:16 UTC ++++ src/designer/src/plugins/plugins.pro +@@ -1,6 +1,8 @@ + TEMPLATE = subdirs + + # qtHaveModule(opengl): SUBDIRS += tools/view3d +-qtHaveModule(webkitwidgets): SUBDIRS += qwebview ++use_webkit { ++ qtHaveModule(webkitwidgets): SUBDIRS += qwebview ++} + win32: qtHaveModule(axcontainer): SUBDIRS += activeqt + qtHaveModule(quickwidgets): SUBDIRS += qquickwidget Modified: head/devel/qt5-designer/pkg-plist ============================================================================== --- head/devel/qt5-designer/pkg-plist Fri Dec 29 22:07:45 2017 (r457545) +++ head/devel/qt5-designer/pkg-plist Fri Dec 29 22:12:59 2017 (r457546) @@ -177,7 +177,7 @@ %%QT_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfig.cmake %%QT_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake -%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake +%%WEBKIT%%%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake %%QT_BINDIR%%/designer %%QT_LIBDIR%%/libQt5Designer.prl %%QT_LIBDIR%%/libQt5Designer.so @@ -196,7 +196,7 @@ %%QT_MKSPECDIR%%/modules/qt_lib_designercomponents_private.pri %%QT_PLUGINDIR%%/designer/libqquickwidget.so %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqquickwidget.so.debug -%%QT_PLUGINDIR%%/designer/libqwebview.so -%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug +%%WEBKIT%%%%QT_PLUGINDIR%%/designer/libqwebview.so +%%WEBKIT%%%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug libdata/pkgconfig/Qt5Designer.pc share/pixmaps/designer-qt5.png