Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Sep 2020 15:25:01 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r547545 - head/www/qt5-webview
Message-ID:  <202009041525.084FP1p6089735@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == amd64 || ${ARCH} == i386
+PLIST_SUB+=	WEBENGINE=""
+USE_QT+=	webengine
+.else
+PLIST_SUB+=	WEBENGINE="@comment "
+.endif
+
+.include <bsd.port.post.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009041525.084FP1p6089735>