Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Sep 2020 19:14:17 +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: r547563 - head/devel/pyside2
Message-ID:  <202009041914.084JEHgT032254@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Fri Sep  4 19:14:17 2020
New Revision: 547563
URL: https://svnweb.freebsd.org/changeset/ports/547563

Log:
  devel/pyside2: disable webengine on non-x86
  
  Port builds fine without webengine on powerpc64.

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

Modified: head/devel/pyside2/Makefile
==============================================================================
--- head/devel/pyside2/Makefile	Fri Sep  4 18:28:12 2020	(r547562)
+++ head/devel/pyside2/Makefile	Fri Sep  4 19:14:17 2020	(r547563)
@@ -24,7 +24,7 @@ USE_QT=		3d buildtools_build charts concurrent core da
 		designer gamepad gui help location multimedia network opengl \
 		printsupport qmake_build quickcontrols2 remoteobjects serialport \
 		script scripttools scxml sensors speech sql svg testlib uitools \
-		webchannel webengine websockets widgets x11extras xml xmlpatterns
+		webchannel websockets widgets x11extras xml xmlpatterns
 
 CMAKE_ARGS+=	"-DUSE_PYTHON_VERSION=${PYTHON_VER}" \
 		"-DPYTHON_EXECUTABLE=${PYTHON_CMD}"
@@ -35,5 +35,12 @@ PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 
 WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/pyside2
+
+.if ${ARCH} == amd64 || ${ARCH} == i386
+PLIST_SUB+=	WEBENGINE=""
+USE_QT+=	webengine
+.else
+PLIST_SUB+=	WEBENGINE="@comment "
+.endif
 
 .include <bsd.port.post.mk>

Modified: head/devel/pyside2/pkg-plist
==============================================================================
--- head/devel/pyside2/pkg-plist	Fri Sep  4 18:28:12 2020	(r547562)
+++ head/devel/pyside2/pkg-plist	Fri Sep  4 19:14:17 2020	(r547563)
@@ -35,9 +35,9 @@ include/PySide2/QtTest/pyside2_qttest_python.h
 include/PySide2/QtTextToSpeech/pyside2_qttexttospeech_python.h
 include/PySide2/QtUiTools/pyside2_qtuitools_python.h
 include/PySide2/QtWebChannel/pyside2_qtwebchannel_python.h
-include/PySide2/QtWebEngine/pyside2_qtwebengine_python.h
-include/PySide2/QtWebEngineCore/pyside2_qtwebenginecore_python.h
-include/PySide2/QtWebEngineWidgets/pyside2_qtwebenginewidgets_python.h
+%%WEBENGINE%%include/PySide2/QtWebEngine/pyside2_qtwebengine_python.h
+%%WEBENGINE%%include/PySide2/QtWebEngineCore/pyside2_qtwebenginecore_python.h
+%%WEBENGINE%%include/PySide2/QtWebEngineWidgets/pyside2_qtwebenginewidgets_python.h
 include/PySide2/QtWebSockets/pyside2_qtwebsockets_python.h
 include/PySide2/QtWidgets/pyside2_qtwidgets_python.h
 include/PySide2/QtX11Extras/pyside2_qtx11extras_python.h
@@ -99,9 +99,9 @@ lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/PySide2/QtTextToSpeech%%PYVERSTR%%.so
 %%PYTHON_SITELIBDIR%%/PySide2/QtUiTools%%PYVERSTR%%.so
 %%PYTHON_SITELIBDIR%%/PySide2/QtWebChannel%%PYVERSTR%%.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngine%%PYVERSTR%%.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineCore%%PYVERSTR%%.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineWidgets%%PYVERSTR%%.so
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngine%%PYVERSTR%%.so
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineCore%%PYVERSTR%%.so
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineWidgets%%PYVERSTR%%.so
 %%PYTHON_SITELIBDIR%%/PySide2/QtWebSockets%%PYVERSTR%%.so
 %%PYTHON_SITELIBDIR%%/PySide2/QtWidgets%%PYVERSTR%%.so
 %%PYTHON_SITELIBDIR%%/PySide2/QtX11Extras%%PYVERSTR%%.so
@@ -123,7 +123,7 @@ share/PySide2/glue/qtqml.cpp
 share/PySide2/glue/qtquick.cpp
 share/PySide2/glue/qtscript.cpp
 share/PySide2/glue/qtuitools.cpp
-share/PySide2/glue/qtwebenginewidgets.cpp
+%%WEBENGINE%%share/PySide2/glue/qtwebenginewidgets.cpp
 share/PySide2/glue/qtwidgets.cpp
 share/PySide2/glue/qtxml.cpp
 share/PySide2/glue/qtxmlpatterns.cpp
@@ -205,9 +205,9 @@ share/PySide2/typesystems/typesystem_test.xml
 share/PySide2/typesystems/typesystem_texttospeech.xml
 share/PySide2/typesystems/typesystem_uitools.xml
 share/PySide2/typesystems/typesystem_webchannel.xml
-share/PySide2/typesystems/typesystem_webengine.xml
-share/PySide2/typesystems/typesystem_webenginecore.xml
-share/PySide2/typesystems/typesystem_webenginewidgets.xml
+%%WEBENGINE%%share/PySide2/typesystems/typesystem_webengine.xml
+%%WEBENGINE%%share/PySide2/typesystems/typesystem_webenginecore.xml
+%%WEBENGINE%%share/PySide2/typesystems/typesystem_webenginewidgets.xml
 share/PySide2/typesystems/typesystem_websockets.xml
 share/PySide2/typesystems/typesystem_widgets.xml
 share/PySide2/typesystems/typesystem_widgets_common.xml



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