Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Apr 2020 17:21:57 +0000 (UTC)
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r531621 - in head: cad/freecad cad/freecad/files devel/pyside2 devel/pyside2-tools devel/pyside2-tools/files devel/shiboken2
Message-ID:  <202004131721.03DHLvlV029814@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cmt
Date: Mon Apr 13 17:21:57 2020
New Revision: 531621
URL: https://svnweb.freebsd.org/changeset/ports/531621

Log:
  update devel/pyside2 and friends to 5.14.2
  
  following r531601 (Qt 5.14.2), PySide2 can be updated, too
  - pyside2-tools don't bring their own pyside2-rcc and pyside2-uic but
    use Qt's rcc and uic - patch cad/freecad to handle that
  - remove Python 2 support: it's going to go away soon anyway, it did
    complicate these ports a lot, and it would have required more
    workarounds in FreeCAD when using Qt's rcc instead of the old pyside2-rcc.
  - while here, do some polishing in freecad's makefile

Added:
  head/cad/freecad/files/patch-cMake_FindPySide2Tools.cmake   (contents, props changed)
Deleted:
  head/devel/pyside2-tools/files/patch-pyrcc_CMakeLists.txt
Modified:
  head/cad/freecad/Makefile
  head/devel/pyside2-tools/Makefile
  head/devel/pyside2-tools/distinfo
  head/devel/pyside2-tools/files/patch-CMakeLists.txt
  head/devel/pyside2-tools/pkg-plist
  head/devel/pyside2/Makefile
  head/devel/pyside2/distinfo
  head/devel/pyside2/pkg-plist
  head/devel/shiboken2/Makefile
  head/devel/shiboken2/distinfo
  head/devel/shiboken2/pkg-plist

Modified: head/cad/freecad/Makefile
==============================================================================
--- head/cad/freecad/Makefile	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/cad/freecad/Makefile	Mon Apr 13 17:21:57 2020	(r531621)
@@ -2,7 +2,7 @@
 
 PORTNAME=	FreeCAD
 DISTVERSION=	0.18.4
-PORTREVISION=	3
+PORTREVISION=	4
 # use these for bugfixes/snapshots
 # DISTVERSION=	0.18-16093 # git rev-list --count
 # DISTVERSIONSUFFIX=	-g690774c0e
@@ -14,7 +14,7 @@ COMMENT=	General purpose 3D CAD modeller
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyside2-tools>0:devel/pyside2-tools@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyside2-tools>5.14.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 \
@@ -40,7 +40,8 @@ USES=		dos2unix compiler:c++11-lib cmake gl eigen:3 fo
 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_QT=		buildtools concurrent core gui network opengl printsupport \
+		qmake_build svg webkit widgets xml
 USE_LDCONFIG=	yes
 
 DOS2UNIX_GLOB=	*.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL
@@ -51,7 +52,9 @@ CMAKE_ARGS+=	-DOCC_INCLUDE_DIR="${LOCALBASE}/include/O
 		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \
 		-DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \
 		-DPYTHON_EXECUTABLE="${PYTHON_CMD}" \
-		-DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON"
+		-DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \
+		-DPYSIDE2RCCBINARY="${LOCALBASE}/bin/rcc" \
+		-DPYSIDE2UICBINARY="${LOCALBASE}/bin/uic"
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/${PORTNAME}
 
@@ -64,8 +67,6 @@ DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data
 		${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/.*-//}/' \

Added: head/cad/freecad/files/patch-cMake_FindPySide2Tools.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/freecad/files/patch-cMake_FindPySide2Tools.cmake	Mon Apr 13 17:21:57 2020	(r531621)
@@ -0,0 +1,22 @@
+--- cMake/FindPySide2Tools.cmake.orig	2019-10-22 16:53:35 UTC
++++ cMake/FindPySide2Tools.cmake
+@@ -42,7 +42,7 @@ MACRO(PYSIDE_WRAP_UI outfiles)
+         # we follow the tool command with in-place sed.
+         ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+           COMMAND "${PYSIDE2UICBINARY}" "${infile}" -o "${outfile}"
+-          COMMAND sed -i "/^# /d" "${outfile}"
++          COMMAND sed -i \"\" "/^# /d" "${outfile}"
+           MAIN_DEPENDENCY "${infile}"
+         )
+     endif()
+@@ -68,8 +68,8 @@ MACRO(PYSIDE_WRAP_RC outfiles)
+         # pyside-rcc generates in comments at beginning, which is why
+         # we follow the tool command with in-place sed.
+         ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
+-          COMMAND "${PYSIDE2RCCBINARY}" "${infile}" ${PY_ATTRIBUTE} -o "${outfile}"
+-          COMMAND sed -i "/^# /d" "${outfile}"
++          COMMAND "${PYSIDE2RCCBINARY}" "${infile}" --generator python -o "${outfile}"
++          COMMAND sed -i \"\" "/^# /d" "${outfile}"
+           MAIN_DEPENDENCY "${infile}"
+         )
+     endif()

Modified: head/devel/pyside2-tools/Makefile
==============================================================================
--- head/devel/pyside2-tools/Makefile	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/pyside2-tools/Makefile	Mon Apr 13 17:21:57 2020	(r531621)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyside2-tools
-DISTVERSION=	5.13.2
+DISTVERSION=	5.14.2
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,30 +15,23 @@ LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		git>0:devel/git
-LIB_DEPENDS=	# more later
+LIB_DEPENDS=	libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \
+		libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR}
 
-USES=		cmake gl python qt:5 shebangfix tar:xz xorg
+USES=		cmake gl python:3.5+ qt:5 shebangfix tar:xz xorg
 USE_GL=		gl
 USE_PYTHON=	flavors
-USE_QT=		3d buildtools_build charts core datavis3d declarative \
+USE_QT=		3d buildtools 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
+SHEBANG_FILES=	pyside_tool.py
 
 CMAKE_ARGS+=	"-DUSE_PYTHON_VERSION=${PYTHON_VER}"
 
 .include <bsd.port.pre.mk>
-
-.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-opensource-src-${DISTVERSION}/sources/pyside2-tools
 

Modified: head/devel/pyside2-tools/distinfo
==============================================================================
--- head/devel/pyside2-tools/distinfo	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/pyside2-tools/distinfo	Mon Apr 13 17:21:57 2020	(r531621)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573235927
-SHA256 (pyside-setup-opensource-src-5.13.2.tar.xz) = 3e255d64df08880d0281ebe86009d5ea45f24332b308954d967c33995f75e543
-SIZE (pyside-setup-opensource-src-5.13.2.tar.xz) = 3123964
+TIMESTAMP = 1586039675
+SHA256 (pyside-setup-opensource-src-5.14.2.tar.xz) = 7c7af33792de57255dbdc165c808e1f03a2520295c5922d9897aca8ad1be92b3
+SIZE (pyside-setup-opensource-src-5.14.2.tar.xz) = 3238036

Modified: head/devel/pyside2-tools/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/pyside2-tools/files/patch-CMakeLists.txt	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/pyside2-tools/files/patch-CMakeLists.txt	Mon Apr 13 17:21:57 2020	(r531621)
@@ -1,11 +1,53 @@
---- CMakeLists.txt.orig	2019-02-08 21:32:23 UTC
+--- CMakeLists.txt.orig	2020-04-04 23:43:30 UTC
 +++ CMakeLists.txt
-@@ -60,7 +60,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pyside2u
- # Man pages for pyside2-uic
- if (NOT WIN32)
-     file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/pyside2uic/*.1")
--    install(FILES ${manpages} DESTINATION share/man/man1)
-+    install(FILES ${manpages} DESTINATION man/man1)
+@@ -46,46 +46,10 @@ else()
+     set(EXE_EXT "")
  endif()
  
+-set(TOOLS_PATH "${_qt5Core_install_prefix}/bin")
+-set(UIC_PATH "${TOOLS_PATH}/uic${EXE_EXT}")
+-set(RCC_PATH "${TOOLS_PATH}/rcc${EXE_EXT}")
+-if (APPLE)
+-    set(DESIGNER_PATH "${TOOLS_PATH}/Designer.app")
+-else()
+-    set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
+-endif()
+-
+-install(FILES "${UIC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-install(FILES "${RCC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-if (EXISTS ${DESIGNER_PATH})
+-    if (APPLE)
+-        install(DIRECTORY "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                FILE_PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    else()
+-        install(FILES "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    endif()
+-endif()
++# uic is part of qt5-widgets
++# rcc is part of qt5-buildtools
++# designer is part of qt5-designer
++# why copy binaries from other packages?
+ 
  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
+                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"

Modified: head/devel/pyside2-tools/pkg-plist
==============================================================================
--- head/devel/pyside2-tools/pkg-plist	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/pyside2-tools/pkg-plist	Mon Apr 13 17:21:57 2020	(r531621)
@@ -1,37 +1,3 @@
 bin/pyside2-lupdate
-bin/pyside2-rcc
-bin/pyside2-uic
 bin/pyside_tool.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/Compiler/__init__.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/Compiler/compiler.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/Compiler/indenter.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/Compiler/misc.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/Compiler/proxy_type.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/Compiler/qobjectcreator.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/Compiler/qtproxies.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/__init__.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/driver.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/exceptions.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/icon_cache.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/objcreator.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v2/__init__.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v2/as_string.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v2/ascii_upper.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v2/invoke.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v2/load_plugin.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v2/proxy_base.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v2/string_io.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v3/__init__.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v3/as_string.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v3/ascii_upper.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v3/invoke.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v3/load_plugin.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v3/proxy_base.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/port_v3/string_io.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/properties.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/uiparser.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/widget-plugins/qtdeclarative.py
-%%PYTHON_SITELIBDIR%%/pyside2uic/widget-plugins/qtwebkit.py
 man/man1/pyside2-lupdate.1.gz
-man/man1/pyside2-rcc.1.gz
-man/man1/pyside2-uic.1.gz

Modified: head/devel/pyside2/Makefile
==============================================================================
--- head/devel/pyside2/Makefile	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/pyside2/Makefile	Mon Apr 13 17:21:57 2020	(r531621)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyside2
-DISTVERSION=	5.13.2
-PORTREVISION=	1
+DISTVERSION=	5.14.2
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,13 +14,13 @@ LICENSE=	LGPL3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		git>0:devel/git
-LIB_DEPENDS=	# more later
+LIB_DEPENDS=	libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR}
 
-USES=		cmake gl python qt:5 tar:xz
+USES=		cmake gl python:3.5+ qt:5 tar:xz
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
-USE_QT=		3d buildtools_build charts core datavis3d declarative \
+USE_QT=		3d buildtools_build charts concurrent core datavis3d declarative \
 		designer gamepad gui help location multimedia network opengl \
 		printsupport qmake_build remoteobjects script scripttools \
 		scxml sensors speech sql svg testlib uitools webchannel \
@@ -32,14 +31,7 @@ CMAKE_ARGS+=	"-DUSE_PYTHON_VERSION=${PYTHON_VER}" \
 
 .include <bsd.port.pre.mk>
 
-.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-opensource-src-${DISTVERSION}/sources/pyside2

Modified: head/devel/pyside2/distinfo
==============================================================================
--- head/devel/pyside2/distinfo	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/pyside2/distinfo	Mon Apr 13 17:21:57 2020	(r531621)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573235789
-SHA256 (pyside-setup-opensource-src-5.13.2.tar.xz) = 3e255d64df08880d0281ebe86009d5ea45f24332b308954d967c33995f75e543
-SIZE (pyside-setup-opensource-src-5.13.2.tar.xz) = 3123964
+TIMESTAMP = 1586039646
+SHA256 (pyside-setup-opensource-src-5.14.2.tar.xz) = 7c7af33792de57255dbdc165c808e1f03a2520295c5922d9897aca8ad1be92b3
+SIZE (pyside-setup-opensource-src-5.14.2.tar.xz) = 3238036

Modified: head/devel/pyside2/pkg-plist
==============================================================================
--- head/devel/pyside2/pkg-plist	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/pyside2/pkg-plist	Mon Apr 13 17:21:57 2020	(r531621)
@@ -51,6 +51,7 @@ include/PySide2/pysidemetafunction.h
 include/PySide2/pysideproperty.h
 include/PySide2/pysideqflags.h
 include/PySide2/pysidesignal.h
+include/PySide2/pysidestaticstrings.h
 include/PySide2/pysideweakref.h
 include/PySide2/signalmanager.h
 lib/cmake/PySide2-%%DISTVERSION%%/PySide2Config%%PYVERSTR%%.cmake
@@ -59,7 +60,7 @@ lib/cmake/PySide2-%%DISTVERSION%%/PySide2ConfigVersion
 lib/cmake/PySide2-%%DISTVERSION%%/PySide2Targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/PySide2-%%DISTVERSION%%/PySide2Targets.cmake
 lib/libpyside2%%PYVERSTR%%.so
-lib/libpyside2%%PYVERSTR%%.so.5.13
+lib/libpyside2%%PYVERSTR%%.so.5.14
 lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%%
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DAnimation.so
 %%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DCore.so
@@ -161,6 +162,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
 share/PySide2/glue/qtwidgets.cpp
 share/PySide2/glue/qtxml.cpp
 share/PySide2/glue/qtxmlpatterns.cpp

Modified: head/devel/shiboken2/Makefile
==============================================================================
--- head/devel/shiboken2/Makefile	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/shiboken2/Makefile	Mon Apr 13 17:21:57 2020	(r531621)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	shiboken2
-DISTVERSION=	5.13.2
+DISTVERSION=	5.14.2
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0
 LIB_DEPENDS=	libclang.so:devel/llvm${LLVM_DEFAULT} \
 		libxslt.so:textproc/libxslt
 
-USES=		cmake compiler:c++11-lang gnome python qt:5 shebangfix tar:xz
+USES=		cmake compiler:c++11-lang gnome python:3.5+ qt:5 shebangfix tar:xz
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
@@ -36,12 +36,7 @@ CMAKE_ARGS+=	"-DCMAKE_CXX_FLAGS=-lexecinfo" \
 .include <bsd.port.pre.mk>
 
 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-opensource-src-${DISTVERSION}/sources/shiboken2
 

Modified: head/devel/shiboken2/distinfo
==============================================================================
--- head/devel/shiboken2/distinfo	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/shiboken2/distinfo	Mon Apr 13 17:21:57 2020	(r531621)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573234745
-SHA256 (pyside-setup-opensource-src-5.13.2.tar.xz) = 3e255d64df08880d0281ebe86009d5ea45f24332b308954d967c33995f75e543
-SIZE (pyside-setup-opensource-src-5.13.2.tar.xz) = 3123964
+TIMESTAMP = 1586039660
+SHA256 (pyside-setup-opensource-src-5.14.2.tar.xz) = 7c7af33792de57255dbdc165c808e1f03a2520295c5922d9897aca8ad1be92b3
+SIZE (pyside-setup-opensource-src-5.14.2.tar.xz) = 3238036

Modified: head/devel/shiboken2/pkg-plist
==============================================================================
--- head/devel/shiboken2/pkg-plist	Mon Apr 13 17:12:01 2020	(r531620)
+++ head/devel/shiboken2/pkg-plist	Mon Apr 13 17:21:57 2020	(r531621)
@@ -15,6 +15,7 @@ include/shiboken2/sbkdbg.h
 include/shiboken2/sbkenum.h
 include/shiboken2/sbkmodule.h
 include/shiboken2/sbkpython.h
+include/shiboken2/sbkstaticstrings.h
 include/shiboken2/sbkstring.h
 include/shiboken2/sbkversion.h
 include/shiboken2/shiboken.h
@@ -31,7 +32,7 @@ lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets-%
 lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets.cmake
 lib/cmake/Shiboken2-%%DISTVERSION%%/shiboken_helpers.cmake
 lib/libshiboken2%%PYVERSTR%%.so
-lib/libshiboken2%%PYVERSTR%%.so.5.13
+lib/libshiboken2%%PYVERSTR%%.so.5.14
 lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/shiboken2/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken2/_config.py
@@ -40,6 +41,7 @@ lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%%
 %%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/importhandler.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
@@ -54,4 +56,3 @@ lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/_config.py
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/_git_shiboken_generator_version.py
 libdata/pkgconfig/shiboken2.pc
-man/man1/shiboken2.1.gz



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