From owner-svn-ports-head@freebsd.org Sun Nov 10 20:45:19 2019 Return-Path: Delivered-To: svn-ports-head@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 0EA1217B2C2; Sun, 10 Nov 2019 20:45:19 +0000 (UTC) (envelope-from cmt@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) server-signature RSA-PSS (4096 bits) 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 47B5cG6THnz4MJF; Sun, 10 Nov 2019 20:45:18 +0000 (UTC) (envelope-from cmt@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 C1A144AD3; Sun, 10 Nov 2019 20:45:18 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAAKjIBh062765; Sun, 10 Nov 2019 20:45:18 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAAKjIks062763; Sun, 10 Nov 2019 20:45:18 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <201911102045.xAAKjIks062763@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Sun, 10 Nov 2019 20:45:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517224 - head/devel/pyside2 X-SVN-Group: ports-head X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: head/devel/pyside2 X-SVN-Commit-Revision: 517224 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.29 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: Sun, 10 Nov 2019 20:45:19 -0000 Author: cmt Date: Sun Nov 10 20:45:18 2019 New Revision: 517224 URL: https://svnweb.freebsd.org/changeset/ports/517224 Log: 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] Modified: head/devel/pyside2/Makefile head/devel/pyside2/pkg-plist Modified: head/devel/pyside2/Makefile ============================================================================== --- head/devel/pyside2/Makefile Sun Nov 10 19:57:28 2019 (r517223) +++ head/devel/pyside2/Makefile Sun Nov 10 20:45:18 2019 (r517224) @@ -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}" @@ -42,53 +43,5 @@ PLIST_SUB+= PYVERSTR=-${PYTHON_VERSION} 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 Modified: head/devel/pyside2/pkg-plist ============================================================================== --- head/devel/pyside2/pkg-plist Sun Nov 10 19:57:28 2019 (r517223) +++ head/devel/pyside2/pkg-plist Sun Nov 10 20:45:18 2019 (r517224) @@ -22,6 +22,7 @@ include/PySide2/QtPrintSupport/pyside2_qtprintsupport_ 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_comm 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