From owner-svn-ports-all@freebsd.org Fri Sep 4 15:25:02 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 878813C5C94; Fri, 4 Sep 2020 15:25:02 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjhLk2m4Kz4C9X; Fri, 4 Sep 2020 15:25:02 +0000 (UTC) (envelope-from pkubaj@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42773EAD6; Fri, 4 Sep 2020 15:25:02 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084FP2fO089736; Fri, 4 Sep 2020 15:25:02 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084FP1p6089735; Fri, 4 Sep 2020 15:25:01 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202009041525.084FP1p6089735@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 4 Sep 2020 15:25:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547545 - head/www/qt5-webview X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/www/qt5-webview X-SVN-Commit-Revision: 547545 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 15:25:02 -0000 Author: pkubaj Date: Fri Sep 4 15:25:01 2020 New Revision: 547545 URL: https://svnweb.freebsd.org/changeset/ports/547545 Log: www/qt5-webview: fix build on non-x86 Drop webengine, it's not available there. Modified: head/www/qt5-webview/Makefile head/www/qt5-webview/pkg-plist Modified: head/www/qt5-webview/Makefile ============================================================================== --- head/www/qt5-webview/Makefile Fri Sep 4 14:49:18 2020 (r547544) +++ head/www/qt5-webview/Makefile Fri Sep 4 15:25:01 2020 (r547545) @@ -10,8 +10,17 @@ COMMENT= Qt component for displaying web content USES= compiler:c++11-lang gl qmake:norecursive qt-dist:5 USE_GL= gl -USE_QT= core declarative gui location network webchannel webengine \ +USE_QT= core declarative gui location network webchannel \ buildtools_build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -.include +.include + +.if ${ARCH} == amd64 || ${ARCH} == i386 +PLIST_SUB+= WEBENGINE="" +USE_QT+= webengine +.else +PLIST_SUB+= WEBENGINE="@comment " +.endif + +.include Modified: head/www/qt5-webview/pkg-plist ============================================================================== --- head/www/qt5-webview/pkg-plist Fri Sep 4 14:49:18 2020 (r547544) +++ head/www/qt5-webview/pkg-plist Fri Sep 4 15:25:01 2020 (r547545) @@ -16,7 +16,7 @@ %%QT_INCDIR%%/QtWebView/qwebview_global.h %%QT_CMAKEDIR%%/Qt5WebView/Qt5WebViewConfig.cmake %%QT_CMAKEDIR%%/Qt5WebView/Qt5WebViewConfigVersion.cmake -%%QT_CMAKEDIR%%/Qt5WebView/Qt5WebView_QWebEngineWebViewPlugin.cmake +%%WEBENGINE%%%%QT_CMAKEDIR%%/Qt5WebView/Qt5WebView_QWebEngineWebViewPlugin.cmake %%QT_LIBDIR%%/libQt5WebView.prl %%QT_LIBDIR%%/libQt5WebView.so %%QT_LIBDIR%%/libQt5WebView.so.5 @@ -25,7 +25,7 @@ %%DEBUG%%%%QT_LIBDIR%%/libQt5WebView.so.%%FULLVER%%.debug %%QT_MKSPECDIR%%/modules/qt_lib_webview.pri %%QT_MKSPECDIR%%/modules/qt_lib_webview_private.pri -%%QT_PLUGINDIR%%/webview/libqtwebview_webengine.so +%%WEBENGINE%%%%QT_PLUGINDIR%%/webview/libqtwebview_webengine.so %%DEBUG%%%%QT_PLUGINDIR%%/webview/libqtwebview_webengine.so.debug %%QT_QMLDIR%%/QtWebView/libdeclarative_webview.so %%DEBUG%%%%QT_QMLDIR%%/QtWebView/libdeclarative_webview.so.debug