Index: head/cad/freecad/Makefile =================================================================== --- head/cad/freecad/Makefile (revision 513598) +++ head/cad/freecad/Makefile (revision 513599) @@ -1,92 +1,92 @@ # $FreeBSD$ PORTNAME= FreeCAD DISTVERSION= 0.18.3 -PORTREVISION= 2 +PORTREVISION= 3 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e CATEGORIES= cad MAINTAINER= cmt@FreeBSD.org COMMENT= General purpose 3D CAD modeller LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyside2-tools>0:devel/pyside2-tools@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \ swig3.0:devel/swig30 LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ ${PY_BOOST} \ libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR} \ libCoin.so:graphics/Coin \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libvtkFiltersTexture-6.2.so:math/vtk6 \ libTKernel.so:cad/opencascade \ libxerces-c.so:textproc/xerces-c3 \ libboost_thread.so:devel/boost-libs \ libarea.so:devel/libarea \ libmed.so:french/med \ libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \ libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pivy-devel>0:graphics/py-pivy-devel@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} USES= dos2unix compiler:c++11-lib cmake gl eigen:3 fortran jpeg \ localbase:ldflags pkgconfig python:3.6 localbase qt:5 USE_GITHUB= yes USE_XORG= ice sm x11 xext xt USE_GL= gl glu USE_QT= buildtools qmake_build core gui network opengl svg xml webkit widgets printsupport concurrent USE_LDCONFIG= yes DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL # To be removed when french/med will be built against science/hdf5 LIB_DEPENDS+= libhdf5-18.so:science/hdf5-18 CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DHDF5_FOUND="TRUE" -DHDF5_VERSION="1.8.17" \ -DHDF5_INCLUDE_DIRS="${LOCALBASE}/include/hdf5-18" \ -DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include/hdf5-18" \ -DCMAKE_C_FLAGS="-I${LOCALBASE}/include/hdf5-18" \ -DHDF5_LIBRARIES="-lhdf5-18" -DBUILD_QT5="ON" \ -DPYTHON_LIBRARY="${PYTHONBASE}/lib/libpython${PYTHON_VER}${PYTHON_ABIVER}.so" \ -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \ -DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \ -DPYTHON_EXECUTABLE="${PYTHON_CMD}" \ -DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" CFLAGS+= -I${LOCALBASE}/include/hdf5-18 CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} OPTIONS_DEFINE= COLLADA COLLADA_DESC= Install pycollada for Collada files import COLLADA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR} DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \ ${PORTNAME} "Graphics;Engineering;" false post-patch: @${REINPLACE_CMD} -e '/sed/s,-i,& \\"\\",' \ ${WRKSRC}/cMake/FindPySide*Tools.cmake @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \ ${WRKSRC}/src/Gui/CMakeLists.txt @${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \ ${WRKSRC}/src/Tools/SubWCRev.py pre-configure: # To be removed when french/med will be built against science/hdf5 @${REINPLACE_CMD} -e 's|find_package(HDF5 REQUIRED)|#find_package(HDF5 REQUIRED)|' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/src/3rdParty/salomesmesh/inc/MED_Common.hxx post-install: ${LN} -s ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD ${LN} -s ../${PORTNAME}/bin/FreeCADCmd ${STAGEDIR}${LOCALBASE}/bin/FreeCADCmd .include Index: head/devel/pyside2/Makefile =================================================================== --- head/devel/pyside2/Makefile (revision 513598) +++ head/devel/pyside2/Makefile (revision 513599) @@ -1,94 +1,94 @@ # $FreeBSD$ PORTNAME= pyside2 -DISTVERSION= 5.12.3 +DISTVERSION= 5.13.1 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} MAINTAINER= cmt@FreeBSD.org COMMENT= Python Qt bindings for Qt 5.12+ LICENSE= LGPL3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ git>0:devel/git LIB_DEPENDS= # more later USES= cmake gl python qt:5 tar:xz 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 CMAKE_ARGS+= "-DUSE_PYTHON_VERSION=${PYTHON_VER}" \ "-DPYTHON_EXECUTABLE=${PYTHON_CMD}" .include .if ${PYTHON_MAJOR_VER} >= 3 LIB_DEPENDS+= libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} PLIST_SUB+= PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER} .else LIB_DEPENDS+= libshiboken2-${PYTHON_VERSION}.so:devel/shiboken2@${PY_FLAVOR} PLIST_SUB+= PYVERSTR=-${PYTHON_VERSION} .endif PLIST_SUB+= DISTVERSION=${DISTVERSION} WRKSRC= ${WRKDIR}/pyside-setup-everywhere-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 Index: head/devel/pyside2/distinfo =================================================================== --- head/devel/pyside2/distinfo (revision 513598) +++ head/devel/pyside2/distinfo (revision 513599) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557616428 -SHA256 (pyside-setup-everywhere-src-5.12.3.tar.xz) = 4f7aab7d4bbaf1b3573cc989d704e87b0de55cce656ae5e23418a88baa4c6842 -SIZE (pyside-setup-everywhere-src-5.12.3.tar.xz) = 5474384 +TIMESTAMP = 1570005501 +SHA256 (pyside-setup-everywhere-src-5.13.1.tar.xz) = c57c71ddece90b29d0934cf5fac1e1634719484637b56dcbe49eb277c1c01536 +SIZE (pyside-setup-everywhere-src-5.13.1.tar.xz) = 2936204 Index: head/devel/pyside2/pkg-plist =================================================================== --- head/devel/pyside2/pkg-plist (revision 513598) +++ head/devel/pyside2/pkg-plist (revision 513599) @@ -1,226 +1,253 @@ include/PySide2/Qt3DAnimation/pyside2_qt3danimation_python.h include/PySide2/Qt3DCore/pyside2_qt3dcore_python.h include/PySide2/Qt3DExtras/pyside2_qt3dextras_python.h include/PySide2/Qt3DInput/pyside2_qt3dinput_python.h include/PySide2/Qt3DLogic/pyside2_qt3dlogic_python.h include/PySide2/Qt3DRender/pyside2_qt3drender_python.h include/PySide2/QtCharts/pyside2_qtcharts_python.h include/PySide2/QtConcurrent/pyside2_qtconcurrent_python.h include/PySide2/QtCore/pyside2_qtcore_python.h include/PySide2/QtDataVisualization/pyside2_qtdatavisualization_python.h include/PySide2/QtGui/pyside2_qtgui_python.h include/PySide2/QtGui/qpytextobject.h include/PySide2/QtHelp/pyside2_qthelp_python.h include/PySide2/QtLocation/pyside2_qtlocation_python.h include/PySide2/QtMultimedia/pyside2_qtmultimedia_python.h include/PySide2/QtMultimediaWidgets/pyside2_qtmultimediawidgets_python.h include/PySide2/QtNetwork/pyside2_qtnetwork_python.h include/PySide2/QtOpenGL/pyside2_qtopengl_python.h +include/PySide2/QtOpenGLFunctions/pyside2_qtopenglfunctions_python.h include/PySide2/QtPositioning/pyside2_qtpositioning_python.h 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/QtScript/pyside2_qtscript_python.h include/PySide2/QtScriptTools/pyside2_qtscripttools_python.h include/PySide2/QtScxml/pyside2_qtscxml_python.h include/PySide2/QtSensors/pyside2_qtsensors_python.h include/PySide2/QtSql/pyside2_qtsql_python.h include/PySide2/QtSvg/pyside2_qtsvg_python.h 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 include/PySide2/QtWebSockets/pyside2_qtwebsockets_python.h include/PySide2/QtWidgets/pyside2_qtwidgets_python.h include/PySide2/QtX11Extras/pyside2_qtx11extras_python.h include/PySide2/QtXml/pyside2_qtxml_python.h include/PySide2/QtXmlPatterns/pyside2_qtxmlpatterns_python.h include/PySide2/destroylistener.h include/PySide2/dynamicqmetaobject.h include/PySide2/pyside.h include/PySide2/pyside2_global.h include/PySide2/pysideclassinfo.h include/PySide2/pysidemacros.h include/PySide2/pysidemetafunction.h include/PySide2/pysideproperty.h include/PySide2/pysideqflags.h include/PySide2/pysidesignal.h include/PySide2/pysideweakref.h include/PySide2/signalmanager.h lib/cmake/PySide2-%%DISTVERSION%%/PySide2Config%%PYVERSTR%%.cmake lib/cmake/PySide2-%%DISTVERSION%%/PySide2Config.cmake lib/cmake/PySide2-%%DISTVERSION%%/PySide2ConfigVersion.cmake lib/cmake/PySide2-%%DISTVERSION%%/PySide2Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/PySide2-%%DISTVERSION%%/PySide2Targets.cmake lib/libpyside2%%PYVERSTR%%.so -lib/libpyside2%%PYVERSTR%%.so.5.12 +lib/libpyside2%%PYVERSTR%%.so.5.13 lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%% %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DAnimation.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DCore.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DExtras.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DInput.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DLogic.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DRender.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtCharts.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtConcurrent.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtCore.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtDataVisualization.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtGui.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtHelp.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtLocation.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimedia.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimediaWidgets.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtNetwork.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGL.so +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGLFunctions.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtPositioning.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtPrintSupport.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQml.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuick.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuickWidgets.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtScript.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtScriptTools.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtScxml.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtSensors.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtSql.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtSvg.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtTest.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtTextToSpeech.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtUiTools.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebChannel.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngine.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineCore.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineWidgets.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebSockets.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWidgets.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtX11Extras.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtXml.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtXmlPatterns.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DAnimation%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DCore%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DExtras%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DInput%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DLogic%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DRender%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtCharts%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtConcurrent%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtCore%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtDataVisualization%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtGui%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtHelp%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtLocation%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimedia%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimediaWidgets%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtNetwork%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGL%%PYVERSTR%%.so +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGLFunctions%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtPositioning%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtPrintSupport%%PYVERSTR%%.so %%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/QtScript%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtScriptTools%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtScxml%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtSensors%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtSql%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtSvg%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtTest%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtTextToSpeech%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtUiTools%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebChannel%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngine%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineCore%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineWidgets%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebSockets%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWidgets%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtX11Extras%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtXml%%PYVERSTR%%.so %%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtXmlPatterns%%PYVERSTR%%.so %%PYTHON_SITELIBDIR%%/PySide2/__init__.py %%PYTHON_SITELIBDIR%%/PySide2/_config.py %%PYTHON_SITELIBDIR%%/PySide2/_git_pyside_version.py libdata/pkgconfig/pyside2.pc share/PySide2/glue/qtcharts.cpp share/PySide2/glue/qtcore.cpp share/PySide2/glue/qtdatavisualization.cpp share/PySide2/glue/qtgui.cpp share/PySide2/glue/qtmultimedia.cpp share/PySide2/glue/qtnetwork.cpp share/PySide2/glue/qtopengl.cpp share/PySide2/glue/qtprintsupport.cpp share/PySide2/glue/qtqml.cpp share/PySide2/glue/qtquick.cpp share/PySide2/glue/qtscript.cpp share/PySide2/glue/qtuitools.cpp share/PySide2/glue/qtwidgets.cpp share/PySide2/glue/qtxml.cpp share/PySide2/glue/qtxmlpatterns.cpp share/PySide2/typesystems/core_common.xml share/PySide2/typesystems/datavisualization_common.xml share/PySide2/typesystems/glue/plugins.h share/PySide2/typesystems/glue/qeasingcurve_glue.cpp share/PySide2/typesystems/glue/qeasingcurve_glue.h share/PySide2/typesystems/glue/qscript_value_iterator_glue.cpp share/PySide2/typesystems/gui_common.xml share/PySide2/typesystems/opengl_common.xml +share/PySide2/typesystems/openglfunctions_common.xml share/PySide2/typesystems/typesystem_3danimation.xml share/PySide2/typesystems/typesystem_3dcore.xml share/PySide2/typesystems/typesystem_3dextras.xml share/PySide2/typesystems/typesystem_3dinput.xml share/PySide2/typesystems/typesystem_3dlogic.xml share/PySide2/typesystems/typesystem_3drender.xml share/PySide2/typesystems/typesystem_charts.xml share/PySide2/typesystems/typesystem_concurrent.xml share/PySide2/typesystems/typesystem_core.xml share/PySide2/typesystems/typesystem_core_common.xml share/PySide2/typesystems/typesystem_core_mac.xml share/PySide2/typesystems/typesystem_core_win.xml share/PySide2/typesystems/typesystem_core_x11.xml share/PySide2/typesystems/typesystem_datavisualization.xml share/PySide2/typesystems/typesystem_gui.xml share/PySide2/typesystems/typesystem_gui_common.xml share/PySide2/typesystems/typesystem_gui_mac.xml share/PySide2/typesystems/typesystem_gui_win.xml share/PySide2/typesystems/typesystem_gui_x11.xml share/PySide2/typesystems/typesystem_help.xml share/PySide2/typesystems/typesystem_location.xml share/PySide2/typesystems/typesystem_multimedia.xml share/PySide2/typesystems/typesystem_multimedia_common.xml share/PySide2/typesystems/typesystem_multimedia_forward_declarations.xml share/PySide2/typesystems/typesystem_multimediawidgets.xml share/PySide2/typesystems/typesystem_network.xml share/PySide2/typesystems/typesystem_opengl.xml +share/PySide2/typesystems/typesystem_openglfunctions.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications1_0.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications1_0_compat.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications1_1.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications1_1_compat.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications1_2_compat.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications1_3_compat.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications1_4.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications1_4_compat.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications2_0.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications2_0_compat.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications2_1.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications3_0.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications3_3.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications3_3a.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications4_0.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications4_1.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications4_3.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications4_4.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications4_4_core.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications4_5.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications4_5_core.xml +share/PySide2/typesystems/typesystem_openglfunctions_modifications_va.xml share/PySide2/typesystems/typesystem_positioning.xml share/PySide2/typesystems/typesystem_printsupport.xml 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_script.xml share/PySide2/typesystems/typesystem_scripttools.xml share/PySide2/typesystems/typesystem_scxml.xml share/PySide2/typesystems/typesystem_sensors.xml share/PySide2/typesystems/typesystem_sql.xml share/PySide2/typesystems/typesystem_svg.xml 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 share/PySide2/typesystems/typesystem_websockets.xml share/PySide2/typesystems/typesystem_widgets.xml share/PySide2/typesystems/typesystem_widgets_common.xml share/PySide2/typesystems/typesystem_widgets_mac.xml share/PySide2/typesystems/typesystem_widgets_win.xml share/PySide2/typesystems/typesystem_widgets_x11.xml share/PySide2/typesystems/typesystem_x11extras.xml share/PySide2/typesystems/typesystem_xml.xml share/PySide2/typesystems/typesystem_xmlpatterns.xml share/PySide2/typesystems/webkitwidgets_common.xml share/PySide2/typesystems/widgets_common.xml share/PySide2/typesystems/xml_common.xml Index: head/devel/pyside2-tools/Makefile =================================================================== --- head/devel/pyside2-tools/Makefile (revision 513598) +++ head/devel/pyside2-tools/Makefile (revision 513599) @@ -1,45 +1,45 @@ # $FreeBSD$ PORTNAME= pyside2-tools -DISTVERSION= 5.12.3 +DISTVERSION= 5.13.1 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} MAINTAINER= cmt@FreeBSD.org COMMENT= Pyside2 development tools LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= multi BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ git>0:devel/git LIB_DEPENDS= # more later -USES= cmake gl python qt:5 shebangfix tar:xz +USES= cmake gl python qt:5 shebangfix tar:xz xorg USE_GL= gl 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 SHEBANG_FILES= pyside_tool.py pyside2-uic CMAKE_ARGS+= "-DUSE_PYTHON_VERSION=${PYTHON_VER}" .include .if ${PYTHON_MAJOR_VER} >= 3 LIB_DEPENDS+= libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \ libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR} .else LIB_DEPENDS+= libshiboken2-${PYTHON_VERSION}.so:devel/shiboken2@${PY_FLAVOR} \ libpyside2-${PYTHON_VERSION}.so:devel/pyside2@${PY_FLAVOR} .endif WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${DISTVERSION}/sources/pyside2-tools .include Index: head/devel/pyside2-tools/distinfo =================================================================== --- head/devel/pyside2-tools/distinfo (revision 513598) +++ head/devel/pyside2-tools/distinfo (revision 513599) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557663703 -SHA256 (pyside-setup-everywhere-src-5.12.3.tar.xz) = 4f7aab7d4bbaf1b3573cc989d704e87b0de55cce656ae5e23418a88baa4c6842 -SIZE (pyside-setup-everywhere-src-5.12.3.tar.xz) = 5474384 +TIMESTAMP = 1570005612 +SHA256 (pyside-setup-everywhere-src-5.13.1.tar.xz) = c57c71ddece90b29d0934cf5fac1e1634719484637b56dcbe49eb277c1c01536 +SIZE (pyside-setup-everywhere-src-5.13.1.tar.xz) = 2936204 Index: head/devel/shiboken2/Makefile =================================================================== --- head/devel/shiboken2/Makefile (revision 513598) +++ head/devel/shiboken2/Makefile (revision 513599) @@ -1,48 +1,48 @@ # $FreeBSD$ PORTNAME= shiboken2 -DISTVERSION= 5.12.3 -PORTREVISION= 1 +DISTVERSION= 5.13.1 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src -DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} MAINTAINER= cmt@FreeBSD.org COMMENT= Python binding generator for C++ libraries LICENSE= GPLv2 LGPL21 LGPL3 LICENSE_COMB= multi BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ git>0:devel/git LIB_DEPENDS= libclang.so:devel/llvm${LLVM_DEFAULT} \ libxslt.so:textproc/libxslt USES= cmake gnome python qt:5 shebangfix tar:xz USE_GNOME= libxml2 +USE_LDCONFIG= yes USE_PYTHON= flavors USE_QT= buildtools_build core gui network qmake_build testlib \ xml xmlpatterns -SHEBANG_FILES= shiboken_tool.py +SHEBANG_FILES= shiboken_tool.py CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} CMAKE_ARGS+= "-DCMAKE_CXX_FLAGS=-lexecinfo" \ "-DCMAKE_STANDARD_LIBRARIES=-lexecinfo" \ "-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" \ "-DUSE_PYTHON_VERSION=${PYTHON_VER}" .include PLIST_SUB+= DISTVERSION=${DISTVERSION} .if ${PYTHON_MAJOR_VER} >= 3 PLIST_SUB+= PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER} .else PLIST_SUB+= PYVERSTR=-${PYTHON_VERSION} .endif WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${DISTVERSION}/sources/shiboken2 .include Index: head/devel/shiboken2/distinfo =================================================================== --- head/devel/shiboken2/distinfo (revision 513598) +++ head/devel/shiboken2/distinfo (revision 513599) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557663730 -SHA256 (pyside-setup-everywhere-src-5.12.3.tar.xz) = 4f7aab7d4bbaf1b3573cc989d704e87b0de55cce656ae5e23418a88baa4c6842 -SIZE (pyside-setup-everywhere-src-5.12.3.tar.xz) = 5474384 +TIMESTAMP = 1570005636 +SHA256 (pyside-setup-everywhere-src-5.13.1.tar.xz) = c57c71ddece90b29d0934cf5fac1e1634719484637b56dcbe49eb277c1c01536 +SIZE (pyside-setup-everywhere-src-5.13.1.tar.xz) = 2936204 Index: head/devel/shiboken2/files/patch-libshiboken_helper.h =================================================================== --- head/devel/shiboken2/files/patch-libshiboken_helper.h (revision 513598) +++ head/devel/shiboken2/files/patch-libshiboken_helper.h (revision 513599) @@ -1,11 +1,11 @@ ---- libshiboken/helper.h.orig 2018-12-17 07:28:47 UTC +--- libshiboken/helper.h.orig 2019-10-02 11:12:45 UTC +++ libshiboken/helper.h @@ -90,7 +90,7 @@ class AutoArrayPointer - T* data; + T *data; }; --typedef unsigned long long ThreadId; -+typedef pthread_t ThreadId; +-using ThreadId = unsigned long long; ++using ThreadId = pthread_t; LIBSHIBOKEN_API ThreadId currentThreadId(); LIBSHIBOKEN_API ThreadId mainThreadId(); Index: head/devel/shiboken2/pkg-plist =================================================================== --- head/devel/shiboken2/pkg-plist (revision 513598) +++ head/devel/shiboken2/pkg-plist (revision 513599) @@ -1,56 +1,57 @@ bin/shiboken2 bin/shiboken_tool.py include/shiboken2/autodecref.h include/shiboken2/basewrapper.h include/shiboken2/bindingmanager.h include/shiboken2/bufferprocs_py37.h include/shiboken2/gilstate.h include/shiboken2/helper.h include/shiboken2/pep384impl.h include/shiboken2/python25compat.h include/shiboken2/qapp_macro.h include/shiboken2/sbkarrayconverter.h include/shiboken2/sbkconverter.h include/shiboken2/sbkdbg.h include/shiboken2/sbkenum.h include/shiboken2/sbkmodule.h include/shiboken2/sbkpython.h include/shiboken2/sbkstring.h include/shiboken2/sbkversion.h include/shiboken2/shiboken.h include/shiboken2/shibokenbuffer.h include/shiboken2/shibokenmacros.h include/shiboken2/signature.h include/shiboken2/threadstatesaver.h include/shiboken2/typespec.h include/shiboken2/voidptr.h lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config%%PYVERSTR%%.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2ConfigVersion.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/shiboken_helpers.cmake lib/libshiboken2%%PYVERSTR%%.so -lib/libshiboken2%%PYVERSTR%%.so.5.12 +lib/libshiboken2%%PYVERSTR%%.so.5.13 lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/shiboken2/__init__.py %%PYTHON_SITELIBDIR%%/shiboken2/_config.py %%PYTHON_SITELIBDIR%%/shiboken2/_git_shiboken_module_version.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__init__.py %%PYTHON2%%%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/backport_inspect.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__init__.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/errorhandler.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/layout.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__init__.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/enum_sig.py +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/tool.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/loader.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/mapping.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/parser.py %%PYTHON2%%%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/typing27.py %%PYTHON3%%%%PYTHON_SITELIBDIR%%/shiboken2/shiboken2%%PYVERSTR%%.so %%PYTHON2%%%%PYTHON_SITELIBDIR%%/shiboken2/shiboken2.so %%PYTHON_SITELIBDIR%%/shiboken2_generator/__init__.py %%PYTHON_SITELIBDIR%%/shiboken2_generator/_config.py %%PYTHON_SITELIBDIR%%/shiboken2_generator/_git_shiboken_generator_version.py libdata/pkgconfig/shiboken2.pc man/man1/shiboken2.1.gz