From 1d90cf651c1f93e1638c9ab5cae3ed01e3b4be45 Mon Sep 17 00:00:00 2001 From: Christoph Moench-Tegeder Date: Sun, 10 Nov 2019 20:45:18 +0000 Subject: [PATCH] devel/pyside2: add more qt5 dependencies Qt5RemoteObjects is an "optional" module for pyside2 - it will be picked up automatically when qt5-remoteobjects is found during pyside2's build. Add it to enable the full functionality of pyside2, and to avoid staging errors in unclean environments. [1] The Qt53DExtras module may pull in qt5-gamepad (another contaminated- build-issue is suspected), depend on qt5-gamepad to avoid breakage in case this had happened with qt53DExtras. [1] While here, remove some now-obsolete staging area cleanup, the files are not installed anymore by the port. [2] PR: 241855 Reported by: rhurlin@gwdg.de [1] --- devel/pyside2/Makefile | 57 ++++------------------------------------- devel/pyside2/pkg-plist | 4 +++ 2 files changed, 9 insertions(+), 52 deletions(-) diff --git a/devel/pyside2/Makefile b/devel/pyside2/Makefile index 0e1bc43a70af..7820f5a980e9 100644 --- a/devel/pyside2/Makefile +++ b/devel/pyside2/Makefile @@ -2,6 +2,7 @@ PORTNAME= pyside2 DISTVERSION= 5.13.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,10 +22,10 @@ USE_GL= gl USE_LDCONFIG= yes USE_PYTHON= flavors USE_QT= 3d buildtools_build charts core datavis3d declarative \ - designer gui help location multimedia network opengl \ - printsupport qmake_build script scripttools scxml sensors \ - speech sql svg testlib uitools webchannel webengine \ - websockets widgets x11extras xml xmlpatterns + designer gamepad gui help location multimedia network opengl \ + printsupport qmake_build remoteobjects script scripttools \ + scxml sensors speech sql svg testlib uitools webchannel \ + webengine websockets widgets x11extras xml xmlpatterns CMAKE_ARGS+= "-DUSE_PYTHON_VERSION=${PYTHON_VER}" \ "-DPYTHON_EXECUTABLE=${PYTHON_CMD}" @@ -43,52 +44,4 @@ PLIST_SUB+= DISTVERSION=${DISTVERSION} WRKSRC= ${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION}/sources/pyside2 -post-stage: - @${RM} -r ${STAGEDIR}/${PYTHON_SITELIBDIR}/CMakeFiles \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/tests \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/CMakeFiles \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/Qt3DAnimation \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/Qt3DCore \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/Qt3DExtras \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/Qt3DInput \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/Qt3DLogic \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/Qt3DRender \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtCharts \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtConcurrent \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtCore \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtDataVisualization \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtGui \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtHelp \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtLocation \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtMultimedia \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtMultimediaWidgets \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtNetwork \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtOpenGL \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtPositioning \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtPrintSupport \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtQml \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtQuick \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtQuickWidgets \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtScript \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtScriptTools \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtScxml \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtSensors \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtSql \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtSvg \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtTest \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtTextToSpeech \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtUiTools \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtWebChannel \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtWebEngine \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtWebEngineCore \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtWebEngineWidgets \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtWebSockets \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtWidgets \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtX11Extras \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtXml \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/QtXmlPatterns \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/PySide2/support \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/libpyside \ - ${STAGEDIR}/${PYTHON_SITELIBDIR}/plugins - .include diff --git a/devel/pyside2/pkg-plist b/devel/pyside2/pkg-plist index 515c6ba3d71e..52af872a0026 100644 --- a/devel/pyside2/pkg-plist +++ b/devel/pyside2/pkg-plist @@ -22,6 +22,7 @@ include/PySide2/QtPrintSupport/pyside2_qtprintsupport_python.h include/PySide2/QtQml/pyside2_qtqml_python.h include/PySide2/QtQuick/pyside2_qtquick_python.h include/PySide2/QtQuickWidgets/pyside2_qtquickwidgets_python.h +include/PySide2/QtRemoteObjects/pyside2_qtremoteobjects_python.h include/PySide2/QtScript/pyside2_qtscript_python.h include/PySide2/QtScriptTools/pyside2_qtscripttools_python.h include/PySide2/QtScxml/pyside2_qtscxml_python.h @@ -83,6 +84,7 @@ lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%% %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQml.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuick.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuickWidgets.so +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtRemoteObjects.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtScript.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtScriptTools.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtScxml.so @@ -124,6 +126,7 @@ lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%% %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtQml%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuick%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuickWidgets%%PYVERSTR%%.so +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtRemoteObjects%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtScript%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtScriptTools%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtScxml%%PYVERSTR%%.so @@ -226,6 +229,7 @@ share/PySide2/typesystems/typesystem_printsupport_common.xml share/PySide2/typesystems/typesystem_qml.xml share/PySide2/typesystems/typesystem_quick.xml share/PySide2/typesystems/typesystem_quickwidgets.xml +share/PySide2/typesystems/typesystem_remoteobjects.xml share/PySide2/typesystems/typesystem_script.xml share/PySide2/typesystems/typesystem_scripttools.xml share/PySide2/typesystems/typesystem_scxml.xml